Revert the commit with predator.velocity breakage, since the bug just got fixed in...

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index d936ddb7b3267986014254febe3568db8fd2fc21..128e01138bcaefed6458c936ff78f8a40c62baad 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -407,7 +407,7 @@ void Item_DroppedConsumable_Spawn(entity e)
        item.angles_y = e.predator.angles_y;\r
        makevectors(e.predator.v_angle);\r
        item.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;\r
-       e.predator.velocity = e.predator.velocity + (-v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff); // don't use += here to avoid a fteqcc bug\r
+       e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff;\r
        item.touch = Item_DroppedConsumable_Touch;\r
        item.cnt = time + 1; // 1 second delay\r
        SUB_SetFade(item, time + 20, 1);\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index b32c2d6dbcd000aa54f7fee6202a1e3281dc2c9f..fa8f453e90f866adf89fd7d19d766e42aa32f5af 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -411,7 +411,7 @@ void Vore_Regurgitate(entity e)
        // apply velocities\r
        makevectors(e.predator.v_angle);\r
        e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;\r
-       e.predator.velocity = e.predator.velocity + (-v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff); // don't use += here to avoid a fteqcc bug\r
+       e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff;\r
        e.pusher = e.predator; // allows us to frag players by regurgitating them in deadly pits\r
        e.pushltime = time + cvar("g_maxpushtime");\r
 \r