]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Limit queue to MAX_SHOCKWAVE_HITS
authorSamual Lenks <samual@xonotic.org>
Thu, 2 Jan 2014 13:33:37 +0000 (08:33 -0500)
committerSamual Lenks <samual@xonotic.org>
Thu, 2 Jan 2014 13:33:37 +0000 (08:33 -0500)
qcsrc/common/weapons/w_shockwave.qc

index c2432fa0422d27eaab77df23b3d4973ed20a9756..6fb8e9541585b67d2f1f4298f0e544dbe9fbea5f 100644 (file)
@@ -490,7 +490,7 @@ void W_Shockwave_Attack()
                                final_force_z *= WEP_CVAR(shockwave, blast_force_zscale);
 
                                // queue damage with this calculated info
-                               if(W_Shockwave_Attack_CheckHit(queue, head, final_force, final_damage)) { ++queue; }
+                               if(W_Shockwave_Attack_CheckHit(queue, head, final_force, final_damage)) { queue = min(queue + 1, MAX_SHOCKWAVE_HITS); }
 
                                #ifdef DEBUG_SHOCKWAVE
                                print(sprintf(
@@ -582,7 +582,7 @@ void W_Shockwave_Attack()
                                final_force_z *= WEP_CVAR(shockwave, blast_force_zscale);
 
                                // queue damage with this calculated info
-                               if(W_Shockwave_Attack_CheckHit(queue, head, final_force, final_damage)) { ++queue; }
+                               if(W_Shockwave_Attack_CheckHit(queue, head, final_force, final_damage)) { queue = min(queue + 1, MAX_SHOCKWAVE_HITS); }
 
                                #ifdef DEBUG_SHOCKWAVE
                                print(sprintf(