q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2025-02-21 11:31:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix misplaced items in settings menu

Browse source
This commit is contained in:
q3rally 2016-05-13 20:15:10 +00:00
parent bb550a75ef
commit 7bf6f9256d
4 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
engine/code/q3_ui/ui_controls2.c
View file

@ -701,8 +701,8 @@ static void Controls_DrawKeyBinding( void *self )
else else
{ {
UI_DrawChar( x, y, 13, UI_CENTER|UI_BLINK|UI_SMALLFONT, text_color_highlight); 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 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.86, "Press BACKSPACE to clear", UI_SMALLFONT|UI_CENTER, colorWhite );
} }
} }
else else

4
engine/code/q3_ui/ui_rally_controls.c
View file

@ -842,8 +842,8 @@ static void Controls_DrawKeyBinding( void *self )
else else
{ {
UI_DrawChar( x, y, 13, UI_CENTER|UI_BLINK|UI_SMALLFONT, text_color_highlight); 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 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.86, "Press BACKSPACE to clear", UI_SMALLFONT|UI_CENTER, colorWhite );
} }
} }
else else

2
engine/code/qcommon/q_shared.h
View file

@ -55,7 +55,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define BASETA "missionpack" #define BASETA "missionpack"
#ifndef PRODUCT_VERSION #ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.0.4 r137" #define PRODUCT_VERSION "v0.0.0.4 r139"
#endif #endif
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION

28
q3rallycode.ppr
View file

@ -857,21 +857,21 @@ q3rallycode
engine\resync_svn.sh engine\resync_svn.sh
[Open project files] [Open project files]
0=engine\code\qcommon\q_shared.h 0=engine\code\qcommon\q_shared.h
1=engine\code\AL\al.h 1=engine\code\q3_ui\ui_rally_controls.c
2=engine\code\q3_ui\ui_rally_servers.c 2=engine\code\ui\ui_main.c
3=engine\code\q3_ui\ui_removebots.c 3=engine\code\q3_ui\ui_controls2.c
[Selected Project Files] [Selected Project Files]
Main= Main=
Selected=engine\code\q3_ui\ui_removebots.c Selected=engine\code\q3_ui\ui_rally_controls.c
[engine\code\qcommon\q_shared.h] [engine\code\qcommon\q_shared.h]
TopLine=15 TopLine=31
Caret=39,58 Caret=39,58
[engine\code\AL\al.h] [engine\code\q3_ui\ui_rally_controls.c]
TopLine=273 TopLine=829
Caret=1,289 Caret=1,845
[engine\code\q3_ui\ui_rally_servers.c] [engine\code\ui\ui_main.c]
TopLine=1780 TopLine=1719
Caret=1,1796 Caret=1,1735
[engine\code\q3_ui\ui_removebots.c] [engine\code\q3_ui\ui_controls2.c]
TopLine=210 TopLine=688
Caret=54,306 Caret=59,705