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

Command repeating by using cmd queues

Browse Source 
This replaces the old pushq/saveq arrays (which were used to save
the keys pressed by the user for repeating a previous command)
with a new command queue.  This means there's no hard-coded limit
to the saved keys, and it can repeat extended commands which are
not bound to any key.
This commit is contained in:
Pasi Kallinen
2022-08-08 14:02:59 +03:00
parent 4e6d3aba4f
commit fd9745f9c6
34 changed files with 417 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/dothrow.c
View File

@@ -480,8 +480,8 @@ dofire(void)
&& !(uswapwep->cursed && uswapwep->bknown)) {
/* we have a known not-cursed polearm as swap weapon.
swap to it and retry */
cmdq_add_ec(doswapweapon);
cmdq_add_ec(dofire);
cmdq_add_ec(CQ_CANNED, doswapweapon);
cmdq_add_ec(CQ_CANNED, dofire);
return ECMD_OK; /* haven't taken any time yet */
} else {
You("have no ammunition readied.");
@@ -522,16 +522,16 @@ dofire(void)
obj = uquiver;
} else if (ammo_and_launcher(uquiver, uswapwep)) {
/* swap weapons and retry fire */
cmdq_add_ec(doswapweapon);
cmdq_add_ec(dofire);
cmdq_add_ec(CQ_CANNED, doswapweapon);
cmdq_add_ec(CQ_CANNED, dofire);
return res;
} else if ((olauncher = find_launcher(uquiver)) != 0) {
/* wield launcher, retry fire */
if (uwep && !flags.pushweapon)
cmdq_add_ec(doswapweapon);
cmdq_add_ec(dowield);
cmdq_add_key(olauncher->invlet);
cmdq_add_ec(dofire);
cmdq_add_ec(CQ_CANNED, doswapweapon);
cmdq_add_ec(CQ_CANNED, dowield);
cmdq_add_key(CQ_CANNED, olauncher->invlet);
cmdq_add_ec(CQ_CANNED, dofire);
return res;
}
}