From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 10 Jul 2011 22:14:03 +0000 (+0300)
Subject: Use a different cvar for the swallow model than the stomach model
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=952bd9b52b7e62258355decf140880ceea0e83e5;p=voretournament%2Fvoretournament.git

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

diff --git a/data/defaultVT.cfg b/data/defaultVT.cfg
index d718d9a1..d3ed8028 100644
--- 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)"
 seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the color unchanged"
 
-set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between = alpha"
+seta cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between = alpha"
+seta cl_vore_swallowmodel 1 "when enabled, we see the swallow model around us while getting eaten. -1 = disabled, 1 = enabled, anything between = alpha"
 seta cl_vore_cutvolume_sound 0.75 "sound volume is reduced to this amount when you are in a stomach"
 seta cl_vore_cutvolume_music 0.25 "music volume is reduced to this amount when you are in a stomach"
 seta cl_vore_cutvolume_fade 0.1 "fading speed of the volume change"
diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
index 9d44a2ea..167f9dab 100644
--- 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"));
 	me.TR(me);
 		me.TD(me, 1, 2, e = makeVoretCheckBoxEx(1, -1, "cl_vore_stomachmodel", "Stomach model"));
+		makeMulti(e, "cl_vore_swallowmodel");
 		setDependent(e, "chase_active", 0, 0);
 	me.TR(me);
 	me.TR(me);
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index e63d5130..13d56461 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -338,6 +338,7 @@ float sv_clforceplayermodels;
 .float cvar_cl_gunalign;
 .float cvar_cl_noantilag;
 .float cvar_cl_vore_stomachmodel;
+.float cvar_cl_vore_swallowmodel;
 .float cvar_cl_vore_autodigest;
 .float cvar_chase_active;
 
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 8111f535..0ccaa0ff 100644
--- 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");
 	GetCvars_handleFloat(s, f, cvar_chase_active, "chase_active");
 	GetCvars_handleFloat(s, f, cvar_cl_vore_stomachmodel, "cl_vore_stomachmodel");
+	GetCvars_handleFloat(s, f, cvar_cl_vore_swallowmodel, "cl_vore_swallowmodel");
 	GetCvars_handleFloat(s, f, cvar_cl_vore_autodigest, "cl_vore_autodigest");
 
 	self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 36d57053..9a3d9412 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -218,7 +218,7 @@ void Vore_SwallowModel_Think()
 	}
 
 	// properties that should update whenever possible, but when the predator is not available
-	self.alpha = self.owner.cvar_cl_vore_stomachmodel;
+	self.alpha = self.owner.cvar_cl_vore_swallowmodel;
 	self.nextthink = time;
 }