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

Reindend, compile out all save stuff

Browse source
This commit is contained in:
NHOrus 2017-07-01 16:46:51 +03:00
parent 8cc5ee5412
commit 45820bc8cd
2 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
actions.c
View file

@ -93,12 +93,20 @@ static int attack(struct command_t *command)
} }
spk = (dwarves > 1) ? OGRE_PANIC1 : OGRE_PANIC2; spk = (dwarves > 1) ? OGRE_PANIC1 : OGRE_PANIC2;
} else if (obj == BEAR) { } else if (obj == BEAR) {
switch (game.prop[BEAR]) { switch (game.prop[BEAR]) {
case UNTAMED_BEAR: spk = BEAR_HANDS; break; case UNTAMED_BEAR:
case SITTING_BEAR: spk = BEAR_CONFUSED; break; spk = BEAR_HANDS;
case CONTENTED_BEAR: spk = BEAR_CONFUSED; break; break;
case BEAR_DEAD: spk = ALREADY_DEAD; break; case SITTING_BEAR:
} spk = BEAR_CONFUSED;
break;
case CONTENTED_BEAR:
spk = BEAR_CONFUSED;
break;
case BEAR_DEAD:
spk = ALREADY_DEAD;
break;
}
} else if (obj == DRAGON && game.prop[DRAGON] == 0) { } else if (obj == DRAGON && game.prop[DRAGON] == 0) {
/* Fun stuff for dragon. If he insists on attacking it, win! /* Fun stuff for dragon. If he insists on attacking it, win!
* Set game.prop to dead, move dragon to central loc (still * Set game.prop to dead, move dragon to central loc (still

11
main.c
View file

@ -122,6 +122,8 @@ int main(int argc, char *argv[])
/* Start-up, dwarf stuff */ /* Start-up, dwarf stuff */
make_zzword(game.zzword); make_zzword(game.zzword);
#ifndef ADVENT_NOSAVE
if (!rfp) { if (!rfp) {
game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]); game.novice = yes(arbitrary_messages[WELCOME_YOU], arbitrary_messages[CAVE_NEARBY], arbitrary_messages[NO_MESSAGE]);
if (game.novice) if (game.novice)
@ -129,6 +131,7 @@ int main(int argc, char *argv[])
} else { } else {
restore(rfp); restore(rfp);
} }
#endif
if (logfp) if (logfp)
fprintf(logfp, "seed %ld\n", seedval); fprintf(logfp, "seed %ld\n", seedval);
@ -1090,12 +1093,12 @@ L2607:
wordclear(&command.wd2); wordclear(&command.wd2);
} else { } else {
/* FIXME: Magic numbers related to vocabulary */ /* FIXME: Magic numbers related to vocabulary */
if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) || if (!((V1 != PROMOTE_WORD(WATER) && V1 != PROMOTE_WORD(OIL)) ||
(V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) { (V2 != PROMOTE_WORD(PLANT) && V2 != PROMOTE_WORD(DOOR)))) {
if (AT(DEMOTE_WORD(V2))) if (AT(DEMOTE_WORD(V2)))
command.wd2 = token_to_packed("POUR"); command.wd2 = token_to_packed("POUR");
} }
if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD)) if (V1 == PROMOTE_WORD(CAGE) && V2 == PROMOTE_WORD(BIRD) && HERE(CAGE) && HERE(BIRD))
command.wd1 = token_to_packed("CATCH"); command.wd1 = token_to_packed("CATCH");
} }
L2620: L2620: