q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-24 21:01:34 +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-13 21:29:28 +00:00
parent 7bf6f9256d
commit a8e858d941
6 changed files with 50 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -360,8 +360,7 @@ static void UI_AddBotsMenu_Init( void ) {
addBotsMenuInfo.team.generic.flags = QMF_GRAYED;
}
addBotsMenuInfo.go.generic.type = MTYPE_BITMAP;
addBotsMenuInfo.go.generic.name = ART_FIGHT0;
addBotsMenuInfo.go.generic.type = MTYPE_PTEXT;
addBotsMenuInfo.go.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
addBotsMenuInfo.go.generic.id = ID_GO;
addBotsMenuInfo.go.generic.callback = UI_AddBotsMenu_FightEvent;
@ -371,8 +370,7 @@ static void UI_AddBotsMenu_Init( void ) {
addBotsMenuInfo.go.height = 64;
addBotsMenuInfo.go.focuspic = ART_FIGHT1;
addBotsMenuInfo.back.generic.type = MTYPE_BITMAP;
addBotsMenuInfo.back.generic.name = ART_BACK0;
addBotsMenuInfo.back.generic.type = MTYPE_PTEXT;
addBotsMenuInfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
addBotsMenuInfo.back.generic.id = ID_BACK;
addBotsMenuInfo.back.generic.callback = UI_AddBotsMenu_BackEvent;

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

@ -290,8 +290,7 @@ static void UI_CinematicsMenu_Init( void ) {
cinematicsMenuInfo.cin_end.generic.flags |= QMF_GRAYED;
}
cinematicsMenuInfo.back.generic.type = MTYPE_BITMAP;
cinematicsMenuInfo.back.generic.name = ART_BACK0;
cinematicsMenuInfo.back.generic.type = MTYPE_PTEXT;
cinematicsMenuInfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
cinematicsMenuInfo.back.generic.id = ID_BACK;
cinematicsMenuInfo.back.generic.callback = UI_CinematicsMenu_BackEvent;
@ -299,7 +298,6 @@ static void UI_CinematicsMenu_Init( void ) {
cinematicsMenuInfo.back.generic.y = 480-64;
cinematicsMenuInfo.back.width = 128;
cinematicsMenuInfo.back.height = 64;
cinematicsMenuInfo.back.focuspic = ART_BACK1;
Menu_AddItem( &cinematicsMenuInfo.menu, &cinematicsMenuInfo.banner );
Menu_AddItem( &cinematicsMenuInfo.menu, &cinematicsMenuInfo.framel );

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

@ -1263,8 +1263,7 @@ static void Controls_MenuInit( void )
s_controls.misc.style = UI_RIGHT;
s_controls.misc.color = color_red;
s_controls.back.generic.type = MTYPE_BITMAP;
s_controls.back.generic.name = ART_BACK0;
s_controls.back.generic.type = MTYPE_PTEXT;
s_controls.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_controls.back.generic.x = 0;
s_controls.back.generic.y = 480-64;

8
engine/code/q3_ui/ui_demo2.c
View file

@ -131,8 +131,7 @@ static void Demos_MenuInit( void ) {
s_demos.banner.color = color_white;
s_demos.banner.style = UI_CENTER;
s_demos.left.generic.type = MTYPE_BITMAP;
s_demos.left.generic.name =ART_LEFT0;
s_demos.left.generic.type = MTYPE_PTEXT;
s_demos.left.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_demos.left.generic.x = 260;
s_demos.left.generic.y = 480-70;
@ -140,10 +139,8 @@ static void Demos_MenuInit( void ) {
s_demos.left.generic.callback = Demos_MenuEvent;
s_demos.left.width = 20;
s_demos.left.height = 20;
s_demos.left.focuspic = ART_LEFT1;
s_demos.right.generic.type = MTYPE_BITMAP;
s_demos.right.generic.name = ART_RIGHT0;
s_demos.right.generic.type = MTYPE_PTEXT;
s_demos.right.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;
s_demos.right.generic.x = 400;
s_demos.right.generic.y = 480-70;
@ -151,7 +148,6 @@ static void Demos_MenuInit( void ) {
s_demos.right.generic.callback = Demos_MenuEvent;
s_demos.right.width = 20;
s_demos.right.height = 20;
s_demos.right.focuspic = ART_RIGHT1;
s_demos.back.generic.type = MTYPE_PTEXT;
s_demos.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS;

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

46
q3rallycode.ppr
View file

@ -860,9 +860,19 @@ q3rallycode
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
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
[Selected Project Files]
Main=
Selected=engine\code\q3_ui\ui_rally_controls.c
Selected=engine\code\qcommon\q_shared.h
[engine\code\qcommon\q_shared.h]
TopLine=31
Caret=39,58
@ -873,5 +883,35 @@ Caret=1,845
TopLine=1719
Caret=1,1735
[engine\code\q3_ui\ui_controls2.c]
TopLine=688
Caret=59,705
TopLine=1260
Caret=1,1276
[engine\code\q3_ui\ui_addbots.c]
TopLine=280
Caret=1,290
[engine\code\q3_ui\ui_cdkey.c]
TopLine=234
Caret=1,250
[engine\code\q3_ui\ui_display.c]
TopLine=230
Caret=1,246
[engine\code\q3_ui\ui_cinematics.c]
TopLine=124
Caret=1,140
[engine\code\q3_ui\ui_demo2.c]
TopLine=142
Caret=30,150
[engine\code\q3_ui\ui_ingame.c]
TopLine=159
Caret=1,175
[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