nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Remove the victim argument to rust_dmg().

Browse Source 
The argument can be calculated from `otmp`.
This commit is contained in:
Sean Hunt
2015-02-23 15:08:30 -05:00
parent 5ffd5a3000
commit 9c4b0113aa
6 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mhitu.c
View File

@@ -740,12 +740,12 @@ int attk;
while (1) {
switch(rn2(5)) {
case 0:
if (!uarmh || !rust_dmg(uarmh, xname(uarmh), hurt, FALSE, &youmonst))
if (!uarmh || !rust_dmg(uarmh, xname(uarmh), hurt, FALSE))
continue;
break;
case 1:
if (uarmc) {
(void)rust_dmg(uarmc, xname(uarmc), hurt, TRUE, &youmonst);
(void)rust_dmg(uarmc, xname(uarmc), hurt, TRUE);
break;
}
/* Note the difference between break and continue;
@@ -754,20 +754,20 @@ int attk;
* something else did.
*/
if (uarm)
(void)rust_dmg(uarm, xname(uarm), hurt, TRUE, &youmonst);
(void)rust_dmg(uarm, xname(uarm), hurt, TRUE);
else if (uarmu)
(void)rust_dmg(uarmu, xname(uarmu), hurt, TRUE, &youmonst);
(void)rust_dmg(uarmu, xname(uarmu), hurt, TRUE);
break;
case 2:
if (!uarms || !rust_dmg(uarms, xname(uarms), hurt, FALSE, &youmonst))
if (!uarms || !rust_dmg(uarms, xname(uarms), hurt, FALSE))
continue;
break;
case 3:
if (!uarmg || !rust_dmg(uarmg, xname(uarmg), hurt, FALSE, &youmonst))
if (!uarmg || !rust_dmg(uarmg, xname(uarmg), hurt, FALSE))
continue;
break;
case 4:
if (!uarmf || !rust_dmg(uarmf, xname(uarmf), hurt, FALSE, &youmonst))
if (!uarmf || !rust_dmg(uarmf, xname(uarmf), hurt, FALSE))
continue;
break;
}