* (bug 2944) cg_drawClock added

6 files changed, 97 insertions, 8 deletions

diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 53bcc07f..7bbcbb83 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -296,6 +296,27 @@
         play "sound/misc/menu1.wav"; 
       }
     }
+    
+    itemDef
+    {
+      name game
+      group optionsGrp
+      type ITEM_TYPE_MULTI
+      text "Show Clock:"
+      cvar "cg_drawClock"
+      cvarFloatList { "No" 0 "12 Hour" 1 "24 Hour" 2 }
+      rect 90 235 192 15
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 128 
+      textaligny 12
+      textscale .25         
+      forecolor 1 1 1 1
+      visible 0 
+      action
+      {
+        play "sound/misc/menu1.wav"; 
+      }
+    }
 
 
 //////// CONTROLS
diff --git a/ui/menudef.h b/ui/menudef.h
index dbd5b193..0463e1aa 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -258,6 +258,7 @@
 
 #define CG_CONSOLE                91
 #define CG_TUTORIAL               119
+#define CG_CLOCK                  120
 
 
 
diff --git a/ui/tremulous_alien_builder_hud.menu b/ui/tremulous_alien_builder_hud.menu
index cd177266..bf75327c 100644
--- a/ui/tremulous_alien_builder_hud.menu
+++ b/ui/tremulous_alien_builder_hud.menu
@@ -65,7 +65,7 @@
     itemDef
     {
       name "demoRecording"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
@@ -79,7 +79,7 @@
     itemDef
     {
       name "demoPlayback"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
@@ -330,6 +330,23 @@
       ownerdraw CG_TIMER
     }      
     
+    //CLOCK
+    itemDef
+    {
+      name "clock"
+      rect 572 90 56 22
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1.0 0.0 0.0 1
+      align ITEM_ALIGN_RIGHT
+      textalignx 0
+      textaligny 18
+      textscale 0.25
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_CLOCK
+    }      
+    
     //ALIENSENSE
     itemDef
     {
diff --git a/ui/tremulous_alien_general_hud.menu b/ui/tremulous_alien_general_hud.menu
index 6ed8721f..cc816008 100644
--- a/ui/tremulous_alien_general_hud.menu
+++ b/ui/tremulous_alien_general_hud.menu
@@ -65,7 +65,7 @@
     itemDef
     {
       name "demoRecording"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
@@ -79,7 +79,7 @@
     itemDef
     {
       name "demoPlayback"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
@@ -319,6 +319,23 @@
       ownerdraw CG_TIMER
     }      
     
+    //CLOCK
+    itemDef
+    {
+      name "clock"
+      rect 572 90 56 22
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1.0 0.0 0.0 1
+      align ITEM_ALIGN_RIGHT
+      textalignx 0
+      textaligny 18
+      textscale 0.25
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_CLOCK
+    }      
+    
     //ALIENSENSE
     itemDef
     {
diff --git a/ui/tremulous_default_hud.menu b/ui/tremulous_default_hud.menu
index b8385c53..0eed6404 100644
--- a/ui/tremulous_default_hud.menu
+++ b/ui/tremulous_default_hud.menu
@@ -74,6 +74,22 @@
       textstyle ITEM_TEXTSTYLE_NORMAL
       ownerdraw CG_TIMER
     }   
+    //CLOCK
+    itemDef
+    {
+      name "clock"
+      rect 572 90 56 22
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 1 1 1 1
+      align ITEM_ALIGN_RIGHT
+      textalignx 0
+      textaligny 18
+      textscale 0.25
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_CLOCK
+    }   
    
     //SNAPSHOT
     itemDef
@@ -109,7 +125,7 @@
     itemDef
     {
       name "demoRecording"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
@@ -123,7 +139,7 @@
     itemDef
     {
       name "demoPlayback"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index d362fc6a..8fe00950 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -65,7 +65,7 @@
     itemDef
     {
       name "demoRecording"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
@@ -79,7 +79,7 @@
     itemDef
     {
       name "demoPlayback"
-      rect 596 100 32 32
+      rect 596 120 32 32
       style WINDOW_STYLE_EMPTY
       visible 1
       decoration
@@ -124,6 +124,23 @@
       textstyle ITEM_TEXTSTYLE_NORMAL
       ownerdraw CG_TIMER
     }   
+    
+    //CLOCK
+    itemDef
+    {
+      name "clock"
+      rect 572 90 56 22
+      style WINDOW_STYLE_EMPTY
+      visible 1
+      decoration
+      forecolor 0.0 0.8 1.0 1
+      align ITEM_ALIGN_RIGHT
+      textalignx 0
+      textaligny 18
+      textscale 0.25
+      textstyle ITEM_TEXTSTYLE_NORMAL
+      ownerdraw CG_CLOCK
+    }   
 
     //SNAPSHOT
     itemDef