From d935b1ba18d3585e468175835693c2a04c23d5a7 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Wed, 21 Oct 2009 07:58:54 +0000
Subject: * Add options in the ingame UI to callvote sudden_death and callvote
 nextmap (Exclamation) * Prevent up arrow, down arrow, tab, and mouse buttons
 from unexpectedly sending Say: menu text * Fix a crash introduced by r1813
 when using teamsay on a map without location entities

---
 assets/ui/ingame_game.menu | 52 ++++++++++++++++++++++++++++++++++++++++------
 assets/ui/say.menu         |  4 ++--
 2 files changed, 48 insertions(+), 8 deletions(-)

(limited to 'assets')

diff --git a/assets/ui/ingame_game.menu b/assets/ui/ingame_game.menu
index a9ab5a70..8348859a 100644
--- a/assets/ui/ingame_game.menu
+++ b/assets/ui/ingame_game.menu
@@ -4,7 +4,7 @@
   \\ INGAME GAME BOX \\
 
 #define W           320
-#define H           290
+#define H           310
 #define X           10
 #define Y           60
 #define BORDER      10
@@ -17,8 +17,8 @@
 
 #define MAP_X       (SIDEBUTT_W+BORDER)
 #define MAP_Y       ((2*BORDER)+TOPBUTT_H)
-#define MAP_W       100
-#define MAP_H       75
+#define MAP_W       124
+#define MAP_H       93
 #define MAPLIST_X   MAP_X
 #define MAPLIST_Y   ((3*BORDER)+TOPBUTT_H+MAP_H)
 #define MAPLIST_W   (W-((2*BORDER)+SIDEBUTT_W))
@@ -26,7 +26,7 @@
 #define MAPBUTT_X   (MAP_X+MAP_W+BORDER)
 #define MAPBUTT_Y   MAP_Y
 #define MAPBUTT_W   (W-(MAPBUTT_X+BORDER))
-#define MAPBUTT_H   25
+#define MAPBUTT_H   20
 
 #define PBUTT_X     MAP_X
 #define PBUTT_Y     (H-((2*PBUTT_H)+BORDER))
@@ -304,7 +304,7 @@
     {
       name mapvote
       group gameGrp
-      text "Restart Current Map"
+      text "Load Selected Map Next"
       type ITEM_TYPE_BUTTON
       textscale .25
       rect MAPBUTT_X (MAPBUTT_Y+MAPBUTT_H) MAPBUTT_W MAPBUTT_H
@@ -313,6 +313,26 @@
       forecolor 1 1 1 1
       visible MENU_FALSE
       action
+      {
+        play "sound/misc/menu1.wav";
+        uiScript voteNextMap;
+        uiScript closeingame
+      }
+    }
+
+    itemDef
+    {
+      name mapvote
+      group gameGrp
+      text "Restart Current Map"
+      type ITEM_TYPE_BUTTON
+      textscale .25
+      rect MAPBUTT_X (MAPBUTT_Y+(2*MAPBUTT_H)) MAPBUTT_W MAPBUTT_H
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      forecolor 1 1 1 1
+      visible MENU_FALSE
+      action
       {
         play "sound/misc/menu1.wav";
         exec "cmd callvote map_restart";
@@ -320,6 +340,26 @@
       }
     }
 
+    itemDef
+    {
+      name mapvote
+      group gameGrp
+      text "Begin Sudden Death"
+      type ITEM_TYPE_BUTTON
+      textscale .25
+      rect MAPBUTT_X (MAPBUTT_Y+(3*MAPBUTT_H)) MAPBUTT_W MAPBUTT_H
+      textalign ALIGN_LEFT
+      textvalign VALIGN_CENTER
+      forecolor 1 1 1 1
+      visible MENU_FALSE
+      action
+      {
+        play "sound/misc/menu1.wav";
+        exec "cmd callvote sudden_death";
+        uiScript closeingame
+      }
+    }
+
     itemDef
     {
       name mapvote
@@ -327,7 +367,7 @@
       text "End Match In Draw"
       type ITEM_TYPE_BUTTON
       textscale .25
-      rect MAPBUTT_X (MAPBUTT_Y+(2*MAPBUTT_H)) MAPBUTT_W MAPBUTT_H
+      rect MAPBUTT_X (MAPBUTT_Y+(4*MAPBUTT_H)) MAPBUTT_W MAPBUTT_H
       textalign ALIGN_LEFT
       textvalign VALIGN_CENTER
       forecolor 1 1 1 1
diff --git a/assets/ui/say.menu b/assets/ui/say.menu
index 7b804b45..1dd2380b 100644
--- a/assets/ui/say.menu
+++ b/assets/ui/say.menu
@@ -5,9 +5,9 @@
 #define BORDER    10
 
 #define X         BORDER
-#define Y         200
+#define Y         BORDER
 #define W         (600-(2*BORDER))
-#define H         40
+#define H         (480-(2*BORDER))
 
   // Say to All
   menuDef
-- 
cgit