Put the long and short location descriptions into a 'locations' data structure.

[open-adventure.git] / init.c

diff --git a/init.c b/init.c
index cabe574a588b4557ffd329ad16cab91e6369dea8..e5f43c7b3b30426d2eed27565fc3c4f9ffdc6973 100644 (file)
--- a/init.c
+++ b/init.c
@@ -184,7 +184,7 @@ void initialise(void)
 
     for (i=1; i<=LOCSIZ; i++) {
        game.abbrev[i]=0;
-       if (!(long_location_descriptions[i] == 0 || KEY[i] == 0)) {
+       if (!(locations[i].description.big == 0 || KEY[i] == 0)) {
            k=KEY[i];
            if(MOD(labs(TRAVEL[k]),1000) == 1)COND[i]=2;
        }
@@ -383,6 +383,5 @@ void initialise(void)
     game.closed=false;
     game.clshnt=false;
     game.novice=false;
-    game.setup=1;
     game.blklin=true;
 }