Fix my last commit

[voretournament/voretournament.git] / data / qcsrc / server / vore.qc

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index cd264c5b204eace68ca1768746e9843df07c2e0a..f88b245bf010e05212504b90af9d187ebf23b64e 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -290,9 +290,6 @@ void Vore_Swallow(entity e)
 {\r
        // this player is being swallowed by another player, apply the proper changes\r
 \r
-       float scalediff;\r
-       scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the effect\r
-\r
        e.vore_oldmovetype = e.movetype;\r
        e.vore_oldsolid = e.solid;\r
        e.punchvector_z = cvar("g_balance_vore_swallow_prey_punchvector");\r
@@ -304,6 +301,9 @@ void Vore_Swallow(entity e)
        e.solid = SOLID_NOT;\r
        e.aiment = e.predator; // follow the predator, automatically unset when regurgitated\r
 \r
+       float scalediff;\r
+       scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the effect\r
+\r
        // drop keys (KH) and flags (CTF) when we get swallowed\r
        kh_Key_DropAll(e, FALSE);\r
        if(e.flagcarried)\r
@@ -377,9 +377,6 @@ void Vore_Regurgitate(entity e)
 {\r
        // this player is being regurgitated by their predator, apply the proper changes\r
 \r
-       float scalediff;\r
-       scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the effect\r
-\r
        e.movetype = e.vore_oldmovetype;\r
        if(e.health > 0) // leave SOLID_NOT for dead bodies\r
                e.solid = e.vore_oldsolid;\r
@@ -395,6 +392,9 @@ void Vore_Regurgitate(entity e)
                return;\r
        }\r
 \r
+       float scalediff;\r
+       scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : 1; // the tighter the gut, the greater the effect\r
+\r
        // apply velocities\r
        makevectors(e.predator.v_angle);\r
        e.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;\r