Fix a weird bug in a recent commit which was breaking item velocities

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 89c5a2f2880b5b660cea84210c20483d4134591f..5517fa30dfedb8fa859a0eeb6604ce187737384d 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -390,14 +390,15 @@ void Item_DroppedConsumable_Spawn(entity e)
        if(cvar("g_nodepthtestitems"))\r
                item.effects |= EF_NODEPTHTEST;\r
 \r
-       float scalediff;\r
-       scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : e.scale; // the tighter the gut, the greater the velocity\r
+       float scalediff, sz;\r
+       sz = e.scale; // the line below does not work if I define this directly (fteqcc bug?)\r
+       scalediff = cvar("g_healthsize") ? sz / e.predator.scale : sz; // the tighter the gut, the greater the velocity\r
+\r
        setorigin(item, e.predator.origin);\r
        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 += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff;\r
-\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/docs/TODO.txt b/docs/TODO.txt
index 93720e467b2ca2e7f59d8a262ad02c391470b9b7..143eb6e0dc5ef670579b0e35a6071192d4097ad1 100644 (file)
--- a/docs/TODO.txt
+++ b/docs/TODO.txt
@@ -154,6 +154,4 @@
 \r
 - 0.7 | 0.8 BUG: Bots still throw up health items when they need them\r
 \r
-- +0.8: Create a recommended bot number for maps in mapinfo\r
-\r
-- 0.7: Throwing up items doesn't apply velocities (might be the healthsize thing)
\ No newline at end of file
+- +0.8: Create a recommended bot number for maps in mapinfo
\ No newline at end of file