projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d9aadee
)
Reindent.
author
Eric S. Raymond
<esr@thyrsus.com>
Tue, 11 Jul 2017 07:26:00 +0000
(
03:26
-0400)
committer
Eric S. Raymond
<esr@thyrsus.com>
Tue, 11 Jul 2017 07:26:00 +0000
(
03:26
-0400)
actions.c
patch
|
blob
|
history
main.c
patch
|
blob
|
history
diff --git
a/actions.c
b/actions.c
index b7bdaa52289044cfb55bb73c1bba52cf44940006..980352f348dc201f3fff5bb87e8db09481f86316 100644
(file)
--- a/
actions.c
+++ b/
actions.c
@@
-420,12
+420,12
@@
static int chain(verb_t verb)
switch (game.prop[BEAR]) {
case BEAR_DEAD:
// LCOV_EXCL_START
switch (game.prop[BEAR]) {
case BEAR_DEAD:
// LCOV_EXCL_START
- /* 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
- * exclude from coverage testing. */
+
/* 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
+
* exclude from coverage testing. */
game.fixed[BEAR] = IS_FIXED;
break;
game.fixed[BEAR] = IS_FIXED;
break;
-
// LCOV_EXCL_STOP
+ // LCOV_EXCL_STOP
default:
game.fixed[BEAR] = IS_FREE;
}
default:
game.fixed[BEAR] = IS_FREE;
}
diff --git
a/main.c
b/main.c
index 5a9c7c396df492eba7f5324333a2bc0e26455fb7..f8a920d8bec977c763ae5e448dfe22cbed372719 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1009,7
+1009,7
@@
static bool get_command_input(struct command_t *command)
packed_to_token(command->wd2, word2);
command->id1 = get_vocab_id(word1);
command->id2 = get_vocab_id(word2);
packed_to_token(command->wd2, word2);
command->id1 = get_vocab_id(word1);
command->id2 = get_vocab_id(word2);
-
+
return true;
}
return true;
}
@@
-1101,9
+1101,9
@@
Lclearobj:
game.wzdark = DARK(game.loc);
if (game.knfloc > 0 && game.knfloc != game.loc)
game.knfloc = 0;
game.wzdark = DARK(game.loc);
if (game.knfloc > 0 && game.knfloc != game.loc)
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;
Lclosecheck:
return false;
Lclosecheck:
@@
-1117,11
+1117,11
@@
Lclosecheck:
if (command.id1 == ENTER && (command.id2 == STREAM ||
command.id2 == PROMOTE_WORD(WATER))) {
if (command.id1 == ENTER && (command.id2 == STREAM ||
command.id2 == PROMOTE_WORD(WATER))) {
- if (LIQLOC(game.loc) == WATER)
+ if (LIQLOC(game.loc) == WATER)
rspeak(FEET_WET);
else
rspeak(WHERE_QUERY);
rspeak(FEET_WET);
else
rspeak(WHERE_QUERY);
-
+
goto Lclearobj;
}
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
goto Lclearobj;
}
if (command.id1 == ENTER && command.id2 != WORD_NOT_FOUND && command.id2 != WORD_EMPTY) {
@@
-1175,7
+1175,7
@@
Lookup:
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}
default:
BUG(VOCABULARY_TYPE_N_OVER_1000_NOT_BETWEEN_0_AND_3); // LCOV_EXCL_LINE
}
-
+
switch (action(&command)) {
case GO_TERMINATE:
return true;
switch (action(&command)) {
case GO_TERMINATE:
return true;
@@
-1201,7
+1201,7
@@
Lookup:
command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1);
command.obj = 0;
command.raw1[0] = toupper(command.raw1[0]);
sspeak(DO_WHAT, command.raw1);
command.obj = 0;
-
// Fallthrough
+ // Fallthrough
case GO_CHECKHINT: // Fallthrough
case GO_CLEAROBJ:
goto Lclearobj;
case GO_CHECKHINT: // Fallthrough
case GO_CLEAROBJ:
goto Lclearobj;