From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 7 Sep 2010 20:58:29 +0000 (+0300)
Subject: I think Jump is a more appropriate key for getting out than Alt Fire. Also don't... 
X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=commitdiff_plain;h=14364ac9058be0fc1520288c1660e099c775b7f9

I think Jump is a more appropriate key for getting out than Alt Fire. Also don't bind it to the Enter button by default, just space
---

diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg
index 5026bf26..e015ffda 100644
--- a/data/defaultVoretournament.cfg
+++ b/data/defaultVoretournament.cfg
@@ -726,7 +726,6 @@ bind LEFTARROW +moveleft
 bind DOWNARROW +back
 bind RIGHTARROW +moveright
 bind SHIFT +crouch
-bind ENTER +jump
 bind SPACE +jump
 
 // weapons
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 6bd11539..746861aa 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -3080,7 +3080,7 @@ void Sbar_Draw (void)
 		if(getstati(STAT_VORE_CANLEAVE))
 		if not(spectatee_status) // this message doesn't address spectated players
 		{
-			s = strcat("^7Press ^3", getcommandkey("secondary fire", "+attack2"), " ^7to exit");
+			s = strcat("^7Press ^3", getcommandkey("jump", "+jump"), " ^7to exit");
 			pos_x = bottom_x - stringwidth(s, TRUE, '0 0 0') * 16 / 2;
 			pos_y = bottom_y - 120;
 			drawcolorcodedstring(pos, s, '16 16 0', sbar_alpha_fg, DRAWFLAG_NORMAL);
diff --git a/data/qcsrc/server/vore.qc b/data/qcsrc/server/vore.qc
index f6f4165d..102ce98b 100644
--- a/data/qcsrc/server/vore.qc
+++ b/data/qcsrc/server/vore.qc
@@ -420,7 +420,7 @@ void Vore()
 
 	if(self.BUTTON_ATCK)
 		Vore_StomachKick();
-	else if(self.BUTTON_ATCK2)
+	else if(self.BUTTON_JUMP)
 		Vore_StomachLeave();
 
 	self.stat_canleave = Vore_PreyCanLeave();