Eliminate setting of OBJTXT sell for oyster - OBJTXT is now static.

A necessary step towards getting rid of it.

diff --git a/actions.c b/actions.c
index e3a6cafea001aa144930182f7397dec107dca5e5..2b30de9ad8a0e4dfce11a6b1d2104242295c1e2d 100644 (file)
--- a/actions.c
+++ b/actions.c
@@ -689,7 +689,6 @@ static int listen(void)
             continue;
        int mi =  OBJSND[i] + game.prop[i];
        if (i == BIRD)
-           /* FIXME: Arithmetic on state values */
            mi += 3 * game.blooded;
         pspeak(i, mi, game.zzword);
         spk = NO_MESSAGE;
@@ -812,10 +811,10 @@ static int read(struct command_t command)
 
     if (DARK(game.loc)) {
         rspeak(NO_SEE, command.wd1, command.wd1x);
+    } else if (command.obj == OYSTER && !game.clshnt && game.closed) {
+        game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
     } else if (OBJTXT[command.obj] == 0 || game.prop[command.obj] < 0) {
         rspeak(ACTSPK[command.verb]);
-    } else if (command.obj == OYSTER && !game.clshnt) {
-        game.clshnt = YES(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
     } else
         pspeak(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
     return GO_CLEAROBJ;

diff --git a/main.c b/main.c
index cbcd45c4f0a7cc61bb60f3cc1ea049fe9553df4d..11d967df6261388a8b32f226ab8c255c974b9562 100644 (file)
--- a/main.c
+++ b/main.c
@@ -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);

diff --git a/saveresume.c b/saveresume.c
index 1f052e241bd9f5b9ff7f982e2e2edc916feb71a6..cf3274640e41de39700786f082a0adac71e4d548 100644 (file)
--- a/saveresume.c
+++ b/saveresume.c
@@ -24,8 +24,6 @@ struct save_t {
     long mode;         /* not used, must be present for version detection */
     long version;
     struct game_t game;
-    long bird;
-    long bivalve;
 };
 struct save_t save;
 
@@ -63,7 +61,6 @@ int suspend(void)
     save.mode = -1;
     save.version = VRSION;
     memcpy(&save.game, &game, sizeof(struct game_t));
-    save.bivalve = OBJTXT[OYSTER];
     IGNORE(fwrite(&save, sizeof(struct save_t), 1, fp));
     fclose(fp);
     rspeak(RESUME_HELP);
@@ -113,7 +110,6 @@ int restore(FILE* fp)
         rspeak(VERSION_SKEW, save.version / 10, MOD(save.version, 10), VRSION / 10, MOD(VRSION, 10));
     } else {
         memcpy(&game, &save.game, sizeof(struct game_t));
-        OBJTXT[OYSTER] = save.bivalve;
         game.zzword = RNDVOC(3, game.zzword);
     }
     return GO_TOP;