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

Reindentation

Browse source
This commit is contained in:
NHOrus 2017-08-13 15:56:07 +01:00
parent f0dc3d3b7c
commit 0fbd79b608
4 changed files with 72 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

2
actions.c
View file

@ -1508,7 +1508,7 @@ int action(command_t command)
case RUB: case RUB:
return rub(command.verb, command.obj); return rub(command.verb, command.obj);
case THROW: case THROW:
return throw(command); return throw (command);
case QUIT: { case QUIT: {
speak(actions[command.verb].message); speak(actions[command.verb].message);
return GO_CLEAROBJ; return GO_CLEAROBJ;

2
advent.h
View file

@ -134,7 +134,7 @@ struct game_t {
long dflag; long dflag;
long dkill; // dwarves killed long dkill; // dwarves killed
long dtotal; // total dwarves (including pirate) long dtotal; // total dwarves (including pirate) in loc
long foobar; // progress in saying "FEE FIE FOE FOO". long foobar; // progress in saying "FEE FIE FOE FOO".
long holdng; // number of objects being carried long holdng; // number of objects being carried
long igo; // # uses of "go" instead of a direction long igo; // # uses of "go" instead of a direction

4
main.c
View file

@ -1134,7 +1134,7 @@ Lclearobj:
} }
/* From OV to VO form */ /* From OV to VO form */
if (command.word[0].type==OBJECT && command.word[1].type==ACTION) { if (command.word[0].type == OBJECT && command.word[1].type == ACTION) {
command_word_t stage = command.word[0]; command_word_t stage = command.word[0];
command.word[0] = command.word[1]; command.word[0] = command.word[1];
command.word[1] = stage; command.word[1] = stage;
@ -1165,7 +1165,7 @@ Lookup:
command.obj = command.word[0].id; command.obj = command.word[0].id;
break; break;
case ACTION: case ACTION:
if(command.word[1].type == NUMERIC) if (command.word[1].type == NUMERIC)
command.part = transitive; command.part = transitive;
else else
command.part = intransitive; command.part = intransitive;

3
misc.c
View file

@ -402,8 +402,7 @@ static bool is_valid_int(const char *str)
return false; // LCOV_EXCL_LINE return false; // LCOV_EXCL_LINE
// Check for non-digit chars in the rest of the stirng. // Check for non-digit chars in the rest of the stirng.
while (*str) while (*str) {
{
if (!isdigit(*str)) if (!isdigit(*str))
return false; return false;
else else