X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=main.c;h=f59f600347381796b094d80a719398dd2f5a3270;hb=0c2803638f4d7b63360ff35726c37db75862218c;hp=cbcd45c4f0a7cc61bb60f3cc1ea049fe9553df4d;hpb=ecff53d3a8322224bafe0c2a4cffc3e32840e82a;p=open-adventure.git diff --git a/main.c b/main.c index cbcd45c..f59f600 100644 --- a/main.c +++ b/main.c @@ -687,7 +687,7 @@ static bool playermove(token_t verb, int motion) * and block him. (standard travel entries check for * game.prop(TROLL)=0.) Special stuff for bear. */ if (game.prop[TROLL] == 1) { - pspeak(TROLL, 1); + pspeak(TROLL,look, 1); game.prop[TROLL] = 0; MOVE(TROLL2, 0); MOVE(TROLL2 + NOBJECTS, 0); @@ -802,7 +802,6 @@ static bool closecheck(void) game.prop[BOTTLE] = PUT(BOTTLE, LOC_NE, EMPTY_BOTTLE); 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_NE, 0); game.prop[ROD] = PUT(ROD, LOC_NE, 0); game.prop[DWARF] = PUT(DWARF, LOC_NE, 0); @@ -813,7 +812,7 @@ static bool closecheck(void) * Reuse sign. */ PUT(GRATE, LOC_SW, 0); PUT(SIGN, LOC_SW, 0); - ++OBJTXT[SIGN]; + game.prop[SIGN] = ENDGAME_SIGN; game.prop[SNAKE] = PUT(SNAKE, LOC_SW, 1); game.prop[BIRD] = PUT(BIRD, LOC_SW, 1); game.prop[CAGE] = PUT(CAGE, LOC_SW, 0); @@ -913,7 +912,7 @@ static void listobjects(void) int kk = game.prop[obj]; if (obj == STEPS && game.loc == game.fixed[STEPS]) kk = 1; - pspeak(obj, kk); + pspeak(obj, look, kk); } } } @@ -1000,7 +999,7 @@ L2600: * tick game.clock1 unless well into cave (and not at Y2). */ if (game.closed) { if (game.prop[OYSTER] < 0 && TOTING(OYSTER)) - pspeak(OYSTER, 1); + pspeak(OYSTER, look, 1); for (size_t i = 1; i <= NOBJECTS; i++) { if (TOTING(i) && game.prop[i] < 0) game.prop[i] = -1 - game.prop[i];