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 e26eca3dd8eded944e11c1ab28af08d41c0c8688..31fee2c95a325d26d6df35d39344dfaa7f0dbe6e 100644 (file)
--- 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 a24c1a43f32d8a4a53c57cb6db7105130c594b25..5935ea8f6c35f76883d819e66bd7562a5428f5ff 100644 (file)
--- 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 947fc639b3e6c373d854391c7f432ad5bfe727e4..070a0492a3e4e5c79fe795bf3c06b072faf375a9 100644 (file)
--- 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 1851caaf6bfab8643b917d053e262970ec1c2f5d..64fe397d61f73051a87d540463dde1c6baf257ba 100644 (file)
--- 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;