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

Indent cleanup.

Browse source
This commit is contained in:
Eric S. Raymond 2022-04-18 10:31:13 -04:00
parent f7d6884ded
commit d320212622
4 changed files with 75 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

38
actions.c
View file

@ -207,8 +207,8 @@ static phase_codes_t bigwords(vocab_t id)
(TOTING(EGGS) && game.loc == objects[EGGS].plac)) { (TOTING(EGGS) && game.loc == objects[EGGS].plac)) {
rspeak(NOTHING_HAPPENS); rspeak(NOTHING_HAPPENS);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} else if (id == FUM) { } else if (id == FUM) {
goto fum; goto fum;
} else { } else {
/* Bring back troll if we steal the eggs back from him before /* Bring back troll if we steal the eggs back from him before
* crossing. */ * crossing. */
@ -225,7 +225,7 @@ static phase_codes_t bigwords(vocab_t id)
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
} else { } else {
fum: fum:
if (game.loc == LOC_GIANTROOM) { if (game.loc == LOC_GIANTROOM) {
rspeak(START_OVER); rspeak(START_OVER);
} else { } else {
@ -851,19 +851,19 @@ static phase_codes_t fly(verb_t verb, obj_t obj)
} }
if (game.loc == LOC_CLIFF) { if (game.loc == LOC_CLIFF) {
game.oldlc2 = game.oldloc; game.oldlc2 = game.oldloc;
game.oldloc = game.loc; game.oldloc = game.loc;
game.newloc = LOC_LEDGE; game.newloc = LOC_LEDGE;
rspeak(RUG_GOES); rspeak(RUG_GOES);
} else if (game.loc == LOC_LEDGE) { } else if (game.loc == LOC_LEDGE) {
game.oldlc2 = game.oldloc; game.oldlc2 = game.oldloc;
game.oldloc = game.loc; game.oldloc = game.loc;
game.newloc = LOC_CLIFF; game.newloc = LOC_CLIFF;
rspeak(RUG_RETURNS); rspeak(RUG_RETURNS);
} else { } else {
// LCOV_EXCL_START // LCOV_EXCL_START
/* should never happen */ /* should never happen */
rspeak(NOTHING_HAPPENS); rspeak(NOTHING_HAPPENS);
// LCOV_EXCL_STOP // LCOV_EXCL_STOP
} }
return GO_TERMINATE; return GO_TERMINATE;
@ -959,7 +959,7 @@ static phase_codes_t listen(void)
soundlatch = true; soundlatch = true;
} }
if (!soundlatch) if (!soundlatch)
rspeak(ALL_SILENT); rspeak(ALL_SILENT);
return GO_CLEAROBJ; return GO_CLEAROBJ;
} }
@ -1012,7 +1012,7 @@ static phase_codes_t lock(verb_t verb, obj_t obj)
if (verb == LOCK) if (verb == LOCK)
rspeak(HUH_MAN); rspeak(HUH_MAN);
else if (TOTING(CLAM)) else if (TOTING(CLAM))
rspeak(DROP_CLAM); rspeak(DROP_CLAM);
else if (!TOTING(TRIDENT)) else if (!TOTING(TRIDENT))
rspeak(CLAM_OPENER); rspeak(CLAM_OPENER);
else { else {
@ -1119,13 +1119,13 @@ static phase_codes_t read(command_t command)
if (DARK(game.loc)) { if (DARK(game.loc)) {
sspeak(NO_SEE, command.word[0].raw); sspeak(NO_SEE, command.word[0].raw);
} else if (command.obj == OYSTER) { } else if (command.obj == OYSTER) {
if (!TOTING(OYSTER) || !game.closed) { if (!TOTING(OYSTER) || !game.closed) {
rspeak(DONT_UNDERSTAND); rspeak(DONT_UNDERSTAND);
} else if (!game.clshnt) { } else if (!game.clshnt) {
game.clshnt = yes_or_no(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]); game.clshnt = yes_or_no(arbitrary_messages[CLUE_QUERY], arbitrary_messages[WAYOUT_CLUE], arbitrary_messages[OK_MAN]);
} else { } else {
pspeak(OYSTER, hear, true, 1); // Not really a sound, but oh well. pspeak(OYSTER, hear, true, 1); // Not really a sound, but oh well.
} }
} else if (objects[command.obj].texts[0] == NULL || } else if (objects[command.obj].texts[0] == NULL ||
game.prop[command.obj] == STATE_NOTFOUND) { game.prop[command.obj] == STATE_NOTFOUND) {
speak(actions[command.verb].message); speak(actions[command.verb].message);
@ -1368,7 +1368,7 @@ phase_codes_t action(command_t command)
else if (command.obj == DWARF && atdwrf(game.loc) > 0) else if (command.obj == DWARF && atdwrf(game.loc) > 0)
/* FALL THROUGH */; /* FALL THROUGH */;
else if (!game.closed && ((LIQUID() == command.obj && HERE(BOTTLE)) || else if (!game.closed && ((LIQUID() == command.obj && HERE(BOTTLE)) ||
command.obj == LIQLOC(game.loc))) command.obj == LIQLOC(game.loc)))
/* FALL THROUGH */; /* FALL THROUGH */;
else if (command.obj == OIL && HERE(URN) && game.prop[URN] != URN_EMPTY) { else if (command.obj == OIL && HERE(URN) && game.prop[URN] != URN_EMPTY) {
command.obj = URN; command.obj = URN;

66
main.c
View file

@ -145,37 +145,37 @@ char *myreadline(const char *prompt)
*/ */
/* Normal case - no script arguments */ /* Normal case - no script arguments */
if (settings.argc == 0) if (settings.argc == 0)
return readline(prompt); return readline(prompt);
char *buf = malloc(LINESIZE+1); char *buf = malloc(LINESIZE + 1);
for (;;) { for (;;) {
if (settings.scriptfp == NULL || feof(settings.scriptfp)) { if (settings.scriptfp == NULL || feof(settings.scriptfp)) {
if (settings.optind >= settings.argc) { if (settings.optind >= settings.argc) {
free(buf); free(buf);
return NULL; return NULL;
} }
char *next = settings.argv[settings.optind++]; char *next = settings.argv[settings.optind++];
if (settings.scriptfp != NULL && feof(settings.scriptfp)) if (settings.scriptfp != NULL && feof(settings.scriptfp))
fclose(settings.scriptfp); fclose(settings.scriptfp);
if (strcmp(next, "-") == 0) if (strcmp(next, "-") == 0)
settings.scriptfp = stdin; // LCOV_EXCL_LINE settings.scriptfp = stdin; // LCOV_EXCL_LINE
else else
settings.scriptfp = fopen(next, "r"); settings.scriptfp = fopen(next, "r");
} }
if (isatty(fileno(settings.scriptfp))) { if (isatty(fileno(settings.scriptfp))) {
free(buf); // LCOV_EXCL_LINE free(buf); // LCOV_EXCL_LINE
return readline(prompt); // LCOV_EXCL_LINE return readline(prompt); // LCOV_EXCL_LINE
} else { } else {
char *ln = fgets(buf, LINESIZE, settings.scriptfp); char *ln = fgets(buf, LINESIZE, settings.scriptfp);
if (ln != NULL) { if (ln != NULL) {
fputs(PROMPT, stdout); fputs(PROMPT, stdout);
fputs(ln, stdout); fputs(ln, stdout);
return ln; return ln;
} }
} }
} }
return NULL; return NULL;
@ -255,7 +255,7 @@ static void checkhints(void)
game.hintlc[hint] = 0; game.hintlc[hint] = 0;
return; return;
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
// Should never hap[pen // Should never hap[pen
BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE BUG(HINT_NUMBER_EXCEEDS_GOTO_LIST); // LCOV_EXCL_LINE
} }
@ -1109,7 +1109,7 @@ static bool preprocess_command(command_t *command)
} }
/* If no word type is given for the first word, we assume it's a motion. */ /* If no word type is given for the first word, we assume it's a motion. */
if(command->word[0].type == NO_WORD_TYPE) if (command->word[0].type == NO_WORD_TYPE)
command->word[0].type = MOTION; command->word[0].type = MOTION;
command->state = PREPROCESSED; command->state = PREPROCESSED;
@ -1186,10 +1186,10 @@ static bool do_command()
while (command.state <= GIVEN) { while (command.state <= GIVEN) {
if (game.closed) { if (game.closed) {
/* If closing time, check for any objects being toted with /* If closing time, check for any objects being toted with
* game.prop < 0 and stash them. This way objects won't be * game.prop < 0 and stash them. This way objects won't be
* described until they've been picked up and put down * described until they've been picked up and put down
* separate from their respective piles. */ * separate from their respective piles. */
if (game.prop[OYSTER] < 0 && TOTING(OYSTER)) if (game.prop[OYSTER] < 0 && TOTING(OYSTER))
pspeak(OYSTER, look, true, 1); pspeak(OYSTER, look, true, 1);
for (size_t i = 1; i <= NOBJECTS; i++) { for (size_t i = 1; i <= NOBJECTS; i++) {
@ -1267,7 +1267,7 @@ static bool do_command()
} }
break;// LCOV_EXCL_LINE break;// LCOV_EXCL_LINE
default: // LCOV_EXCL_LINE default: // LCOV_EXCL_LINE
case NO_WORD_TYPE: // LCOV_EXCL_LINE case NO_WORD_TYPE: // LCOV_EXCL_LINE
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
} }

6
saveresume.c
View file

@ -107,9 +107,9 @@ int resume(void)
while (fp == NULL) { while (fp == NULL) {
char* name = myreadline("\nFile name: "); char* name = myreadline("\nFile name: ");
// Autocomplete can leave the input with an extra trailing space. // Autocomplete can leave the input with an extra trailing space.
if (name != NULL && strlen(name) > 0 && name[strlen(name) - 1] == ' ') if (name != NULL && strlen(name) > 0 && name[strlen(name) - 1] == ' ')
name[strlen(name) - 1] = '\0'; name[strlen(name) - 1] = '\0';
if (name == NULL) if (name == NULL)
return GO_TOP; return GO_TOP;
fp = fopen(name, READ_MODE); fp = fopen(name, READ_MODE);