mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-03-31 07:47:02 +00:00
shmup:: no more orb usage after death
This commit is contained in:
parent
f45b90bad4
commit
85504de44b
@ -494,7 +494,7 @@ EX void handleKeyNormal(int sym, int uni) {
|
||||
|
||||
multi::cpid = 0;
|
||||
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)
|
||||
;
|
||||
|
@ -743,13 +743,13 @@ void movePlayer(monster *m, int delta) {
|
||||
}
|
||||
#endif
|
||||
|
||||
if(actionspressed[b+pcOrbPower] && !lactionpressed[b+pcOrbPower] && mouseover) {
|
||||
if(actionspressed[b+pcOrbPower] && !lactionpressed[b+pcOrbPower] && mouseover && !m->dead) {
|
||||
cwt.at = m->base;
|
||||
targetRangedOrb(mouseover, roKeyboard);
|
||||
}
|
||||
|
||||
#if !ISMOBILE
|
||||
if(haveRangedOrb()) {
|
||||
if(haveRangedOrb() && !m->dead) {
|
||||
cwt.at = m->base;
|
||||
if(actionspressed[b+pcOrbKey] && !lactionpressed[b+pcOrbKey])
|
||||
keyresult[cpid] = targetRangedOrbKey(roKeyboard);
|
||||
|
Loading…
x
Reference in New Issue
Block a user