diff --git a/engine/code/q3_ui/ui_removebots.c b/engine/code/q3_ui/ui_removebots.c index 9acf0b93..0187723a 100644 --- a/engine/code/q3_ui/ui_removebots.c +++ b/engine/code/q3_ui/ui_removebots.c @@ -60,15 +60,12 @@ typedef struct { menutext_s banner; menubitmap_s background; - - menubitmap_s arrows; + menubitmap_s arrows; menubitmap_s up; menubitmap_s down; - - menutext_s bots[7]; - - menubitmap_s delete; - menubitmap_s back; + menutext_s bots[7]; + menutext_s delete; + menutext_s back; int numBots; int baseBotNum; @@ -297,21 +294,25 @@ static void UI_RemoveBotsMenu_Init( void ) { removeBotsMenuInfo.delete.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS; removeBotsMenuInfo.delete.generic.id = ID_DELETE; removeBotsMenuInfo.delete.generic.callback = UI_RemoveBotsMenu_DeleteEvent; - removeBotsMenuInfo.delete.generic.x = 320+128-128; + removeBotsMenuInfo.delete.generic.x = 320+128; removeBotsMenuInfo.delete.generic.y = 256+128-64; removeBotsMenuInfo.delete.width = 128; removeBotsMenuInfo.delete.height = 64; - removeBotsMenuInfo.delete.focuspic = ART_DELETE1; + removeBotsMenuInfo.delete.string = "DELETE"; + removeBotsMenuInfo.delete.color = color_orange; + removeBotsMenuInfo.delete.style = UI_LEFT|UI_SMALLFONT; removeBotsMenuInfo.back.generic.type = MTYPE_PTEXT; - removeBotsMenuInfo.back.generic.flags = QMF_LEFT_JUSTIFY|QMF_PULSEIFFOCUS; + removeBotsMenuInfo.back.generic.flags = QMF_RIGHT_JUSTIFY|QMF_PULSEIFFOCUS; removeBotsMenuInfo.back.generic.id = ID_BACK; 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.focuspic = ART_BACK1; + removeBotsMenuInfo.back.string = "< BACK"; + removeBotsMenuInfo.back.color = color_orange; + removeBotsMenuInfo.back.style = UI_RIGHT|UI_SMALLFONT; Menu_AddItem( &removeBotsMenuInfo.menu, &removeBotsMenuInfo.background ); Menu_AddItem( &removeBotsMenuInfo.menu, &removeBotsMenuInfo.banner ); diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index dd319690..cff50aa5 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 r146" +#define PRODUCT_VERSION "v0.0.0.4 r147" #endif #define Q3_VERSION PRODUCT_NAME " " PRODUCT_VERSION diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 4ff56873..276a44b1 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -426,7 +426,7 @@ q3rallycode engine\code\null\null_main.c engine\code\null\null_net.c engine\code\null\null_snddma.c - -q3_ui + +q3_ui engine\code\q3_ui\ui.def engine\code\q3_ui\ui_addbots.c engine\code\q3_ui\ui_atoms.c @@ -868,6 +868,7 @@ q3rallycode 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 [Selected Project Files] Main= Selected=engine\code\qcommon\q_shared.h @@ -875,7 +876,7 @@ Selected=engine\code\qcommon\q_shared.h TopLine=40 Caret=40,58 [engine\code\q3_ui\ui_addbots.c] -TopLine=361 +TopLine=353 Caret=21,373 [engine\code\q3_ui\ui_cdkey.c] TopLine=246 @@ -907,3 +908,6 @@ 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