q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-21 19:41:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix wrong buttons in add bot menu ingame

Browse source
This commit is contained in:
q3rally 2016-05-14 06:49:54 +00:00
parent a8e858d941
commit fdfde7b249
5 changed files with 47 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
engine/code/q3_ui/ui_addbots.c
View file

@ -366,9 +366,9 @@ static void UI_AddBotsMenu_Init( void ) {
addBotsMenuInfo.go.generic.callback = UI_AddBotsMenu_FightEvent;
addBotsMenuInfo.go.generic.x = 320+128-128;
addBotsMenuInfo.go.generic.y = 256+128-64;
addBotsMenuInfo.go.width = 128;
addBotsMenuInfo.go.height = 64;
addBotsMenuInfo.go.focuspic = ART_FIGHT1;
addBotsMenuInfo.go.string = "Go";
addBotsMenuInfo.go.color = text_color_normal;
addBotsMenuInfo.gö.style = UI_LEFT | UI_SMALLFONT;
addBotsMenuInfo.back.generic.type = MTYPE_PTEXT;
addBotsMenuInfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
@ -376,10 +376,9 @@ static void UI_AddBotsMenu_Init( void ) {
addBotsMenuInfo.back.generic.callback = UI_AddBotsMenu_BackEvent;
addBotsMenuInfo.back.generic.x = 320-128;
addBotsMenuInfo.back.generic.y = 256+128-64;
addBotsMenuInfo.back.width = 128;
addBotsMenuInfo.back.height = 64;
addBotsMenuInfo.back.focuspic = ART_BACK1;
addBotsMenuInfo.back.string = "< BACK";
addBotsMenuInfo.back.color = text_color_normal;
addBotsMenuInfo.back.style = UI_LEFT | UI_SMALLFONT;
addBotsMenuInfo.baseBotNum = 0;
addBotsMenuInfo.selectedBotNum = 0;
addBotsMenuInfo.bots[0].color = color_white;

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

@ -175,8 +175,7 @@ static void LoadConfig_MenuInit( void ) {
s_configs.right.height = ARROWS_HEIGHT;
s_configs.right.focuspic = ART_ARROWRIGHT;
s_configs.back.generic.type = MTYPE_BITMAP;
s_configs.back.generic.name = ART_BACK0;
s_configs.back.generic.type = MTYPE_PTEXT;
s_configs.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_configs.back.generic.id = ID_BACK;
s_configs.back.generic.callback = LoadConfig_MenuEvent;
@ -184,7 +183,6 @@ static void LoadConfig_MenuInit( void ) {
s_configs.back.generic.y = 480-64;
s_configs.back.width = 128;
s_configs.back.height = 64;
s_configs.back.focuspic = ART_BACK1;
s_configs.go.generic.type = MTYPE_BITMAP;
s_configs.go.generic.name = ART_FIGHT0;

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

@ -180,8 +180,7 @@ static void UI_Mods_MenuInit( void ) {
s_mods.framer.width = 256;
s_mods.framer.height = 334;
s_mods.back.generic.type = MTYPE_BITMAP;
s_mods.back.generic.name = ART_BACK0;
s_mods.back.generic.type = MTYPE_PTEXT;
s_mods.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_mods.back.generic.id = ID_BACK;
s_mods.back.generic.callback = UI_Mods_MenuEvent;
@ -189,7 +188,6 @@ static void UI_Mods_MenuInit( void ) {
s_mods.back.generic.y = 480-64;
s_mods.back.width = 128;
s_mods.back.height = 64;
s_mods.back.focuspic = ART_BACK1;
s_mods.go.generic.type = MTYPE_BITMAP;
s_mods.go.generic.name = ART_FIGHT0;

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"
#ifndef PRODUCT_VERSION
#define PRODUCT_VERSION "v0.0.0.4 r140"
#define PRODUCT_VERSION "v0.0.0.4 r141"
#endif
#define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION

88
q3rallycode.ppr
View file

@ -94,7 +94,7 @@ q3rallycode
engine\code\botlib\l_utils.h
engine\code\botlib\lcc.mak
engine\code\botlib\linux-i386.mak
+cgame
-cgame
engine\code\cgame\cg_atmospheric.c
engine\code\cgame\cg_consolecmds.c
engine\code\cgame\cg_draw.c
@ -857,61 +857,49 @@ q3rallycode
engine\resync_svn.sh
[Open project files]
0=engine\code\qcommon\q_shared.h
1=engine\code\q3_ui\ui_rally_controls.c
2=engine\code\ui\ui_main.c
3=engine\code\q3_ui\ui_controls2.c
4=engine\code\q3_ui\ui_addbots.c
5=engine\code\q3_ui\ui_cdkey.c
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_cinematics.c
8=engine\code\q3_ui\ui_demo2.c
9=engine\code\q3_ui\ui_ingame.c
10=engine\code\q3_ui\ui_loadconfig.c
11=engine\code\q3_ui\ui_local.h
12=engine\code\q3_ui\ui_login.c
13=engine\code\q3_ui\ui_playermodel.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
[Selected Project Files]
Main=
Selected=engine\code\qcommon\q_shared.h
Selected=engine\code\q3_ui\ui_addbots.c
[engine\code\qcommon\q_shared.h]
TopLine=31
Caret=39,58
[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=1260
Caret=1,1276
TopLine=42
Caret=1,58
[engine\code\q3_ui\ui_addbots.c]
TopLine=280
Caret=1,290
TopLine=359
Caret=38,369
[engine\code\q3_ui\ui_cdkey.c]
TopLine=234
Caret=1,250
[engine\code\q3_ui\ui_display.c]
TopLine=230
Caret=1,246
TopLine=249
Caret=1,265
[engine\code\q3_ui\ui_cinematics.c]
TopLine=124
Caret=1,140
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=142
Caret=30,150
[engine\code\q3_ui\ui_ingame.c]
TopLine=159
Caret=1,175
TopLine=233
Caret=1,249
[engine\code\q3_ui\ui_display.c]
TopLine=282
Caret=1,298
[engine\code\q3_ui\ui_loadconfig.c]
TopLine=146
Caret=1,158
[engine\code\q3_ui\ui_local.h]
TopLine=159
Caret=1,175
[engine\code\q3_ui\ui_login.c]
TopLine=94
Caret=1,110
[engine\code\q3_ui\ui_playermodel.c]
TopLine=1243
Caret=1,1279
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