Fix some newly introduced bugs in OnDamageDealt

ToxicFrog · Jul 18, 2022 · 44b70fe · 44b70fe
1 parent c77580a
commit 44b70fe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/laevis/CHANGELOG.md b/laevis/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.7.1
+
+- Fix: crash in OnDamageDealt when attacks lacked an inflictor
+- Fix: OnDamageDealt didn't properly trigger for some attacks
+
 # 0.7.0
 
 - New: Lightning tree

diff --git a/laevis/Makefile b/laevis/Makefile
@@ -1,5 +1,5 @@
 NAME=Laevis
-VERSION=0.7.0
+VERSION=0.7.1
 LUMPS=zscript.txt MAPINFO CVARINFO KEYCONF MENUDEF LANGUAGE.* sprites
 LUMPS+=*.md COPYING.freedoom
 ZSDIR=ca.ancilla.laevis

diff --git a/laevis/ca.ancilla.laevis/PerPlayerStats.zs b/laevis/ca.ancilla.laevis/PerPlayerStats.zs
@@ -296,12 +296,14 @@ class ::PerPlayerStats : Inventory {
     // deciding what kinds of upgrades to spawn.
     let info = GetInfoForCurrentWeapon();
     if (!info) return;
-    // Don't count damage from special effects.
-    if (shot.special1 != ::Upgrade::PRI_MISSING) return;
-    if (shot && shot.bMISSILE) {
-      info.projectile_shots++;
-    } else {
-      info.hitscan_shots++;
+    // Don't count damage from special effects. Do count damage where there's no
+    // inflictor, for now; might want to revisit that later.
+    if (!shot || shot.special1 != ::Upgrade::PRI_MISSING) {
+      if (shot && shot.bMISSILE) {
+        info.projectile_shots++;
+      } else {
+        info.hitscan_shots++;
+      }
     }
     info.upgrades.OnDamageDealt(owner, shot, target, damage);
   }