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

Code simplification.

Browse source
This commit is contained in:
Eric S. Raymond 2017-06-18 14:02:24 -04:00
parent ba5c7dacb5
commit 409ffe4a86
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
main.c
View file

@ -645,10 +645,10 @@ static bool playermove(FILE *cmdin, token_t verb, int motion)
* actual motion, but can be spotted by "go back". */ * actual motion, but can be spotted by "go back". */
/* FIXME: Arithmetic on location numbers */ /* FIXME: Arithmetic on location numbers */
game.newloc = 99 + 100 - game.loc; game.newloc = 99 + 100 - game.loc;
if (game.holdng == 0 || (game.holdng == 1 && TOTING(EMRALD))) if (game.holdng > 1 || (game.holdng == 1 && !TOTING(EMRALD))) {
return true; game.newloc = game.loc;
game.newloc = game.loc; RSPEAK(MUST_DROP);
RSPEAK(MUST_DROP); }
return true; return true;
case 2: case 2:
/* Travel 302. Plover transport. Drop the emerald (only use /* Travel 302. Plover transport. Drop the emerald (only use
@ -661,7 +661,7 @@ static bool playermove(FILE *cmdin, token_t verb, int motion)
++kk; ++kk;
game.newloc = labs(TRAVEL[kk]) / 1000; game.newloc = labs(TRAVEL[kk]) / 1000;
} while } while
(game.newloc == scratchloc); (game.newloc == scratchloc);
continue; /* back to top of do/while loop */ continue; /* back to top of do/while loop */
case 3: case 3:
/* Travel 303. Troll bridge. Must be done only as special /* Travel 303. Troll bridge. Must be done only as special
@ -693,13 +693,12 @@ static bool playermove(FILE *cmdin, token_t verb, int motion)
game.prop[BEAR] = 3; game.prop[BEAR] = 3;
game.oldlc2 = game.newloc; game.oldlc2 = game.newloc;
croak(cmdin); croak(cmdin);
return false;
} }
} }
BUG(20); BUG(20);
} }
} while } while
(false); (false);
/* FIXME: Arithmetic on location number, becoming a message number */ /* FIXME: Arithmetic on location number, becoming a message number */
RSPEAK(game.newloc - 500); RSPEAK(game.newloc - 500);
game.newloc = game.loc; game.newloc = game.loc;