* Added traps to query demo state

* Demo state now displayed from cgame
* Merged ioq3-r464
  - gcc4/-O0 bug fix
  - zone/hunk megs faffage

5 files changed, 122 insertions, 1 deletions

diff --git a/ui/menudef.h b/ui/menudef.h
index 6c6a34bf..d69957fe 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -253,6 +253,8 @@
 #define CG_LAGOMETER              90
 #define CG_PLAYER_CROSSHAIRNAMES  114
 #define CG_STAGE_REPORT_TEXT      116
+#define CG_DEMO_PLAYBACK          117
+#define CG_DEMO_RECORDING         118
 
 #define CG_CONSOLE                91
 
diff --git a/ui/tremulous_alien_builder_hud.menu b/ui/tremulous_alien_builder_hud.menu
index 9f76aa19..f30ba0bd 100644
--- a/ui/tremulous_alien_builder_hud.menu
+++ b/ui/tremulous_alien_builder_hud.menu
@@ -44,6 +44,36 @@
       ownerdraw CG_LAGOMETER
     }
 
+    //DEMO STATE
+    itemDef
+    {
+      name "demoRecording"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 0 0 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_RECORDING
+      background "ui/assets/neutral/circle.tga"
+    }   
+    itemDef
+    {
+      name "demoPlayback"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_PLAYBACK
+      background "ui/assets/forwardarrow.tga"
+    }   
+
     //SELECT
     itemDef
     {
diff --git a/ui/tremulous_alien_general_hud.menu b/ui/tremulous_alien_general_hud.menu
index a2475808..5ecc0181 100644
--- a/ui/tremulous_alien_general_hud.menu
+++ b/ui/tremulous_alien_general_hud.menu
@@ -44,6 +44,36 @@
       ownerdraw CG_LAGOMETER
     }
 
+    //DEMO STATE
+    itemDef
+    {
+      name "demoRecording"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 0 0 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_RECORDING
+      background "ui/assets/neutral/circle.tga"
+    }   
+    itemDef
+    {
+      name "demoPlayback"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_PLAYBACK
+      background "ui/assets/forwardarrow.tga"
+    }   
+
     //SELECT
     itemDef
     {
diff --git a/ui/tremulous_default_hud.menu b/ui/tremulous_default_hud.menu
index 0fce8385..5940b22e 100644
--- a/ui/tremulous_default_hud.menu
+++ b/ui/tremulous_default_hud.menu
@@ -88,6 +88,35 @@
       textaligny 0.5
       ownerdraw CG_LAGOMETER
     }   
+    //DEMO STATE
+    itemDef
+    {
+      name "demoRecording"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 0 0 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_RECORDING
+      background "ui/assets/neutral/circle.tga"
+    }   
+    itemDef
+    {
+      name "demoPlayback"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_PLAYBACK
+      background "ui/assets/forwardarrow.tga"
+    }   
     
     //PLAYER NAME
     itemDef  
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index ef035b29..715e9a57 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -44,6 +44,36 @@
       ownerdraw CG_LAGOMETER
     }
 
+    //DEMO STATE
+    itemDef
+    {
+      name "demoRecording"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 0 0 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_RECORDING
+      background "ui/assets/neutral/circle.tga"
+    }   
+    itemDef
+    {
+      name "demoPlayback"
+      rect 596 100 32 32
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 1
+      textscale 0.3
+      textalignx 1
+      textaligny 0.5
+      ownerdraw CG_DEMO_PLAYBACK
+      background "ui/assets/forwardarrow.tga"
+    }   
+
     //FPS
     itemDef
     {
@@ -383,7 +413,7 @@
       style WINDOW_STYLE_SHADER
       background "ui/assets/neutral/selected.tga"
     }   
-    
+
     //PLAYER NAME
     itemDef  
     {