Change how the autodigest preference works. 0 disables, 1 automates digestion for...

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index a4762511ab56bef6846d33f48d805fabe3cfa433..02da4091843b2bd8e892713769b7d7483c190b7e 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1607,7 +1607,7 @@ seta cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us wh
 seta cl_vore_swallowmodel 1 "when enabled, we see the swallow model around us while getting eaten. -1 = disabled, 1 = enabled, anything between = alpha"\r
 seta cl_vore_cutvolume_sound 0.25 "sound volume is reduced by this amount when you are in a stomach or being swallowed"\r
 seta cl_vore_cutvolume_music 0.85 "music volume is reduced by this amount when you are in a stomach or being swallowed"\r
-seta cl_vore_autodigest 0 "when enabled, the player will automatically begin digesting enemy prey after eating them, as long as no team mates are inside (automated digest key)"\r
+seta cl_vore_autodigest 1 "when enabled, the player will automatically begin digesting stuff as long as no team mates are inside. 0 = disabled, 1 = items, 2 = items & players"\r
 seta cl_vore_vieweffects_idlescale_predator 35 "the view will move around by this ammount while swallowing someone (based on progress), reserves the cvar v_idlescale"\r
 seta cl_vore_vieweffects_idlescale_prey 50 "the view will move around by this ammount while being swallowed (based on progress), reserves the cvar v_idlescale"\r
 seta cl_vore_vieweffects_idlescale_stomach 15 "the view will move around by this ammount while in the stomach, reserves the cvar v_idlescale"\r

diff --git a/data/qcsrc/menu/voret/dialog_settings_input.c b/data/qcsrc/menu/voret/dialog_settings_input.c
index 5e7b8ca219695e049bc7a073c4f35698b2aadfdf..f902ccc13f515214d8bf2170cf58f10a7b4aae1a 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_settings_input.c
+++ b/data/qcsrc/menu/voret/dialog_settings_input.c
@@ -75,6 +75,11 @@ void fillVoretInputSettingsTab(entity me)
                me.TD(me, 1, 3, e = makeVoretCheckBoxEx(2, 0, "cl_showpressedkeys", "Show pressed keys"));\r
        me.TR(me);\r
        me.TR(me);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_vore_autodigest", "Automatic digestion"));\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Automatic digestion:"));\r
+               me.TD(me, 1, 2, e = makeVoretTextSlider("cl_vore_autodigest"));\r
+                       e.addValue(e, "Disabled", "0");\r
+                       e.addValue(e, "Items", "1");\r
+                       e.addValue(e, "Items & Players", "2");\r
+                       e.configureVoretTextSliderValues(e);\r
 }\r
 #endif\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index a9f3ee52b8f2694ac91bb083b6872813bcee8867..54af0c60a19db6ce9fbd8865ea44dd1d0bc46e23 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -351,7 +351,8 @@ void Item_Consumable_Spawn(entity e, entity pl)
        pl.punchangle_x -= cvar("g_balance_vore_swallow_predator_punchangle_item");\r
        pl.regurgitate_prepare = 0;\r
        pl.action_delay = time + cvar("g_balance_vore_action_delay");\r
-       Vore_AutoDigest(pl);\r
+       if(pl.cvar_cl_vore_autodigest > 0)\r
+               Vore_AutoDigest(pl);\r
 }\r
 \r
 void Item_DroppedConsumable_Touch()\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index b09036029aa82db7ff6f9776cbc15501119d3adb..b6e40b95e2ab23f40287f9f78b18c70e5c0a9733 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -312,8 +312,9 @@ void Vore_Swallow(entity e)
        e.predator.regurgitate_prepare = 0;\r
        e.predator.spawnshieldtime = 0; // lose spawn shield when we vore\r
        e.predator.hitsound += 1; // play this for team mates too, as we could be swallowing them to heal them\r
-       Vore_AutoDigest(e.predator);\r
        Vore_SetPreyPositions(e.predator);\r
+       if(e.predator.cvar_cl_vore_autodigest > 1)\r
+               Vore_AutoDigest(e.predator);\r
 \r
        // block firing for a small amount of time, or we'll be firing the next frame after we swallow\r
        e.predator.weapon_delay = time + button_delay_time;\r