Fix my last commit

diff --git a/data/balanceVT.cfg b/data/balanceVT.cfg
index 08f66d50bce67d3f0fc49b7d8437665a169e7605..061ba8f8a7d3cd4ea3f3134217f672254db16d89 100644 (file)
--- a/data/balanceVT.cfg
+++ b/data/balanceVT.cfg
@@ -210,7 +210,7 @@ set g_balance_vore_swallow_speed_cutspd_pred 0.5 "predator movement slows down b
 set g_balance_vore_swallow_speed 1 "how long it takes to swallow a player"\r
 set g_balance_vore_swallow_dropweapon 0.6 "probability of dropping your weapon when swallowed. 0 = never and 1 = always, does not apply to team mates"\r
 set g_balance_vore_swallow_predator_punchangle 10 "your view gets tilted by this amount when swallowing someone"\r
-set g_balance_vore_swallow_predator_punchangle_item 6 "your view gets tilted by this amount when swallowing an item"\r
+set g_balance_vore_swallow_predator_punchangle_item 8 "your view gets tilted by this amount when swallowing an item"\r
 set g_balance_vore_swallow_prey_punchvector 25 "your view gets lifted by this amount when getting swallowed"\r
 set g_balance_vore_regurgitate_damage 10 "predators take this amount of damage whenever regurgitating someone (influenced by player scale difference)"\r
 set g_balance_vore_regurgitate_swallowprogress 0.5 "regurgitated prey is given this amount of swallow progress, to simulate being more vulnerable (if slow swallowing is enabled)"\r
@@ -219,7 +219,7 @@ set g_balance_vore_regurgitate_predatorforce 450 "players are pushed back by thi
 set g_balance_vore_regurgitate_delay 0.5 "regurgitation delay"\r
 set g_balance_vore_regurgitate_death_silent 0 "when dead prey is digested to the maximum amount, remove them silently rather than throwing up the gibs"\r
 set g_balance_vore_regurgitate_predator_punchangle 10 "your view gets tilted by this amount when regurgitating someone"\r
-set g_balance_vore_regurgitate_predator_punchangle_item 4 "your view gets tilted by this amount when regurgitating an item"\r
+set g_balance_vore_regurgitate_predator_punchangle_item 6 "your view gets tilted by this amount when regurgitating an item"\r
 set g_balance_vore_regurgitate_prey_punchvector 50 "your view gets lowered by this amount when getting regurgitated"\r
 set g_balance_vore_digestion_damage 3 "amount of damage applied to victims during digestion"\r
 set g_balance_vore_digestion_damage_death 4.5 "amount of damage applied to dead victims during digestion"\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index cb11ff0ff7d049d309611f2e87ba47cac67b90ec..fde51ba8bfe40ddee8ca6ebc0611ff143479e538 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -293,7 +293,7 @@ void Item_Consumable_Remove(entity e, float regurgitate)
        if(regurgitate)\r
        {\r
                float scalediff, sz;\r
-               sz = e.scale; // the line below does not work if I define this directly (fteqcc bug?)\r
+               sz = e.scale ? e.scale : 1; // 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
                // predator effects, some common to those in Vore_Regurgitate\r
@@ -318,10 +318,6 @@ void Item_Consumable_Spawn(entity e, entity pl)
 {\r
        entity item;\r
 \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
        item = spawn();\r
        item.owner = e;\r
        item.classname = "consumable";\r
@@ -355,6 +351,10 @@ void Item_Consumable_Spawn(entity e, entity pl)
        if(stov(cvar_string("g_vore_regurgitatecolor_color_normal")))\r
                item.colormod = stov(cvar_string("g_vore_regurgitatecolor_color_normal"));\r
 \r
+       float scalediff, sz;\r
+       sz = e.scale ? e.scale : 1; // the line below does not work if I define this directly (fteqcc bug?)\r
+       scalediff = cvar("g_healthsize") ? sz / pl.scale : sz; // the tighter the gut, the greater the velocity\r
+\r
        // predator effects, some common to those in Vore_Swallow\r
        PlayerSound(pl, playersound_swallow, CHAN_VOICE, VOICETYPE_PLAYERSOUND);\r
        setanim(pl, pl.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating\r
@@ -400,7 +400,7 @@ void Item_DroppedConsumable_Spawn(entity e)
                item.effects |= EF_NODEPTHTEST;\r
 \r
        float scalediff, sz;\r
-       sz = e.scale; // the line below does not work if I define this directly (fteqcc bug?)\r
+       sz = e.scale ? e.scale : 1; // 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

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