From: Jakob MG <jakob_mg@hotmail.com>
Date: Mon, 13 Jun 2011 00:12:04 +0000 (+0200)
Subject: Fix intermission (sort of, will be better once vehicle hud is made a panel)
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5100c3746a5ccb782a159374cab274a524b7448;p=xonotic%2Fxonotic-data.pk3dir.git

Fix intermission (sort of, will be better once vehicle hud is made a panel)
---

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index e26eca3dd..31fee2c95 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -859,15 +859,17 @@ void CSQC_UpdateView(float w, float h)
 		sound(world, CHAN_AUTO, "misc/typehit.wav", VOL_BASE, ATTN_NONE);
 		nextsound_typehit_time = time + autocvar_cl_hitsound_antispam_time;
 	}
-
-	if(hud == HUD_SPIDERBOT)
-		CSQC_SPIDER_HUD();
-	else if(hud == HUD_WAKIZASHI)
-        CSQC_WAKIZASHI_HUD();
-    else if(hud == HUD_RAPTOR)
-        CSQC_RAPTOR_HUD();
-    else if(hud == HUD_BUMBLEBEE)
-        CSQC_BUMBLE_HUD();
+    if(hud && !intermission)
+    {        
+        if(hud == HUD_SPIDERBOT)
+            CSQC_SPIDER_HUD();
+        else if(hud == HUD_WAKIZASHI)
+            CSQC_WAKIZASHI_HUD();
+        else if(hud == HUD_RAPTOR)
+            CSQC_RAPTOR_HUD();
+        else if(hud == HUD_BUMBLEBEE)
+            CSQC_BUMBLE_HUD();
+    }
 	else
 	{
 		if(gametype == GAME_FREEZETAG)
@@ -1300,6 +1302,9 @@ void CSQC_common_hud(void)
 	float hud;
 	hud = getstati(STAT_HUD);
 
+    if(intermission)
+        hud = HUD_NORMAL;
+
 	//hud = 10;
 	switch(hud)
 	{
diff --git a/qcsrc/server/vehicles/racer.qc b/qcsrc/server/vehicles/racer.qc
index a24c1a43f..5935ea8f6 100644
--- a/qcsrc/server/vehicles/racer.qc
+++ b/qcsrc/server/vehicles/racer.qc
@@ -256,6 +256,9 @@ float racer_frame()
     vector df;
     float ftmp;
 
+	if(intermission_running)
+		return;
+
     player  = self;
     racer   = self.vehicle;
     self    = racer;
diff --git a/qcsrc/server/vehicles/raptor.qc b/qcsrc/server/vehicles/raptor.qc
index 947fc639b..070a0492a 100644
--- a/qcsrc/server/vehicles/raptor.qc
+++ b/qcsrc/server/vehicles/raptor.qc
@@ -316,6 +316,9 @@ float raptor_frame()
     entity player, raptor;
     float ftmp, ftmp2;
     vector df, ra;
+    
+	if(intermission_running)
+		return;
 
     player = self;
     raptor = self.vehicle;
diff --git a/qcsrc/server/vehicles/spiderbot.qc b/qcsrc/server/vehicles/spiderbot.qc
index 1851caaf6..64fe397d6 100644
--- a/qcsrc/server/vehicles/spiderbot.qc
+++ b/qcsrc/server/vehicles/spiderbot.qc
@@ -175,6 +175,9 @@ float spiderbot_frame()
     entity player, spider;
     float ftmp;
 
+	if(intermission_running)
+		return;
+		
     player = self;
     spider = self.vehicle;
     self   = spider;