cleanup and a few comments

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / damage.qc

diff --git a/qcsrc/server/damage.qc b/qcsrc/server/damage.qc
index 2e84cac3af71e089bbb921e3e59b03539983c8d3..d5a9a20c760d352a7d6631ed2530eba9cf2faad4 100644 (file)
--- a/qcsrc/server/damage.qc
+++ b/qcsrc/server/damage.qc
@@ -961,8 +961,7 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in
                                                #if 0
                                                        // code stolen from W_SetupShot_Dir_ProjectileSize_Range()
                                                        vector md = targ.(weaponentity).movedir;
-                                                       vector vecs = ((md.x > 0) ? md : '0 0 0');
-                                                       vector dv = v_right * -vecs.y + v_up * vecs.z;
+                                                       vector dv = v_right * -md.y + v_up * md.z;
                                                        vector mi = '0 0 0', ma = '0 0 0';
 
                                                        if(IS_CLIENT(targ)) // no antilag for non-clients!
@@ -977,8 +976,11 @@ float RadiusDamageForSource (entity inflictor, vector inflictororigin, vector in
 
                                                        center.z = trace_endpos.z;
                                                #else
-                                                       // very cheap way but it skips movedir.x > 0 checks and move into solid checks which is fine most of the time for now AFAIK
-                                                       // this should only really be an issue with absurd g_shootfromfixedorigin custom values like "-1 0 9001"
+                                                       // very cheap way but it skips move into solid checks which is fine most of the time for now AFAIK
+                                                       // this should only really be an issue with some rare edge cases where
+                                                       // shot origin was prevented from going into a ceiling but it still explodes at the ceiling
+                                                       // shot origin wasn't raised as high as possible and the shooter gets upwards knockback
+                                                       // TL;DR: no bugs if vertical shot origin is always within player bbox
                                                        center.z = center.z + targ.(weaponentity).movedir.z;
                                                #endif
                                                }