From 85504de44b2cf8934e9b408cc07e8cf3a2dc3c17 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Fri, 27 Sep 2019 17:06:12 +0200
Subject: [PATCH] shmup:: no more orb usage after death

---
 control.cpp | 2 +-
 shmup.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/control.cpp b/control.cpp
index e0cdb10a..7f68fbf7 100644
--- a/control.cpp
+++ b/control.cpp
@@ -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)
       ;
diff --git a/shmup.cpp b/shmup.cpp
index 3a68914b..8db69e55 100644
--- a/shmup.cpp
+++ b/shmup.cpp
@@ -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);