X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=main.c;h=1dc395eccab8fb6205c356d14e76cb7a88422320;hp=5e8045fb1ba21ec0ef542d8de7737381ca999745;hb=1896e0f88660f0f589a065c7ce2f9d98c1f161b8;hpb=e5f9c4fbea18216c40f1501cdee2ec21914e477c

diff --git a/main.c b/main.c
index 5e8045f..1dc395e 100644
--- a/main.c
+++ b/main.c
@@ -127,8 +127,8 @@ int main(int argc, char *argv[])
     /*  Start-up, dwarf stuff */
     game.zzword=RNDVOC(3,0);
     game.novice=YES(stdin, WELCOME_YOU,CAVE_NEARBY,ARB_0);
-    game.newloc = LOC_1;
-    game.loc = LOC_1;
+    game.newloc = LOC_START;
+    game.loc = LOC_START;
     game.limit=330;
     if (game.novice)game.limit=1000;
 
@@ -176,7 +176,7 @@ static void checkhints(FILE *cmdin)
 	    ++game.hintlc[hint];
 	    /*  Come here if he's been long enough at required loc(s) for some
 	     *  unused hint. */
-	    if (game.hintlc[hint] >= HINTS[hint][1]) 
+	    if (game.hintlc[hint] >= HINTS[hint][1])
 	    {
 		int i;
 
@@ -493,7 +493,7 @@ static void croak(FILE *cmdin)
 		DROP(i, (i == LAMP) ? 1 : game.oldlc2);
 	    }
 	}
-	game.loc = LOC_3;
+	game.loc = LOC_BUILDING;
 	game.oldloc=game.loc;
     }
 }
@@ -778,29 +778,29 @@ static bool closecheck(void)
 	 *  objects he might be carrying (lest he have some which
 	 *  could cause trouble, such as the keys).  We describe the
 	 *  flash of light and trundle back. */
-	game.prop[BOTTLE]=PUT(BOTTLE,LOC_115,1);
-	game.prop[PLANT]=PUT(PLANT,LOC_115,0);
-	game.prop[OYSTER]=PUT(OYSTER,LOC_115,0);
+	game.prop[BOTTLE]=PUT(BOTTLE,LOC_NE,1);
+	game.prop[PLANT]=PUT(PLANT,LOC_NE,0);
+	game.prop[OYSTER]=PUT(OYSTER,LOC_NE,0);
 	OBJTXT[OYSTER]=3;
-	game.prop[LAMP]=PUT(LAMP,LOC_115,0);
-	game.prop[ROD]=PUT(ROD,LOC_115,0);
-	game.prop[DWARF]=PUT(DWARF,LOC_115,0);
-	game.loc = LOC_115;
-	game.oldloc = LOC_115;
-	game.newloc = LOC_115;
+	game.prop[LAMP]=PUT(LAMP,LOC_NE,0);
+	game.prop[ROD]=PUT(ROD,LOC_NE,0);
+	game.prop[DWARF]=PUT(DWARF,LOC_NE,0);
+	game.loc = LOC_NE;
+	game.oldloc = LOC_NE;
+	game.newloc = LOC_NE;
 	/*  Leave the grate with normal (non-negative) property.
 	 *  Reuse sign. */
-	PUT(GRATE,LOC_116,0);
-	PUT(SIGN,LOC_116,0);
+	PUT(GRATE,LOC_SW,0);
+	PUT(SIGN,LOC_SW,0);
 	++OBJTXT[SIGN];
-	game.prop[SNAKE]=PUT(SNAKE,LOC_116,1);
-	game.prop[BIRD]=PUT(BIRD,LOC_116,1);
-	game.prop[CAGE]=PUT(CAGE,LOC_116,0);
-	game.prop[ROD2]=PUT(ROD2,LOC_116,0);
-	game.prop[PILLOW]=PUT(PILLOW,LOC_116,0);
+	game.prop[SNAKE]=PUT(SNAKE,LOC_SW,1);
+	game.prop[BIRD]=PUT(BIRD,LOC_SW,1);
+	game.prop[CAGE]=PUT(CAGE,LOC_SW,0);
+	game.prop[ROD2]=PUT(ROD2,LOC_SW,0);
+	game.prop[PILLOW]=PUT(PILLOW,LOC_SW,0);
 
-	game.prop[MIRROR]=PUT(MIRROR,LOC_115,0);
-	game.fixed[MIRROR]=LOC_116;
+	game.prop[MIRROR]=PUT(MIRROR,LOC_NE,0);
+	game.fixed[MIRROR]=LOC_SW;
 
 	for (int i=1; i<=NOBJECTS; i++) {
 	    if (TOTING(i))