From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Thu, 9 Sep 2010 18:15:25 +0000 (+0300)
Subject: Punchangle effect when voring. Your view will get tilted back when swallowing someone... 
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=d83b32928eb67d491023e3a53aaabf94d5ed564d

Punchangle effect when voring. Your view will get tilted back when swallowing someone and forth when regurgitating them. Customizable client side
---

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index a1b08f93..c4cfaac8 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -1497,6 +1497,7 @@ seta g_ghost_items_color "-1 -1 -1" "color of ghosted items, 0 0 0 leaves the co
 
 set cl_vore_stomachmodel 1 "when enabled, we see the stomach model around us when eaten. -1 = disabled, 1 = enabled, anything between 0 and 1 = alpha"
 set cl_vore_cameraspeed 1.5 "speed at which you see yourself sliding down when getting swallowed, 0 disables"
+set cl_vore_punchangle 10 "your view gets tilted by this amount when swallowing or regurgitating someone"
 set g_vore_regurgitatecolor_release "0.875 1 0.375" "the color players will have when regurgitated alive"
 set g_vore_regurgitatecolor_digest "0.125 0.25 0" "the color players will have when digested"
 set g_vore_gurglesound 1 "predators make an ambient gurgling sound"
diff --git a/data/qcsrc/server/cl_physics.qc b/data/qcsrc/server/cl_physics.qc
index 81c2afc1..8f9812f4 100644
--- a/data/qcsrc/server/cl_physics.qc
+++ b/data/qcsrc/server/cl_physics.qc
@@ -645,7 +645,7 @@ void SV_PlayerPhysics()
 
 	if (self.punchangle != '0 0 0')
 	{
-		f = vlen(self.punchangle) - 10 * frametime;
+		f = vlen(self.punchangle) - 15 * frametime;
 		if (f > 0)
 			self.punchangle = normalize(self.punchangle) * f;
 		else
diff --git a/data/qcsrc/server/defs.qh b/data/qcsrc/server/defs.qh
index 6d316524..efe66963 100644
--- a/data/qcsrc/server/defs.qh
+++ b/data/qcsrc/server/defs.qh
@@ -333,6 +333,7 @@ float sv_clforceplayermodels;
 .float cvar_cl_noantilag;
 .float cvar_cl_vore_stomachmodel;
 .float cvar_cl_vore_cameraspeed;
+.float cvar_cl_vore_punchangle;
 .float cvar_chase_active;
 
 void Announce(string snd);
diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc
index 93e162b1..a66b274b 100644
--- a/data/qcsrc/server/miscfunctions.qc
+++ b/data/qcsrc/server/miscfunctions.qc
@@ -617,6 +617,7 @@ void GetCvars(float f)
 	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_cameraspeed, "cl_vore_cameraspeed");
+	GetCvars_handleFloat(s, f, cvar_cl_vore_punchangle, "cl_vore_punchangle");
 
 	self.cvar_cl_accuracy_data_share = boolean(self.cvar_cl_accuracy_data_share);
 	self.cvar_cl_accuracy_data_receive = boolean(self.cvar_cl_accuracy_data_receive);
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 2791d046..151cad9d 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -162,6 +162,7 @@ void Vore_Swallow(entity e)
 
 	PlayerSound(e.predator, playersound_swallow, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
+	e.predator.punchangle_x -= e.predator.cvar_cl_vore_punchangle;
 	e.predator.stomach_load += 1;
 	e.predator.regurgitate_prepare = 0;
 	Vore_Weight_apply(e.predator);
@@ -200,6 +201,7 @@ void Vore_Regurgitate(entity e)
 	PlayerSound(e.predator, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 	setanim(e.predator, e.predator.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
 	pointparticles(particleeffectnum("regurgitate"), e.predator.origin, '0 0 0', 1);
+	e.predator.punchangle_x += e.predator.cvar_cl_vore_punchangle;
 	e.predator.stomach_load -= 1;
 	e.predator.regurgitate_prepare = 0;
 	e.predator.swallow_delay = time + cvar("g_balance_vore_swallow_delay");