X-Git-Url: https://jxself.org/git/?p=open-adventure.git;a=blobdiff_plain;f=misc.c;h=f2d674248d065951400bad163468a8c1d09f673c;hp=0e6b50e535b6365f7457ec0d50d59aa50edbc929;hb=7d0b15ef897d7a066998fa0a44fb7be958c60cd8;hpb=a4c87aa0b34b476b14f963a2ecbdd8797bcfed63 diff --git a/misc.c b/misc.c index 0e6b50e..f2d6742 100644 --- a/misc.c +++ b/misc.c @@ -5,7 +5,7 @@ * Copyright (c) 2017 by Eric S. Raymond * SPDX-License-Identifier: BSD-2-clause */ - + #include #include #include @@ -139,7 +139,7 @@ void sspeak(const int msg, ...) va_end(ap); } -void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...) +void pspeak(vocab_t msg, enum speaktype mode, bool blank, int skip, ...) /* Find the skip+1st message from msg and print it. Modes are: * feel = for inventory, what you can touch * look = the full description for the state the object is in @@ -147,7 +147,7 @@ void pspeak(vocab_t msg, enum speaktype mode, int skip, bool blank, ...) * study = text on the object. */ { va_list ap; - va_start(ap, blank); + va_start(ap, skip); switch (mode) { case touch: vspeak(objects[msg].inventory, blank, ap); @@ -476,14 +476,14 @@ static void tokenize(char* raw, command_t *cmd) { /* * Be caereful about modifing this. We do not want to nuke the - * the speech part or ID from the previous turn. + * the speech part or ID from the previous turn. */ - memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0],raw)); + memset(&cmd->word[0].raw, '\0', sizeof(cmd->word[0].raw)); memset(&cmd->word[1].raw, '\0', sizeof(cmd->word[1].raw)); /* Bound prefix on the %s would be needed to prevent buffer * overflow. but we shortstop this more simply by making each - * raw-input buffer as long as the entire input buffer. */ + * raw-input buffer as int as the entire input buffer. */ sscanf(raw, "%s%s", cmd->word[0].raw, cmd->word[1].raw); /* (ESR) In oldstyle mode, simulate the uppercasing and truncating @@ -511,6 +511,7 @@ static void tokenize(char* raw, command_t *cmd) /* populate command with parsed vocabulary metadata */ get_vocab_metadata(cmd->word[0].raw, &(cmd->word[0].id), &(cmd->word[0].type)); get_vocab_metadata(cmd->word[1].raw, &(cmd->word[1].id), &(cmd->word[1].type)); + cmd->state = TOKENIZED; } bool get_command_input(command_t *command) @@ -538,9 +539,34 @@ bool get_command_input(command_t *command) tokenize(inputbuf, command); +#ifdef GDEBUG + /* Needs to stay synced with enum word_type_t */ + const char *types[] = {"NO_WORD_TYPE", "MOTION", "OBJECT", "ACTION", "NUMERIC"}; + /* needs to stay synced with enum speechpart */ + const char *roles[] = {"unknown", "intransitive", "transitive"}; + printf("Command: role = %s type1 = %s, id1 = %d, type2 = %s, id2 = %d\n", + roles[command->part], + types[command->word[0].type], + command->word[0].id, + types[command->word[1].type], + command->word[1].id); +#endif + + command->state = GIVEN; return true; } +void clear_command(command_t *cmd) +/* Resets the state of the command to empty */ +{ + cmd->verb = ACT_NULL; + cmd->part = unknown; + game.oldobj = cmd->obj; + cmd->obj = NO_OBJECT; + cmd->state = EMPTY; +} + + void juggle(obj_t object) /* Juggle an object by picking it up and putting it down again, the purpose * being to get the object to the front of the chain of things at its loc. */ @@ -571,7 +597,7 @@ void move(obj_t object, loc_t where) drop(object, where); } -loc_t put(obj_t object, loc_t where, long pval) +loc_t put(obj_t object, loc_t where, int pval) /* put() is the same as move(), except it returns a value used to set up the * negated game.prop values for the repository objects. */ { @@ -584,15 +610,15 @@ void carry(obj_t object, loc_t where) * location. Incr holdng unless it was already being toted. If object>NOBJECTS * (moving "fixed" second loc), don't change game.place or game.holdng. */ { - long temp; + int temp; if (object <= NOBJECTS) { if (game.place[object] == CARRIED) return; game.place[object] = CARRIED; - - if (object!= BIRD) - ++game.holdng; + + if (object != BIRD) + ++game.holdng; } if (game.atloc[where] == object) { game.atloc[where] = game.link[object]; @@ -613,14 +639,14 @@ void drop(obj_t object, loc_t where) game.fixed[object - NOBJECTS] = where; else { if (game.place[object] == CARRIED) - if (object != BIRD) - /* The bird has to be weightless. This ugly hack (and the - * corresponding code in the drop function) brought to you - * by the fact that when the bird is caged, we need to be able - * to either 'take bird' or 'take cage' and have the right thing - * happen. - */ - --game.holdng; + if (object != BIRD) + /* The bird has to be weightless. This ugly hack (and the + * corresponding code in the drop function) brought to you + * by the fact that when the bird is caged, we need to be able + * to either 'take bird' or 'take cage' and have the right thing + * happen. + */ + --game.holdng; game.place[object] = where; } if (where == LOC_NOWHERE || @@ -641,7 +667,7 @@ int atdwrf(loc_t where) if (game.dflag < 2) return at; at = -1; - for (long i = 1; i <= NDWARVES - 1; i++) { + for (int i = 1; i <= NDWARVES - 1; i++) { if (game.dloc[i] == where) return i; if (game.dloc[i] != 0) @@ -653,13 +679,13 @@ int atdwrf(loc_t where) /* Utility routines (setbit, tstbit, set_seed, get_next_lcg_value, * randrange) */ -long setbit(int bit) +int setbit(int bit) /* Returns 2**bit for use in constructing bit-masks. */ { return (1L << bit); } -bool tstbit(long mask, int bit) +bool tstbit(int mask, int bit) /* Returns true if the specified bit is set in the mask. */ { return (mask & (1 << bit)) != 0; @@ -708,7 +734,7 @@ void state_change(obj_t obj, int state) /* Object must have a change-message list for this to be useful; only some do */ { game.prop[obj] = state; - pspeak(obj, change, state, true); + pspeak(obj, change, true, state); } /* end */