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

Make extended commands return defined flags

Browse Source 
Instead of returning 0 or 1, we'll now use ECMD_OK or ECMD_TURN.
These have the same meaning as the hardcoded numbers; ECMD_TURN
means the command uses a turn.

In future, could add eg. a flag denoting "user cancelled command"
or "command failed", and should clear eg. the cmdq.

Mostly this was simply replacing return values with the defines
in the extended commands, so hopefully I didn't break anything.
This commit is contained in:
Pasi Kallinen
2021-12-30 18:46:30 +02:00
parent 511ce70309
commit d53cd28d46
46 changed files with 821 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/music.c
View File

@@ -693,13 +693,13 @@ do_play_instrument(struct obj* instr)
if (Underwater) {
You_cant("play music underwater!");
return 0;
return ECMD_OK;
} else if ((instr->otyp == WOODEN_FLUTE || instr->otyp == MAGIC_FLUTE
|| instr->otyp == TOOLED_HORN || instr->otyp == FROST_HORN
|| instr->otyp == FIRE_HORN || instr->otyp == BUGLE)
&& !can_blow(&g.youmonst)) {
You("are incapable of playing %s.", the(distant_name(instr, xname)));
return 0;
return ECMD_OK;
}
if (instr->otyp != LEATHER_DRUM && instr->otyp != DRUM_OF_EARTHQUAKE
&& !(Stunned || Confusion || Hallucination)) {
@@ -750,7 +750,7 @@ do_play_instrument(struct obj* instr)
close_drawbridge(x, y);
else
open_drawbridge(x, y);
return 1;
return ECMD_TIME;
}
} else if (!Deaf) {
if (u.uevent.uheard_tune < 1)
@@ -807,13 +807,13 @@ do_play_instrument(struct obj* instr)
}
}
}
return 1;
return ECMD_TIME;
} else
return do_improvisation(instr);
return do_improvisation(instr) ? ECMD_TIME : ECMD_OK;
nevermind:
pline1(Never_mind);
return 0;
return ECMD_OK;
}
/*music.c*/