dungeon now outputs just database.h

[open-adventure.git] / main.c

diff --git a/main.c b/main.c
index abde9236d9ca16149538c90ae115e8d7acf40184..fda727290267e840f7ff0c1c7d439ae719e7c244 100644 (file)
--- 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. */