X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=init.c;h=e5f43c7b3b30426d2eed27565fc3c4f9ffdc6973;hb=refs%2Fmerge-requests%2F79%2Fhead;hp=aae770424558e6f21c1ada2f4099bb4f1df5d97b;hpb=46cd836df0943cfab98494d8668479f7ac93b762;p=open-adventure.git

diff --git a/init.c b/init.c
index aae7704..e5f43c7 100644
--- a/init.c
+++ b/init.c
@@ -5,6 +5,7 @@
 
 #include "advent.h"
 #include "database.h"
+#include "newdb.h"
 
 /*
  * Initialisation
@@ -183,7 +184,7 @@ void initialise(void)
 
     for (i=1; i<=LOCSIZ; i++) {
 	game.abbrev[i]=0;
-	if (!(LTEXT[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;
 	}
@@ -218,7 +219,7 @@ void initialise(void)
      *  not yet found, so we know when to close the cave. */
     game.tally=0;
     for (i=MINTRS; i<=MAXTRS; i++) {
-	if(PTEXT[i] != 0)
+	if(object_descriptions[i].inventory != 0)
 	    game.prop[i]= -1;
 	game.tally=game.tally-game.prop[i];
     }
@@ -382,6 +383,5 @@ void initialise(void)
     game.closed=false;
     game.clshnt=false;
     game.novice=false;
-    game.setup=1;
     game.blklin=true;
 }