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

Restructure lightcheck

Browse source
This commit is contained in:
NHOrus 2017-07-08 17:40:35 +03:00
parent 7d690e0b95
commit 386ca2b8d2
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
main.c
View file

@ -384,7 +384,7 @@ static bool dwarfmove(void)
kk = tkey[game.dloc[i]]; kk = tkey[game.dloc[i]];
if (kk != 0) if (kk != 0)
do { do {
enum desttype_t desttype = travel[kk].desttype; enum desttype_t desttype = travel[kk].desttype;
game.newloc = travel[kk].destval; game.newloc = travel[kk].destval;
/* Have we avoided a dwarf encounter? */ /* Have we avoided a dwarf encounter? */
if (desttype != dest_goto) if (desttype != dest_goto)
@ -509,8 +509,8 @@ static bool traveleq(long a, long b)
/* Are two travel entries equal for purposes of skip after failed condition? */ /* Are two travel entries equal for purposes of skip after failed condition? */
{ {
return (travel[a].condtype == travel[b].condtype) return (travel[a].condtype == travel[b].condtype)
&& (travel[a].condarg1 == travel[b].condarg1) && (travel[a].condarg1 == travel[b].condarg1)
&& (travel[a].condarg2 == travel[b].condarg2) && (travel[a].condarg2 == travel[b].condarg2)
&& (travel[a].desttype == travel[b].desttype) && (travel[a].desttype == travel[b].desttype)
&& (travel[a].destval == travel[b].destval); && (travel[a].destval == travel[b].destval);
} }
@ -548,7 +548,7 @@ static void playermove( int motion)
if (spk == 0) { if (spk == 0) {
int te_tmp = 0; int te_tmp = 0;
for (;;) { for (;;) {
enum desttype_t desttype = travel[travel_entry].desttype; enum desttype_t desttype = travel[travel_entry].desttype;
scratchloc = travel[travel_entry].destval; scratchloc = travel[travel_entry].destval;
if (desttype != dest_goto || scratchloc != motion) { if (desttype != dest_goto || scratchloc != motion) {
if (desttype == dest_goto) { if (desttype == dest_goto) {
@ -635,7 +635,7 @@ static void playermove( int motion)
do { do {
for (;;) { /* L12 loop */ for (;;) { /* L12 loop */
for (;;) { for (;;) {
enum condtype_t condtype = travel[travel_entry].condtype; enum condtype_t condtype = travel[travel_entry].condtype;
long condarg1 = travel[travel_entry].condarg1; long condarg1 = travel[travel_entry].condarg1;
long condarg2 = travel[travel_entry].condarg2; long condarg2 = travel[travel_entry].condarg2;
if (condtype < cond_not) { if (condtype < cond_not) {
@ -667,7 +667,7 @@ static void playermove( int motion)
} }
/* Found an eligible rule, now execute it */ /* Found an eligible rule, now execute it */
enum desttype_t desttype = travel[travel_entry].desttype; enum desttype_t desttype = travel[travel_entry].desttype;
game.newloc = travel[travel_entry].destval; game.newloc = travel[travel_entry].destval;
if (desttype == dest_goto) if (desttype == dest_goto)
return; return;
@ -879,28 +879,29 @@ static void lampcheck(void)
* here, in which case we replace the batteries and continue. * here, in which case we replace the batteries and continue.
* Second is for other cases of lamp dying. Eve after it goes * Second is for other cases of lamp dying. Eve after it goes
* out, he can explore outside for a while if desired. */ * out, he can explore outside for a while if desired. */
if (game.limit <= WARNTIME && HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) { if (game.limit <= WARNTIME) {
rspeak(REPLACE_BATTERIES); if (HERE(BATTERY) && game.prop[BATTERY] == FRESH_BATTERIES && HERE(LAMP)) {
game.prop[BATTERY] = DEAD_BATTERIES; rspeak(REPLACE_BATTERIES);
if (TOTING(BATTERY)) game.prop[BATTERY] = DEAD_BATTERIES;
drop(BATTERY, game.loc); if (TOTING(BATTERY))
game.limit += BATTERYLIFE; drop(BATTERY, game.loc);
game.lmwarn = false; game.limit += BATTERYLIFE;
} else if (game.limit == 0) { game.lmwarn = false;
} else if (!game.lmwarn && HERE(LAMP)) {
game.lmwarn = true;
if (game.prop[BATTERY] == DEAD_BATTERIES)
rspeak(MISSING_BATTERIES);
else if (game.place[BATTERY] == LOC_NOWHERE)
rspeak(LAMP_DIM);
else
rspeak(GET_BATTERIES);
}
}
if (game.limit == 0) {
game.limit = -1; game.limit = -1;
game.prop[LAMP] = LAMP_DARK; game.prop[LAMP] = LAMP_DARK;
if (HERE(LAMP)) if (HERE(LAMP))
rspeak(LAMP_OUT); rspeak(LAMP_OUT);
} else if (game.limit <= WARNTIME) {
if (!game.lmwarn && HERE(LAMP)) {
game.lmwarn = true;
int spk = GET_BATTERIES;
if (game.place[BATTERY] == LOC_NOWHERE)
spk = LAMP_DIM;
if (game.prop[BATTERY] == DEAD_BATTERIES)
spk = MISSING_BATTERIES;
rspeak(spk);
}
} }
} }