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

Cleanup Arithmetic on message number

Browse source
This commit is contained in:
Peje Nilsson 2017-06-19 23:44:03 +02:00
parent 87961483a2
commit f9be57a9f9
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
main.c
View file

@ -457,12 +457,15 @@ static bool dwarfmove(void)
if (attack == 0) if (attack == 0)
return true; return true;
if (game.dflag == 2)game.dflag = 3; if (game.dflag == 2)game.dflag = 3;
SETPRM(1, attack, 0); if (attack > 1){
int k = 6; SETPRM(1, attack, 0);
if (attack > 1)k = THROWN_KNIVES; RSPEAK(THROWN_KNIVES);
RSPEAK(k); SETPRM(1, stick, 0);
SETPRM(1, stick, 0); RSPEAK(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT));
RSPEAK(k + 1 + 2 / (1 + stick)); /* FIXME: Arithmetic on message number */ } else {
RSPEAK(KNIFE_THROWN);
RSPEAK(MISSES_YOU);
}
if (stick == 0) if (stick == 0)
return true; return true;
game.oldlc2 = game.loc; game.oldlc2 = game.loc;