archives/open-adventure
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reindentation, typo fix

Browse source
This commit is contained in:
NHOrus 2018-11-23 20:19:22 +03:00
parent f1d3b75561
commit 524f035e76
2 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
main.c
View file

@ -1205,7 +1205,7 @@ static bool do_command()
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
} }
if(command_given) { if (command_given) {
switch (action(command)) { switch (action(command)) {
case GO_TERMINATE: case GO_TERMINATE:
return true; return true;
@ -1216,7 +1216,7 @@ static bool do_command()
continue; /* back to top of main interpreter loop */ continue; /* back to top of main interpreter loop */
case GO_CLEAROBJ: case GO_CLEAROBJ:
clear_command(&command); clear_command(&command);
/* FALL THROUGH */ /* FALL THROUGH */
case GO_CHECKHINT: case GO_CHECKHINT:
command_given = false; command_given = false;
break; break;

22
misc.c
View file

@ -478,7 +478,7 @@ static void tokenize(char* raw, command_t *cmd)
* Be caereful about modifing this. We do not want to nuke the * 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)); memset(&cmd->word[1].raw, '\0', sizeof(cmd->word[1].raw));
/* Bound prefix on the %s would be needed to prevent buffer /* Bound prefix on the %s would be needed to prevent buffer
@ -591,8 +591,8 @@ void carry(obj_t object, loc_t where)
return; return;
game.place[object] = CARRIED; game.place[object] = CARRIED;
if (object!= BIRD) if (object != BIRD)
++game.holdng; ++game.holdng;
} }
if (game.atloc[where] == object) { if (game.atloc[where] == object) {
game.atloc[where] = game.link[object]; game.atloc[where] = game.link[object];
@ -613,14 +613,14 @@ void drop(obj_t object, loc_t where)
game.fixed[object - NOBJECTS] = where; game.fixed[object - NOBJECTS] = where;
else { else {
if (game.place[object] == CARRIED) if (game.place[object] == CARRIED)
if (object != BIRD) if (object != BIRD)
/* The bird has to be weightless. This ugly hack (and the /* The bird has to be weightless. This ugly hack (and the
* corresponding code in the drop function) brought to you * corresponding code in the drop function) brought to you
* by the fact that when the bird is caged, we need to be able * 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 * to either 'take bird' or 'take cage' and have the right thing
* happen. * happen.
*/ */
--game.holdng; --game.holdng;
game.place[object] = where; game.place[object] = where;
} }
if (where == LOC_NOWHERE || if (where == LOC_NOWHERE ||