X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;ds=sidebyside;f=actions.c;h=0abccbca11f31920a2723d778d0ffcdb43c77408;hb=e798355e8080388e0e82aa18c0749b350c51835c;hp=164d15e72bff7ac9de168f8adac9225bf0dd4f67;hpb=9437ccca36057e2ba4b6f4b407304f23f14ab4c4;p=open-adventure.git

diff --git a/actions.c b/actions.c
index 164d15e..0abccbc 100644
--- a/actions.c
+++ b/actions.c
@@ -728,9 +728,7 @@ static int lock(token_t verb, token_t obj)
                 if (!game.panic)game.clock2 = PANICTIME;
                 game.panic = true;
             } else {
-                spk = game.prop[GRATE] ? GRATE_LOCKED : ALREADY_LOCKED;
-                game.prop[GRATE] = 1;
-                if (verb == LOCK)game.prop[GRATE] = 0;
+                game.prop[GRATE] = (verb == LOCK) ? 0 : 1;
                 spk = game.prop[GRATE] ? GRATE_UNLOCKED : GRATE_LOCKED;
             }
         }
@@ -791,32 +789,28 @@ static int quit(void)
     return GO_CLEAROBJ;
 }
 
-static int read(struct command_t *command)
+static int read(struct command_t command)
 /*  Read.  Print stuff based on objtxt.  Oyster (?) is special case. */
 {
-    if (command->obj == INTRANSITIVE) {
-        command->obj = 0;
+    if (command.obj == INTRANSITIVE) {
+        command.obj = 0;
         for (int i = 1; i <= NOBJECTS; i++) {
             if (HERE(i) && OBJTXT[i] != 0 && game.prop[i] >= 0)
-                command->obj = command->obj * NOBJECTS + i;
+                command.obj = command.obj * NOBJECTS + i;
         }
-        if (command->obj > NOBJECTS || command->obj == 0 || DARK(game.loc)) return GO_UNKNOWN;
+        if (command.obj > NOBJECTS || command.obj == 0 || DARK(game.loc))
+	    return GO_UNKNOWN;
     }
 
     if (DARK(game.loc)) {
-        SETPRM(1, command->wd1, command->wd1x);
+        SETPRM(1, command.wd1, command.wd1x);
         RSPEAK(NO_SEE);
-        return GO_CLEAROBJ;
-    }
-    if (OBJTXT[command->obj] == 0 || game.prop[command->obj] < 0) {
-        RSPEAK(ACTSPK[command->verb]);
-        return GO_CLEAROBJ;
-    }
-    if (command->obj == OYSTER && !game.clshnt) {
+    } 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]);
-        return GO_CLEAROBJ;
-    }
-    PSPEAK(command->obj, OBJTXT[command->obj] + game.prop[command->obj]);
+    } else
+	PSPEAK(command.obj, OBJTXT[command.obj] + game.prop[command.obj]);
     return GO_CLEAROBJ;
 }
 
@@ -861,7 +855,6 @@ static int rub(token_t verb, token_t obj)
 static int say(struct command_t *command)
 /* Say.  Echo WD2 (or WD1 if no WD2 (SAY WHAT?, etc.).)  Magic words override. */
 {
-    /* FIXME: ugly use of globals */
     SETPRM(1, command->wd2, command->wd2x);
     if (command->wd2 <= 0)
         SETPRM(1, command->wd1, command->wd1x);
@@ -870,7 +863,8 @@ static int say(struct command_t *command)
     int wd = VOCAB(command->wd1, -1);
     /* FIXME: Magic numbers */
     if (wd == 62 || wd == 65 || wd == 71 || wd == 2025 || wd == 2034) {
-        command->wd2 = 0;
+	/* FIXME: scribbles on the interpreter's command block */
+        wordclear(&command->wd2);
         return GO_LOOKUP;
     }
     RSPEAK(OKEY_DOKEY);
@@ -1120,7 +1114,7 @@ int action(FILE *input, struct command_t *command)
                 return brief();
             case 26: /* READ  */
 		command->obj = INTRANSITIVE;
-                return read(command);
+                return read(*command);
             case 27: /* BREAK */
                 return GO_UNKNOWN;
             case 28: /* WAKE  */
@@ -1210,7 +1204,7 @@ int action(FILE *input, struct command_t *command)
             return GO_CLEAROBJ;
         }
         case 26: /* READ  */
-            return read(command);
+            return read(*command);
         case 27: /* BREAK */
             return vbreak(command->verb, command->obj);
         case 28: /* WAKE  */