projects
/
open-adventure.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8796148
)
Cleanup Arithmetic on message number
author
Peje Nilsson
<peje66@gmail.com>
Mon, 19 Jun 2017 21:44:03 +0000
(23:44 +0200)
committer
Peje Nilsson
<peje66@gmail.com>
Mon, 19 Jun 2017 21:44:03 +0000
(23:44 +0200)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index f79c68c0f3e4eaa412ac3947b2176b38d330daf5..92ee30391dfb7e9bf349fc906a76d5052ffeb8c4 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-457,12
+457,15
@@
static bool dwarfmove(void)
if (attack == 0)
return true;
if (game.dflag == 2)game.dflag = 3;
if (attack == 0)
return true;
if (game.dflag == 2)game.dflag = 3;
- SETPRM(1, attack, 0);
- int k = 6;
- if (attack > 1)k = THROWN_KNIVES;
- RSPEAK(k);
- SETPRM(1, stick, 0);
- RSPEAK(k + 1 + 2 / (1 + stick)); /* FIXME: Arithmetic on message number */
+ if (attack > 1){
+ SETPRM(1, attack, 0);
+ RSPEAK(THROWN_KNIVES);
+ SETPRM(1, stick, 0);
+ RSPEAK(stick > 1 ? MULTIPLE_HITS : (stick == 1 ? ONE_HIT : NONE_HIT));
+ } else {
+ RSPEAK(KNIFE_THROWN);
+ RSPEAK(MISSES_YOU);
+ }
if (stick == 0)
return true;
game.oldlc2 = game.loc;
if (stick == 0)
return true;
game.oldlc2 = game.loc;