From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 1 Oct 2011 14:53:46 +0000 (+0200)
Subject: fteqcc parsing bug
X-Git-Tag: xonotic-v0.6.0~74^2~275^2~8^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18c1d9e709e10e7f474c25a2b8caf02b0cdc0a71;p=xonotic%2Fxonotic-data.pk3dir.git

fteqcc parsing bug
---

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 09daa245a..93157819e 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1356,7 +1356,7 @@ void IntermissionThink()
 		return;
 
 	if(!mapvote_initialized)
-		if (time < intermission_exittime + 10 && !self.BUTTON_ATCK && !self.BUTTON_JUMP && !self.BUTTON_ATCK2 && !self.BUTTON_HOOK && !self.BUTTON_USE)
+		if (time < intermission_exittime + 10 && !(self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_HOOK || self.BUTTON_USE))
 			return;
 
 	MapVote_Start();