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

diff --git a/main.c b/main.c
index 1dc395e..66c5caf 100644
--- a/main.c
+++ b/main.c
@@ -324,7 +324,7 @@ static bool dwarfmove(void)
     int kk, stick, attack;
     long tk[21];
 
-	/*  Dwarf stuff.  See earlier comments for description of
+    /*  Dwarf stuff.  See earlier comments for description of
      *  variables.  Remember sixth dwarf is pirate and is thus
      *  very different except for motion rules. */
 
@@ -490,7 +490,7 @@ static void croak(FILE *cmdin)
 	    int i=NOBJECTS + 1 - j;
 	    if (TOTING(i)) {
 		/* Always leave lamp where it's accessible aboveground */
-		DROP(i, (i == LAMP) ? 1 : game.oldlc2);
+		DROP(i, (i == LAMP) ? LOC_START : game.oldlc2);
 	    }
 	}
 	game.loc = LOC_BUILDING;
@@ -558,7 +558,8 @@ static bool playermove(FILE *cmdin, token_t verb, int motion)
 	/*  Look.  Can't give more detail.  Pretend it wasn't dark
 	 *  (though it may "now" be dark) so he won't fall into a
 	 *  pit while staring into the gloom. */
-	if (game.detail < 3)RSPEAK(NO_MORE_DETAIL);
+	if (game.detail < 3)
+	    RSPEAK(NO_MORE_DETAIL);
 	++game.detail;
 	game.wzdark=false;
 	game.abbrev[game.loc]=0;
@@ -640,6 +641,7 @@ static bool playermove(FILE *cmdin, token_t verb, int motion)
 		 *  emerald.  Note: travel table must include "useless"
 		 *  entries going through passage, which can never be used for
 		 *  actual motion, but can be spotted by "go back". */
+		/* FIXME: Arithmetic on location numbers */
 		game.newloc=99+100-game.loc;
 		if (game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD)))
 		    return true;
@@ -950,7 +952,7 @@ static bool do_command(FILE *cmdin)
 		croak(cmdin);
 		continue;	/* back to top of main interpreter loop */
 	    }
-	    msg=arbitrary_messages[16];
+	    msg=arbitrary_messages[PITCH_DARK];
 	}
 	if (TOTING(BEAR))RSPEAK(TAME_BEAR);
 	newspeak(msg);