mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-31 05:52:59 +00:00
Code Issues Releases Wiki Activity

shmup:: no more orb usage after death

Browse Source
This commit is contained in:
Zeno Rogue
2019-09-27 17:06:12 +02:00
parent f45b90bad4
commit 85504de44b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
control.cpp
View File

@@ -494,7 +494,7 @@ EX void handleKeyNormal(int sym, int uni) {
multi::cpid = 0; multi::cpid = 0;
if(mouseover && if(mouseover &&
targetclick && (!shmup::on || numplayers() == 1) && targetRangedOrb(mouseover, forcetarget ? roMouseForce : roMouse)) { targetclick && (shmup::on ? numplayers() == 1 && !shmup::pc[0]->dead : true) && targetRangedOrb(mouseover, forcetarget ? roMouseForce : roMouse)) {
} }
else if(forcetarget) else if(forcetarget)
; ;

4
shmup.cpp
View File

@@ -743,13 +743,13 @@ void movePlayer(monster *m, int delta) {
} }
#endif #endif
if(actionspressed[b+pcOrbPower] && !lactionpressed[b+pcOrbPower] && mouseover) { if(actionspressed[b+pcOrbPower] && !lactionpressed[b+pcOrbPower] && mouseover && !m->dead) {
cwt.at = m->base; cwt.at = m->base;
targetRangedOrb(mouseover, roKeyboard); targetRangedOrb(mouseover, roKeyboard);
} }
#if !ISMOBILE #if !ISMOBILE
if(haveRangedOrb()) { if(haveRangedOrb() && !m->dead) {
cwt.at = m->base; cwt.at = m->base;
if(actionspressed[b+pcOrbKey] && !lactionpressed[b+pcOrbKey]) if(actionspressed[b+pcOrbKey] && !lactionpressed[b+pcOrbKey])
keyresult[cpid] = targetRangedOrbKey(roKeyboard); keyresult[cpid] = targetRangedOrbKey(roKeyboard);