From 8b42fbcdbedd4b10b6325821e53f4a74d91a0515 Mon Sep 17 00:00:00 2001
From: q3rally <q3rally@b95fa9d2-619b-4617-8743-2613d58f007a>
Date: Sun, 15 May 2016 10:04:21 +0000
Subject: [PATCH] fix wrong buttons in remove bot menu ingame

---
 engine/code/q3_ui/ui_removebots.c |  4 --
 engine/code/qcommon/q_shared.h    |  2 +-
 q3rallycode.ppr                   | 71 +++++++++++--------------------
 3 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/engine/code/q3_ui/ui_removebots.c b/engine/code/q3_ui/ui_removebots.c
index 0187723a..1f9d43ab 100644
--- a/engine/code/q3_ui/ui_removebots.c
+++ b/engine/code/q3_ui/ui_removebots.c
@@ -296,8 +296,6 @@ static void UI_RemoveBotsMenu_Init( void ) {
 	removeBotsMenuInfo.delete.generic.callback	= UI_RemoveBotsMenu_DeleteEvent;
 	removeBotsMenuInfo.delete.generic.x			= 320+128;
 	removeBotsMenuInfo.delete.generic.y			= 256+128-64;
-	removeBotsMenuInfo.delete.width  			= 128;
-	removeBotsMenuInfo.delete.height  			= 64;
   removeBotsMenuInfo.delete.string			= "DELETE";
 	removeBotsMenuInfo.delete.color			= color_orange;
 	removeBotsMenuInfo.delete.style			= UI_LEFT|UI_SMALLFONT;
@@ -308,8 +306,6 @@ static void UI_RemoveBotsMenu_Init( void ) {
 	removeBotsMenuInfo.back.generic.callback	= UI_RemoveBotsMenu_BackEvent;
 	removeBotsMenuInfo.back.generic.x			= 320-128;
 	removeBotsMenuInfo.back.generic.y			= 256+128-64;
-	removeBotsMenuInfo.back.width				= 128;
-	removeBotsMenuInfo.back.height				= 64;
   removeBotsMenuInfo.back.string			= "< BACK";
 	removeBotsMenuInfo.back.color			= color_orange;
 	removeBotsMenuInfo.back.style			= UI_RIGHT|UI_SMALLFONT;
diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h
index cff50aa5..7c9601a0 100644
--- a/engine/code/qcommon/q_shared.h
+++ b/engine/code/qcommon/q_shared.h
@@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define BASETA				"missionpack"
 
 #ifndef PRODUCT_VERSION
-#define PRODUCT_VERSION "v0.0.0.4 r147"
+#define PRODUCT_VERSION "v0.0.0.4 r148"
 #endif
 
 #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION
diff --git a/q3rallycode.ppr b/q3rallycode.ppr
index 276a44b1..f01714c6 100644
--- a/q3rallycode.ppr
+++ b/q3rallycode.ppr
@@ -855,59 +855,40 @@ q3rallycode
 		engine\TODO
 		engine\voip-readme.txt
 		engine\resync_svn.sh
+		engine\cross-make-mingw64.sh
 [Open project files]
 0=engine\code\qcommon\q_shared.h
 1=engine\code\q3_ui\ui_addbots.c
-2=engine\code\q3_ui\ui_cdkey.c
-3=engine\code\q3_ui\ui_cinematics.c
-4=engine\code\q3_ui\ui_controls2.c
-5=engine\code\q3_ui\ui_demo2.c
-6=engine\code\q3_ui\ui_display.c
-7=engine\code\q3_ui\ui_loadconfig.c
-8=engine\code\q3_ui\ui_mods.c
-9=engine\code\q3_ui\ui_network.c
-10=engine\code\q3_ui\ui_playersettings.c
-11=engine\code\q3_ui\ui_ingame.c
-12=engine\code\q3_ui\ui_removebots.c
+2=engine\code\q3_ui\ui_removebots.c
+3=engine\ui\hud.txt
+4=engine\ui\hud2.txt
+5=engine\ui\ingame.txt
+6=engine\code\q3_ui\ui_rally_credits.c
+7=engine\code\q3_ui\ui_rally_tools.c
 [Selected Project Files]
 Main=
-Selected=engine\code\qcommon\q_shared.h
+Selected=engine\code\q3_ui\ui_rally_tools.c
 [engine\code\qcommon\q_shared.h]
 TopLine=40
-Caret=40,58
+Caret=39,58
 [engine\code\q3_ui\ui_addbots.c]
 TopLine=353
 Caret=21,373
-[engine\code\q3_ui\ui_cdkey.c]
-TopLine=246
-Caret=1,262
-[engine\code\q3_ui\ui_cinematics.c]
-TopLine=309
-Caret=1,325
-[engine\code\q3_ui\ui_controls2.c]
-TopLine=1636
-Caret=1,1652
-[engine\code\q3_ui\ui_demo2.c]
-TopLine=233
-Caret=1,249
-[engine\code\q3_ui\ui_display.c]
-TopLine=40
-Caret=1,56
-[engine\code\q3_ui\ui_loadconfig.c]
-TopLine=238
-Caret=1,254
-[engine\code\q3_ui\ui_mods.c]
-TopLine=215
-Caret=1,231
-[engine\code\q3_ui\ui_network.c]
-TopLine=245
-Caret=1,261
-[engine\code\q3_ui\ui_playersettings.c]
-TopLine=1459
-Caret=1,1475
-[engine\code\q3_ui\ui_ingame.c]
-TopLine=45
-Caret=1,61
 [engine\code\q3_ui\ui_removebots.c]
-TopLine=263
-Caret=49,297
+TopLine=277
+Caret=51,308
+[engine\ui\hud.txt]
+TopLine=1
+Caret=1,1
+[engine\ui\hud2.txt]
+TopLine=1
+Caret=1,1
+[engine\ui\ingame.txt]
+TopLine=1
+Caret=1,1
+[engine\code\q3_ui\ui_rally_credits.c]
+TopLine=3
+Caret=1,1
+[engine\code\q3_ui\ui_rally_tools.c]
+TopLine=87
+Caret=1,1