From 7bf6f9256d4fd34e92081b554c0af89cae01a74f Mon Sep 17 00:00:00 2001 From: q3rally Date: Fri, 13 May 2016 20:15:10 +0000 Subject: [PATCH] fix misplaced items in settings menu --- engine/code/q3_ui/ui_controls2.c | 4 ++-- engine/code/q3_ui/ui_rally_controls.c | 4 ++-- engine/code/qcommon/q_shared.h | 2 +- q3rallycode.ppr | 28 +++++++++++++-------------- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/engine/code/q3_ui/ui_controls2.c b/engine/code/q3_ui/ui_controls2.c index c012f4f6..0a69959e 100644 --- a/engine/code/q3_ui/ui_controls2.c +++ b/engine/code/q3_ui/ui_controls2.c @@ -701,8 +701,8 @@ static void Controls_DrawKeyBinding( void *self ) else { UI_DrawChar( x, y, 13, UI_CENTER|UI_BLINK|UI_SMALLFONT, text_color_highlight); - UI_DrawString(SCREEN_WIDTH * 0.50, SCREEN_HEIGHT * 0.78, "Press ENTER or CLICK to change", UI_SMALLFONT|UI_CENTER, colorWhite ); - UI_DrawString(SCREEN_WIDTH * 0.50, SCREEN_HEIGHT * 0.82, "Press BACKSPACE to clear", UI_SMALLFONT|UI_CENTER, colorWhite ); + UI_DrawString(SCREEN_WIDTH * 0.50, SCREEN_HEIGHT * 0.82, "Press ENTER or CLICK to change", UI_SMALLFONT|UI_CENTER, colorWhite ); + UI_DrawString(SCREEN_WIDTH * 0.50, SCREEN_HEIGHT * 0.86, "Press BACKSPACE to clear", UI_SMALLFONT|UI_CENTER, colorWhite ); } } else diff --git a/engine/code/q3_ui/ui_rally_controls.c b/engine/code/q3_ui/ui_rally_controls.c index bec21439..ed12dfdc 100644 --- a/engine/code/q3_ui/ui_rally_controls.c +++ b/engine/code/q3_ui/ui_rally_controls.c @@ -842,8 +842,8 @@ static void Controls_DrawKeyBinding( void *self ) else { UI_DrawChar( x, y, 13, UI_CENTER|UI_BLINK|UI_SMALLFONT, text_color_highlight); - UI_DrawString(SCREEN_WIDTH * 0.55, SCREEN_HEIGHT * 0.78, "Press ENTER or CLICK to change", UI_SMALLFONT|UI_CENTER, colorWhite ); - UI_DrawString(SCREEN_WIDTH * 0.55, SCREEN_HEIGHT * 0.82, "Press BACKSPACE to clear", UI_SMALLFONT|UI_CENTER, colorWhite ); + UI_DrawString(SCREEN_WIDTH * 0.55, SCREEN_HEIGHT * 0.82, "Press ENTER or CLICK to change", UI_SMALLFONT|UI_CENTER, colorWhite ); + UI_DrawString(SCREEN_WIDTH * 0.55, SCREEN_HEIGHT * 0.86, "Press BACKSPACE to clear", UI_SMALLFONT|UI_CENTER, colorWhite ); } } else diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index a714052e..f3fae0f2 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 r137" +#define PRODUCT_VERSION "v0.0.0.4 r139" #endif #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 4ec4be94..67c1a649 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -857,21 +857,21 @@ q3rallycode engine\resync_svn.sh [Open project files] 0=engine\code\qcommon\q_shared.h -1=engine\code\AL\al.h -2=engine\code\q3_ui\ui_rally_servers.c -3=engine\code\q3_ui\ui_removebots.c +1=engine\code\q3_ui\ui_rally_controls.c +2=engine\code\ui\ui_main.c +3=engine\code\q3_ui\ui_controls2.c [Selected Project Files] Main= -Selected=engine\code\q3_ui\ui_removebots.c +Selected=engine\code\q3_ui\ui_rally_controls.c [engine\code\qcommon\q_shared.h] -TopLine=15 +TopLine=31 Caret=39,58 -[engine\code\AL\al.h] -TopLine=273 -Caret=1,289 -[engine\code\q3_ui\ui_rally_servers.c] -TopLine=1780 -Caret=1,1796 -[engine\code\q3_ui\ui_removebots.c] -TopLine=210 -Caret=54,306 +[engine\code\q3_ui\ui_rally_controls.c] +TopLine=829 +Caret=1,845 +[engine\code\ui\ui_main.c] +TopLine=1719 +Caret=1,1735 +[engine\code\q3_ui\ui_controls2.c] +TopLine=688 +Caret=59,705