fix shotgun damage recording

sauerbraten · Dec 4, 2020 · af883ec · af883ec
1 parent 6cadd92
commit af883ec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/patches/scoreboard.patch b/patches/scoreboard.patch
@@ -669,7 +669,7 @@ Index: src/fpsgame/weaponstats.cpp
 +        if(!shouldcountdamage(attacker, target)) return;
 +        int gun = attacker->gunselect;
 +        // try to fix gun used to deal the damage
-+        if(gun == GUN_RL || gun == GUN_GL || damage != guns[gun].damage * (attacker->quadmillis ? 4 : 1))
++        if((gun != GUN_SG && damage != guns[gun].damage * (attacker->quadmillis ? 4 : 1)) || (gun == GUN_SG && damage%(attacker->quadmillis ? 40 : 10) != 0))
 +        {
 +            gun = attacker->stats.lastprojectile;
 +        }

diff --git a/src/fpsgame/weaponstats.cpp b/src/fpsgame/weaponstats.cpp
@@ -19,7 +19,7 @@ namespace game {
         if(!shouldcountdamage(attacker, target)) return;
         int gun = attacker->gunselect;
         // try to fix gun used to deal the damage
-        if(gun == GUN_RL || gun == GUN_GL || damage != guns[gun].damage * (attacker->quadmillis ? 4 : 1))
+        if((gun != GUN_SG && damage != guns[gun].damage * (attacker->quadmillis ? 4 : 1)) || (gun == GUN_SG && damage%(attacker->quadmillis ? 40 : 10) != 0))
         {
             gun = attacker->stats.lastprojectile;
         }