From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 7 Sep 2010 13:35:54 +0000 (+0300)
Subject: Re-arrange some code in the meantime
X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=8e9068cc5e283363d6221618cad92b1eaff9bce3;hp=20ef739a40c2637bca30f9f5c082b25bf736c747;ds=sidebyside

Re-arrange some code in the meantime
---

diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index 88d81546..0c45de6a 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -114,16 +114,13 @@ void Vore_Swallow(entity e)
 	e.alpha = -1; // best way of hiding / showing the eaten player
 	e.aiment = e.eater; // follow the predator. Is automatically unset
 
-	e.pusher = e.eater; // so we can frag players by regurgitating them in deadly pits
-	e.pushltime = time + cvar("g_maxpushtime");
-
-	Vore_CameraEffect_Set(e);
-
 	// drop keys (KH) and flags (CTF) when we get swallowed
 	kh_Key_DropAll(e, FALSE);
 	if(e.flagcarried)
 		DropFlag(e.flagcarried, world, e.eater);
 
+	Vore_CameraEffect_Set(e);
+
 	if(stov(cvar_string("g_vore_regurgitatecolor_released")))
 		e.colormod = stov(cvar_string("g_vore_regurgitatecolor_released"));
 
@@ -163,6 +160,9 @@ void Vore_Regurgitate(entity e)
 	v_right = oldright;
 	v_up = oldup;
 
+	e.pusher = e.eater; // so we can frag players by regurgitating them in deadly pits
+	e.pushltime = time + cvar("g_maxpushtime");
+
 	PlayerSound(e.eater, playersound_regurgitate, CHAN_PAIN, VOICETYPE_PLAYERSOUND);
 	setanim(e.eater, e.eater.anim_pain1, FALSE, TRUE, TRUE); // looks good for swallowing / regurgitating
 	pointparticles(particleeffectnum("regurgitate"), e.eater.origin, '0 0 0', 1);