Use a different cvar for the swallow model than the stomach model

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index d718d9a1e07cd633be17363946d3f5ada9c3aa58..d3ed8028a5d237d9fe648e1a05e669ee3e0fe856 100644 (file)
--- a/data/defaultVT.cfg
+++ b/data/defaultVT.cfg
@@ -1575,7 +1575,8 @@ set g_triggerimpulse_radial_multiplier 1 "trigger_impulse radial field multiplie
 seta g_ghost_items 1 "enable ghosted items (when between 0 and 1, overrides the alpha value)"\r
 seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"\r
 \r
-set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between = alpha"\r
+seta cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between = alpha"\r
+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.75 "sound volume is reduced to this amount when you are in a stomach"\r
 seta cl_vore_cutvolume_music 0.25 "music volume is reduced to this amount when you are in a stomach"\r
 seta cl_vore_cutvolume_fade 0.1 "fading speed of the volume change"\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
index 9d44a2ea4ee056ddd121b1b330892469fa448d30..167f9dabc38952709635002acdb7fa215a96bb85 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
@@ -84,6 +84,7 @@ void fillVoretPlayerSettingsTab(entity me)
                me.TD(me, 1, 1, e = makeVoretRadioButton(1, "chase_active", "1", "3rd person"));\r
        me.TR(me);\r
                me.TD(me, 1, 2, e = makeVoretCheckBoxEx(1, -1, "cl_vore_stomachmodel", "Stomach model"));\r
+               makeMulti(e, "cl_vore_swallowmodel");\r
                setDependent(e, "chase_active", 0, 0);\r
        me.TR(me);\r
        me.TR(me);\r

diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index e63d51308bc99bea7b7557a08a547d16f1ee144f..13d56461990623ab8de7ffc2aa7c2bf2ed276ba3 100644 (file)
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -338,6 +338,7 @@ float sv_clforceplayermodels;
 .float cvar_cl_gunalign;\r
 .float cvar_cl_noantilag;\r
 .float cvar_cl_vore_stomachmodel;\r
+.float cvar_cl_vore_swallowmodel;\r
 .float cvar_cl_vore_autodigest;\r
 .float cvar_chase_active;\r
 \r

diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 8111f535523e7bf3216fda5e246163e628e212a5..0ccaa0ffb61b13c5ab3b23d6060c01623dae77ed 100644 (file)
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -616,6 +616,7 @@ void GetCvars(float f)
        GetCvars_handleFloat(s, f, cvar_cl_accuracy_data_receive, "cl_accuracy_data_receive");\r
        GetCvars_handleFloat(s, f, cvar_chase_active, "chase_active");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel");\r
+       GetCvars_handleFloat(s, f, cvar_cl_vore_swallowmodel, "cl_vore_swallowmodel");\r
        GetCvars_handleFloat(s, f, cvar_cl_vore_autodigest, "cl_vore_autodigest");\r
 \r
        self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);\r

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 36d5705312c0bf6b985a527090caa2ddcb0f4f09..9a3d94124fd76037b5dc387b1882b1cae3d3351c 100644 (file)
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -218,7 +218,7 @@ void Vore_SwallowModel_Think()
        }\r
 \r
        // properties that should update whenever possible, but when the predator is not available\r
-       self.alpha = self.owner.cvar_cl_vore_stomachmodel;\r
+       self.alpha = self.owner.cvar_cl_vore_swallowmodel;\r
        self.nextthink = time;\r
 }\r
 \r