X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=actions.c;h=e41c7bf5913b3918c84787af649e55ae6103e8fc;hp=dca01f525fafb722face0cb3d3cbcfae97d8f00d;hb=9e2cb3c19196a26af8e20803314f42b69dc0e014;hpb=5c91ea37393dcad690ed03dc3afc56b593a1be1c diff --git a/actions.c b/actions.c index dca01f5..e41c7bf 100644 --- a/actions.c +++ b/actions.c @@ -6,7 +6,7 @@ static int fill(verb_t, obj_t); -static int attack(struct command_t command) +static int attack(command_t command) /* Attack. Assume target if unambiguous. "Throw" also links here. * Attackable objects fall into two categories: enemies (snake, * dwarf, etc.) and others (bird, clam, machine). Ambiguous if 2 @@ -265,7 +265,7 @@ static int vbreak(verb_t verb, obj_t obj) game.fixed[VASE] = IS_FIXED; break; } - /* FALLTHRU */ + /* FALLTHRU */ default: speak(actions[verb].message); } @@ -592,7 +592,7 @@ static int eat(verb_t verb, obj_t obj) case INTRANSITIVE: if (!HERE(FOOD)) return GO_UNKNOWN; - /* FALLTHRU */ + /* FALLTHRU */ case FOOD: DESTROY(FOOD); rspeak(THANKS_DELICIOUS); @@ -1076,7 +1076,7 @@ static int quit(void) return GO_CLEAROBJ; } -static int read(struct command_t command) +static int read(command_t command) /* Read. Print stuff based on objtxt. Oyster (?) is special case. */ { if (command.obj == INTRANSITIVE) { @@ -1141,25 +1141,25 @@ static int rub(verb_t verb, obj_t obj) return GO_CLEAROBJ; } -static int say(struct command_t command) +static int say(command_t command) /* Say. Echo WD2. Magic words override. */ { if (command.word[1].type == MOTION && - (command.word[1].id == XYZZY || - command.word[1].id == PLUGH || - command.word[1].id == PLOVER)) { - return GO_WORD2; + (command.word[1].id == XYZZY || + command.word[1].id == PLUGH || + command.word[1].id == PLOVER)) { + return GO_WORD2; } if (command.word[1].type == ACTION && command.word[1].id == PART) return reservoir(); - + if (command.word[1].type == ACTION && (command.word[1].id == FEE || - command.word[1].id == FIE || - command.word[1].id == FOE || - command.word[1].id == FOO || - command.word[1].id == FUM || - command.word[1].id == PART)) { + command.word[1].id == FIE || + command.word[1].id == FOE || + command.word[1].id == FOO || + command.word[1].id == FUM || + command.word[1].id == PART)) { return bigwords(command.word[1].id); } sspeak(OKEY_DOKEY, command.word[1].raw); @@ -1173,7 +1173,7 @@ static int throw_support(vocab_t spk) return GO_MOVE; } -static int throw (struct command_t command) +static int throw (command_t command) /* Throw. Same as discard unless axe. Then same as attack except * ignore bird, and if dwarf is present then one might be killed. * (Only way to do so!) Axe also special for dragon, bear, and @@ -1250,7 +1250,7 @@ static int wake(verb_t verb, obj_t obj) static int seed(verb_t verb, const char *arg) /* Set seed */ { - int seed = atoi(arg); + int32_t seed = strtol(arg, NULL, 10); speak(actions[verb].message, seed); set_seed(seed); --game.turns; @@ -1311,19 +1311,19 @@ static int wave(verb_t verb, obj_t obj) } } -int action(struct command_t command) +int action(command_t command) /* Analyse a verb. Remember what it was, go back for object if second word * unless verb is "say", which snarfs arbitrary second word. */ { - /* Previously, actions that result in a message, but don't do anything - * further were called "specials". Now they're handled here as normal + /* Previously, actions that result in a message, but don't do anything + * further were called "specials". Now they're handled here as normal * actions. If noaction is true, then we spit out the message and return */ if (actions[command.verb].noaction) { speak(actions[command.verb].message); return GO_CLEAROBJ; } - + if (command.part == unknown) { /* Analyse an object word. See if the thing is here, whether * we've got a verb yet, and so on. Object must be here @@ -1360,8 +1360,6 @@ int action(struct command_t command) return GO_CLEAROBJ; } - if (command.word[1].id != WORD_EMPTY && command.word[1].id != WORD_NOT_FOUND) - return GO_WORD2; if (command.verb != 0) command.part = transitive; } @@ -1371,9 +1369,9 @@ int action(struct command_t command) if (command.word[1].raw[0] != '\0' && command.verb != SAY) return GO_WORD2; if (command.verb == SAY) - /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE - * will do here. We're preventing interpretation as an intransitive - * verb when the word is unknown. */ + /* KEYS is not special, anything not NO_OBJECT or INTRANSITIVE + * will do here. We're preventing interpretation as an intransitive + * verb when the word is unknown. */ command.obj = command.word[1].raw[0] != '\0' ? KEYS : NO_OBJECT; if (command.obj == NO_OBJECT || command.obj == INTRANSITIVE) { @@ -1510,7 +1508,7 @@ int action(struct command_t command) case RUB: return rub(command.verb, command.obj); case THROW: - return throw(command); + return throw (command); case QUIT: { speak(actions[command.verb].message); return GO_CLEAROBJ; @@ -1562,11 +1560,11 @@ int action(struct command_t command) speak(actions[command.verb].message); return GO_CLEAROBJ; } - // LCOV_EXCL_START - // This case should never happen - here only as placeholder + // LCOV_EXCL_START + // This case should never happen - here only as placeholder case PART: return reservoir(); - // LCOV_EXCL_STOP + // LCOV_EXCL_STOP case SEED: return seed(command.verb, command.word[1].raw); case WASTE: @@ -1577,7 +1575,7 @@ int action(struct command_t command) case unknown: /* Unknown verb, couldn't deduce object - might need hint */ sspeak(WHAT_DO, command.word[0].raw); - return GO_CHECKHINT; + return GO_CLEAROBJ; default: // LCOV_EXCL_LINE BUG(SPEECHPART_NOT_TRANSITIVE_OR_INTRANSITIVE_OR_UNKNOWN); // LCOV_EXCL_LINE }