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

Reindent.

Browse source
This commit is contained in:
Eric S. Raymond 2017-07-11 03:26:00 -04:00
parent d9aadeedba
commit 96950869c6
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
actions.c
View file

@ -420,12 +420,12 @@ static int chain(verb_t verb)
switch (game.prop[BEAR]) { switch (game.prop[BEAR]) {
case BEAR_DEAD: case BEAR_DEAD:
// LCOV_EXCL_START // LCOV_EXCL_START
/* Can't be reached as long as the only way for the bear to die /* Can't be reached as long as the only way for the bear to die
* is from a bridge collapse. Leave in in case this changes, but * is from a bridge collapse. Leave in in case this changes, but
* exclude from coverage testing. */ * exclude from coverage testing. */
game.fixed[BEAR] = IS_FIXED; game.fixed[BEAR] = IS_FIXED;
break; break;
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
default: default:
game.fixed[BEAR] = IS_FREE; game.fixed[BEAR] = IS_FREE;
} }

14
main.c
View file

@ -1009,7 +1009,7 @@ static bool get_command_input(struct command_t *command)
packed_to_token(command->wd2, word2); packed_to_token(command->wd2, word2);
command->id1 = get_vocab_id(word1); command->id1 = get_vocab_id(word1);
command->id2 = get_vocab_id(word2); command->id2 = get_vocab_id(word2);
return true; return true;
} }
@ -1101,9 +1101,9 @@ Lclearobj:
game.wzdark = DARK(game.loc); game.wzdark = DARK(game.loc);
if (game.knfloc > 0 && game.knfloc != game.loc) if (game.knfloc > 0 && game.knfloc != game.loc)
game.knfloc = 0; game.knfloc = 0;
// Get command input from user // Get command input from user
if(!get_command_input(&command)) if (!get_command_input(&command))
return false; return false;
Lclosecheck: Lclosecheck:
@ -1117,11 +1117,11 @@ Lclosecheck:
if (command.id1 == ENTER && (command.id2 == STREAM || if (command.id1 == ENTER && (command.id2 == STREAM ||
command.id2 == PROMOTE_WORD(WATER))) { command.id2 == PROMOTE_WORD(WATER))) {
if (LIQLOC(game.loc) == WATER) if (LIQLOC(game.loc) == WATER)
rspeak(FEET_WET); rspeak(FEET_WET);
else else
rspeak(WHERE_QUERY); rspeak(WHERE_QUERY);
goto Lclearobj; goto Lclearobj;
} }
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) { if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
@ -1175,7 +1175,7 @@ Lookup:
default: default:
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
} }
switch (action(&command)) { switch (action(&command)) {
case GO_TERMINATE: case GO_TERMINATE:
return true; return true;
@ -1201,7 +1201,7 @@ Lookup:
command.raw1[0] = toupper(command.raw1[0]); command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1); sspeak(DO_WHAT, command.raw1);
command.obj = 0; command.obj = 0;
// Fallthrough // Fallthrough
case GO_CHECKHINT: // Fallthrough case GO_CHECKHINT: // Fallthrough
case GO_CLEAROBJ: case GO_CLEAROBJ:
goto Lclearobj; goto Lclearobj;