X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=fda727290267e840f7ff0c1c7d439ae719e7c244;hb=c4c28e10db763e10f1366eace99daa85c35503f6;hp=abde9236d9ca16149538c90ae115e8d7acf40184;hpb=fef9657e3e00d952571bf96797ad716d00affeff;p=open-adventure.git

diff --git a/main.c b/main.c
index abde923..fda7272 100644
--- a/main.c
+++ b/main.c
@@ -13,6 +13,7 @@
  * and for the offensive globals.  Applying the Structured Program
  * Theorem can be hard.
  */
+#define DEFINE_GLOBALS_FROM_INCLUDES
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -936,9 +937,9 @@ static bool do_command(FILE *cmdin)
     for (;;) {
 	if (game.loc == 0)
 	    croak(cmdin);
-	char* msg = short_location_descriptions[game.loc];
+	char* msg = locations[game.loc].description.small;
 	if (MOD(game.abbrev[game.loc],game.abbnum) == 0 || msg == 0)
-	    msg=long_location_descriptions[game.loc];
+	    msg=locations[game.loc].description.big;
 	if (!FORCED(game.loc) && DARK(game.loc)) {
 	    /*  The easiest way to get killed is to fall into a pit in
 	     *  pitch darkness. */