From 2fa5215c28a5cc40e5b383377769d453eed86457 Mon Sep 17 00:00:00 2001 From: JerryALT Date: Fri, 29 Mar 2024 20:00:04 +0300 Subject: [PATCH] [Achievements]: Changed width value if console ui is enabled. --- iw3sp_mod_ff_src/raw/ui/achievements.menu | 183 ++++++++++++++-------- src/Components/Modules/Achievements.cpp | 30 ++-- 2 files changed, 136 insertions(+), 77 deletions(-) diff --git a/iw3sp_mod_ff_src/raw/ui/achievements.menu b/iw3sp_mod_ff_src/raw/ui/achievements.menu index c00171a..e499dfb 100644 --- a/iw3sp_mod_ff_src/raw/ui/achievements.menu +++ b/iw3sp_mod_ff_src/raw/ui/achievements.menu @@ -16,19 +16,6 @@ #define CHOICE_SIZE_X 258 #define CHOICE_SIZE_Y 22 -//---- orient ---- -#define GAMEINFO_WIDTH 250 -#define GAMEINFO_WIDTH2 255 -#define GAMEINFO_HEIGHT 258 -#define GAMEINFO_HEIGHT2 0 -#ifdef PC - #define GAMEINFO_ORIGIN 4 -190 - #define PC_OFFSET_Y 40 -#else - #define GAMEINFO_ORIGIN 4 -170 - #define PC_OFFSET_Y 0 -#endif - // #undef BACK_OPEN // #define BACK_OPEN open stats; @@ -180,8 +167,10 @@ textalign ITEM_ALIGN_CENTER\ textscale 0.35 \ textaligny 18\ - visible 1\ mouseEnter { play "mouse_over"; }\ + exp rect X( 50 + dvarInt( console_menu_style ) * 30 ) \ + exp rect Y( -26 + dvarInt( console_menu_style ) * 40 ) \ + visible 1\ action {\ play "mouse_click";\ open achievements_reset_progress_popmenu;\ @@ -193,34 +182,38 @@ uiScript "achievement_get_info"; #define ACHIEVEMENT_BUTTON(itemIndex, achievementName, achievementDesc, achievementIndex, achievementPage)\ - CHOICE_BUTTON_FOCUS_VIS( itemIndex, achievementName, ;, ACHIEVEMENT_SELECT(achievementIndex), ;, when( dvarInt (ui_achievement_page) == achievementPage)) \ + CHOICE_BUTTON_FOCUS_VIS_ADV_NO_HINT( itemIndex, achievementName, ;, ACHIEVEMENT_SELECT(achievementIndex), ;, when( dvarInt (ui_achievement_page) == achievementPage), 0) \ ACHIEVEMENT_BACKGROUND_TITLE_INFO(achievementName, when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP )) \ ACHIEVEMENT_BACKGROUND_DATE_UNLOCKED(when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP)) \ ACHIEVEMENT_BACKGROUND_DESCRIPTION_INFO(achievementDesc, when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP)) \ /*unlocked*/ACHIEVEMENT_PREVIEW("trophy_" + dvarInt(ui_achievement_select_idx), when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarInt(ui_achievement_status) == 1))\ /*locked*/ACHIEVEMENT_PREVIEW("trophy_locked", when( localVarInt( ui_highlight ) == itemIndex && localVarString( ui_choicegroup ) == CHOICE_GROUP && dvarInt(ui_achievement_status) == 0)) +#define MOVE_PAGE(dvarValue, menuName) \ + close self; \ + setdvar ui_achievement_page dvarValue; \ + play "mouse_click"; \ + open menuName; + #define ACHIEVEMENT_BUTTON_PAGE_LEFT(achievementPage, dvarValue, menuName) \ itemDef { \ name page_left \ type ITEM_TYPE_BUTTON \ style WINDOW_STYLE_SHADER \ - rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ - background "ui_arrow_left"\ - mouseEnter { play "mouse_over"; } \ - action { \ - close self; \ - setdvar ui_achievement_page dvarValue; \ - play "mouse_click"; \ - open menuName; \ - } \ + rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ + background "ui_arrow_left" \ + mouseEnter { play "mouse_over"; }\ + action {\ + MOVE_PAGE(dvarValue, menuName)\ + }\ } + #define ACHIEVEMENT_DBUTTON_PAGE_LEFT(achievementPage) \ itemDef { \ style WINDOW_STYLE_SHADER \ rect -16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_left"\ forecolor 0.2 0.2 0.2 1 \ } @@ -231,21 +224,19 @@ type ITEM_TYPE_BUTTON \ style WINDOW_STYLE_SHADER \ rect 16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_right" \ mouseEnter { play "mouse_over"; } \ action { \ - close self; \ - setdvar ui_achievement_page dvarValue; \ - play "mouse_click"; \ - open menuName; \ + MOVE_PAGE(dvarValue, menuName)\ } \ } + #define ACHIEVEMENT_DBUTTON_PAGE_RIGHT(achievementPage) \ itemDef { \ style WINDOW_STYLE_SHADER \ rect 16 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ background "ui_arrow_right"\ forecolor 0.2 0.2 0.2 1 \ } @@ -254,7 +245,7 @@ itemDef { \ type ITEM_TYPE_TEXT \ rect 0 -26 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible when( dvarInt (ui_achievement_page) == achievementPage) \ + visible when( dvarInt (ui_achievement_page) == achievementPage && dvarBool(gpad_in_use) == 0 ) \ text achievementPageText \ textscale 0.45 \ textstyle ITEM_TEXTSTYLE_SHADOWED \ @@ -269,23 +260,22 @@ itemDef { \ style WINDOW_STYLE_SHADER \ rect -250 -60 500 20 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible 1 \ background "progress_bar_bg"\ forecolor 0.2 0.2 0.2 0.5 \ + visible when( dvarBool(console_menu_style) == 0 ) \ } \ itemDef { \ name "achievement_progress_bar" \ style WINDOW_STYLE_SHADER \ rect -247 -57 0 15 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible 1 \ background "progress_bar_fill"\ forecolor 0 .8 0 1 \ + visible when( dvarBool(console_menu_style) == 0 ) \ } \ itemDef { \ name "achievement_total_count_info" \ type ITEM_TYPE_TEXT \ rect 0 -60 16 16 HORIZONTAL_ALIGN_CENTER VERTICAL_ALIGN_BOTTOM\ - visible 1 \ text "" \ textscale 0.3 \ textstyle ITEM_TEXTSTYLE_SHADOWED \ @@ -293,9 +283,63 @@ textAlign ITEM_ALIGN_CENTER \ textfont UI_FONT_NORMAL \ forecolor 1 1 1 1 \ + visible when( dvarBool(console_menu_style) == 0 ) \ + decoration \ + } \ + itemDef { \ + style WINDOW_STYLE_SHADER \ + rect -320 325 260 20 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ + background "progress_bar_bg"\ + forecolor 0.2 0.2 0.2 0.5 \ + visible when( dvarBool(console_menu_style) == 1 ) \ + decoration \ + } \ + itemDef { \ + name "achievement_progress_bar" \ + style WINDOW_STYLE_SHADER \ + rect -317 327.5 255 15 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ + background "progress_bar_fill"\ + visible when( dvarBool(console_menu_style) == 1 ) \ + forecolor 0 .8 0 1 \ + } \ + itemDef { \ + name "achievement_total_count_info" \ + type ITEM_TYPE_TEXT \ + rect -315 324 255 20 HORIZONTAL_ALIGN_RIGHT VERTICAL_ALIGN_TOP\ + text "" \ + textscale 0.3 \ + textstyle ITEM_TEXTSTYLE_SHADOWED \ + textalignx 0 \ + textaligny 17 \ + textAlign ITEM_ALIGN_CENTER \ + textfont UI_FONT_NORMAL \ + forecolor 1 1 1 1 \ + visible when( dvarBool(console_menu_style) == 1 ) \ decoration \ } + +// from ui\levels.menu +#define ACT_ORIGIN CHOICE_ORIGIN( 1 ) + +#define ACT_HEIGHT 344 +#define ACT_BG_COLOR 0.95 0.95 0.97 0.1 +#define ACT_BG_COLOR2 0 0 0.02 0.45 //1 1 1 0.1 + +#define ACT_BG( ptitle, act_group ) ACT_BG_RAW( -4, -26, ptitle, act_group ) + +#define ACT_BG_RAW( base_x, base_y, ptitle, act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN (CHOICE_SIZE_X+10) ACT_HEIGHT CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x-4) base_y, "gradient_fadein", ACT_BG_COLOR, 0, 0, 0 0 0 0 group act_group )\ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 32 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+6) base_y, "button_highlight_end", ACT_BG_COLOR, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 (ACT_HEIGHT-32) CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+6) (base_y+32), "white", ACT_BG_COLOR, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN (CHOICE_SIZE_X+10) (ACT_HEIGHT-8) CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x-9) (base_y+4), "gradient_fadein", ACT_BG_COLOR2, 0, 0, 0 0 0 0 group act_group )\ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 32 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+1) (base_y+4), "button_highlight_end", ACT_BG_COLOR2, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_SHADER_DRAW_ALIGNED( ACT_ORIGIN 8 (ACT_HEIGHT-40) CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, (base_x+CHOICE_SIZE_X+1) (base_y+36), "white", ACT_BG_COLOR2, 0, 0, 0 0 0 0 group act_group ) \ + PREPROC_TEXT_DRAW_ALIGNED_EXP( ACT_ORIGIN CHOICE_SIZE_X 20 CHOICE_HORIZONTAL_ALIGN CHOICE_VERTICAL_ALIGN, -26 (base_y+4), ptitle, TEXTSIZE_DEFAULT, 0, 0, ITEM_ALIGN_MIDDLE_RIGHT, COLOR_TITLE group act_group ) + { + + #undef CHOICE_Y_START + #define CHOICE_Y_START 60 menuDef { name achievements @@ -305,9 +349,11 @@ style WINDOW_STYLE_FILLED border 0 soundloop "music_mainmenu_mp" - onOpen {} + onOpen { focusfirst; } onEsc { close achievements; } onClose { /*open stats*/ open main; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} + execkeyint 157 { MOVE_PAGE(1, "achievements_page_1") } + #include "ui/blurredbg.inc" #include "ui_mp/navcontrols.inc" @@ -315,6 +361,8 @@ ACHIEVEMENT_BACKGROUND + ACT_BG( "1/3", achievement_page_1) + ACHIEVEMENT_BUTTON(1 , "@ACHIEVEMENT_NAME_0", "@ACHIEVEMENT_DETAIL_0", 0, 0) ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_1", "@ACHIEVEMENT_DETAIL_1", 1, 0) ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_2", "@ACHIEVEMENT_DETAIL_2", 2, 0) @@ -328,8 +376,8 @@ ACHIEVEMENT_BUTTON(11, "@ACHIEVEMENT_NAME_10", "@ACHIEVEMENT_DETAIL_10", 10, 0) ACHIEVEMENT_BUTTON(12, "@ACHIEVEMENT_NAME_11", "@ACHIEVEMENT_DETAIL_11", 11, 0) ACHIEVEMENT_BUTTON(13, "@ACHIEVEMENT_NAME_12", "@ACHIEVEMENT_DETAIL_12", 12, 0) - ACHIEVEMENT_BUTTON(14, "@ACHIEVEMENT_NAME_13", "@ACHIEVEMENT_DETAIL_13", 13, 0) - ACHIEVEMENT_BUTTON(15, "@ACHIEVEMENT_NAME_14", "@ACHIEVEMENT_DETAIL_14", 14, 0) + //ACHIEVEMENT_BUTTON(14, "@ACHIEVEMENT_NAME_13", "@ACHIEVEMENT_DETAIL_13", 13, 0) + //ACHIEVEMENT_BUTTON(15, "@ACHIEVEMENT_NAME_14", "@ACHIEVEMENT_DETAIL_14", 14, 0) ACHIEVEMENT_PROGRESSBAR ACHIEVEMENT_BACKGROUND_DATE_UNLOCKED_TITLE @@ -348,9 +396,11 @@ style WINDOW_STYLE_FILLED border 0 soundloop "music_mainmenu_mp" - onOpen {} + onOpen { focusfirst; } onEsc { close achievements_page_1; } onClose { /*open stats*/ open main; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} + execkeyint 156 { MOVE_PAGE(0, "achievements") } + execkeyint 157 { MOVE_PAGE(2, "achievements_page_2") } #include "ui/blurredbg.inc" #include "ui_mp/navcontrols.inc" @@ -358,21 +408,21 @@ ACHIEVEMENT_BACKGROUND - ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_15", "@ACHIEVEMENT_DETAIL_15", 15, 1 ) - ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_16", "@ACHIEVEMENT_DETAIL_16", 16, 1 ) - ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_17", "@ACHIEVEMENT_DETAIL_17", 17, 1 ) - ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_18", "@ACHIEVEMENT_DETAIL_18", 18, 1 ) - ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_19", "@ACHIEVEMENT_DETAIL_19", 19, 1 ) - ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_20", "@ACHIEVEMENT_DETAIL_20", 20, 1 ) - ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_21", "@ACHIEVEMENT_DETAIL_21", 21, 1 ) - ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_22", "@ACHIEVEMENT_DETAIL_22", 22, 1 ) - ACHIEVEMENT_BUTTON(9, "@ACHIEVEMENT_NAME_23", "@ACHIEVEMENT_DETAIL_23", 23, 1 ) - ACHIEVEMENT_BUTTON(10, "@ACHIEVEMENT_NAME_24", "@ACHIEVEMENT_DETAIL_24", 24, 1 ) - ACHIEVEMENT_BUTTON(11, "@ACHIEVEMENT_NAME_25", "@ACHIEVEMENT_DETAIL_25", 25, 1 ) - ACHIEVEMENT_BUTTON(12, "@ACHIEVEMENT_NAME_26", "@ACHIEVEMENT_DETAIL_26", 26, 1 ) - ACHIEVEMENT_BUTTON(13, "@ACHIEVEMENT_NAME_27", "@ACHIEVEMENT_DETAIL_27", 27, 1 ) - ACHIEVEMENT_BUTTON(14, "@ACHIEVEMENT_NAME_28", "@ACHIEVEMENT_DETAIL_28", 28, 1 ) - ACHIEVEMENT_BUTTON(15, "@ACHIEVEMENT_NAME_29", "@ACHIEVEMENT_DETAIL_29", 29, 1 ) + ACT_BG( "2/3", achievement_page_2) + + ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_13", "@ACHIEVEMENT_DETAIL_13", 13, 1) + ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_14", "@ACHIEVEMENT_DETAIL_14", 14, 1) + ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_15", "@ACHIEVEMENT_DETAIL_15", 15, 1 ) + ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_16", "@ACHIEVEMENT_DETAIL_16", 16, 1 ) + ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_17", "@ACHIEVEMENT_DETAIL_17", 17, 1 ) + ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_18", "@ACHIEVEMENT_DETAIL_18", 18, 1 ) + ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_19", "@ACHIEVEMENT_DETAIL_19", 19, 1 ) + ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_20", "@ACHIEVEMENT_DETAIL_20", 20, 1 ) + ACHIEVEMENT_BUTTON(9, "@ACHIEVEMENT_NAME_21", "@ACHIEVEMENT_DETAIL_21", 21, 1 ) + ACHIEVEMENT_BUTTON(10, "@ACHIEVEMENT_NAME_22", "@ACHIEVEMENT_DETAIL_22", 22, 1 ) + ACHIEVEMENT_BUTTON(11, "@ACHIEVEMENT_NAME_23", "@ACHIEVEMENT_DETAIL_23", 23, 1 ) + ACHIEVEMENT_BUTTON(12, "@ACHIEVEMENT_NAME_24", "@ACHIEVEMENT_DETAIL_24", 24, 1 ) + ACHIEVEMENT_BUTTON(13, "@ACHIEVEMENT_NAME_25", "@ACHIEVEMENT_DETAIL_25", 25, 1 ) ACHIEVEMENT_PROGRESSBAR ACHIEVEMENT_BACKGROUND_DATE_UNLOCKED_TITLE @@ -391,9 +441,10 @@ style WINDOW_STYLE_FILLED border 0 soundloop "music_mainmenu_mp" - onOpen {} + onOpen { focusfirst; } onEsc { close achievements_page_2; } onClose { /*open stats*/ open main; setdvar ui_achievement_page 0; setdvar ui_achievement_select_idx 0;} + execkeyint 156 { MOVE_PAGE(1, "achievements_page_1") } #include "ui/blurredbg.inc" #include "ui_mp/navcontrols.inc" @@ -401,14 +452,18 @@ ACHIEVEMENT_BACKGROUND - ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_30", "@ACHIEVEMENT_DETAIL_30", 30, 2) - ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_31", "@ACHIEVEMENT_DETAIL_31", 31, 2) - ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_32", "@ACHIEVEMENT_DETAIL_32", 32, 2) - ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_33", "@ACHIEVEMENT_DETAIL_33", 33, 2) - ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_34", "@ACHIEVEMENT_DETAIL_34", 34, 2) //error, wtf?! - ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_35", "@ACHIEVEMENT_DETAIL_35", 35, 2) - ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_36", "@ACHIEVEMENT_DETAIL_36", 36, 2) - ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_37", "@ACHIEVEMENT_DETAIL_37", 37, 2) + ACT_BG( "3/3", achievement_page_3) + + ACHIEVEMENT_BUTTON(1, "@ACHIEVEMENT_NAME_26", "@ACHIEVEMENT_DETAIL_26", 26, 2) + ACHIEVEMENT_BUTTON(2, "@ACHIEVEMENT_NAME_27", "@ACHIEVEMENT_DETAIL_27", 27, 2) + ACHIEVEMENT_BUTTON(3, "@ACHIEVEMENT_NAME_30", "@ACHIEVEMENT_DETAIL_30", 30, 2) + ACHIEVEMENT_BUTTON(4, "@ACHIEVEMENT_NAME_31", "@ACHIEVEMENT_DETAIL_31", 31, 2) + ACHIEVEMENT_BUTTON(5, "@ACHIEVEMENT_NAME_32", "@ACHIEVEMENT_DETAIL_32", 32, 2) + ACHIEVEMENT_BUTTON(6, "@ACHIEVEMENT_NAME_33", "@ACHIEVEMENT_DETAIL_33", 33, 2) + ACHIEVEMENT_BUTTON(7, "@ACHIEVEMENT_NAME_34", "@ACHIEVEMENT_DETAIL_34", 34, 2) + ACHIEVEMENT_BUTTON(8, "@ACHIEVEMENT_NAME_35", "@ACHIEVEMENT_DETAIL_35", 35, 2) + ACHIEVEMENT_BUTTON(9, "@ACHIEVEMENT_NAME_36", "@ACHIEVEMENT_DETAIL_36", 36, 2) + ACHIEVEMENT_BUTTON(10, "@ACHIEVEMENT_NAME_37", "@ACHIEVEMENT_DETAIL_37", 37, 2) ACHIEVEMENT_PROGRESSBAR ACHIEVEMENT_BACKGROUND_DATE_UNLOCKED_TITLE diff --git a/src/Components/Modules/Achievements.cpp b/src/Components/Modules/Achievements.cpp index c95f9fe..793b9a2 100644 --- a/src/Components/Modules/Achievements.cpp +++ b/src/Components/Modules/Achievements.cpp @@ -318,13 +318,14 @@ namespace Components std::string timeString = std::ctime(&file.timeStamp[achievement_index_select]); timeString.pop_back(); + const char* data_unlocked = Utils::String::VA("%s", timeString.c_str()); //First achievement menu if (Dvars::Functions::Dvar_FindVar("ui_achievement_page")->current.integer == 0) { // Check the achievement status. Update the itemDefs if the achievement has been received if (Dvars::Functions::Dvar_FindVar("ui_achievement_status")->current.integer == 1) - ChangeItemDefText("achievements", "date_achievement_received", Utils::String::VA("%s", timeString.c_str())); + ChangeItemDefText("achievements", "date_achievement_received", data_unlocked); else ChangeItemDefText("achievements", "date_achievement_received", "--:--"); } @@ -332,7 +333,7 @@ namespace Components { // Check the achievement status. Update the itemDefs if the achievement has been received if (Dvars::Functions::Dvar_FindVar("ui_achievement_status")->current.integer == 1) - ChangeItemDefText("achievements_page_1", "date_achievement_received", Utils::String::VA("%s", timeString.c_str())); + ChangeItemDefText("achievements_page_1", "date_achievement_received", data_unlocked); else ChangeItemDefText("achievements_page_1", "date_achievement_received", "--:--"); } @@ -340,7 +341,7 @@ namespace Components { // Check the achievement status. Update the itemDefs if the achievement has been received if (Dvars::Functions::Dvar_FindVar("ui_achievement_status")->current.integer == 1) - ChangeItemDefText("achievements_page_2", "date_achievement_received", Utils::String::VA("%s", timeString.c_str())); + ChangeItemDefText("achievements_page_2", "date_achievement_received", data_unlocked); else ChangeItemDefText("achievements_page_2", "date_achievement_received", "--:--"); } @@ -361,12 +362,13 @@ namespace Components std::string timeString = std::ctime(&file.timeStamp[achievement_index_select]); timeString.pop_back(); + const char* data_unlocked = Utils::String::VA("%s", timeString.c_str()); if (Dvars::Functions::Dvar_FindVar("ui_achievement_page")->current.integer == 0) { // Check the achievement status. Update the itemDefs if the achievement has been received if (Dvars::Functions::Dvar_FindVar("ui_achievement_status")->current.integer == 1) - ChangeItemDefText("achievements_ingame", "date_achievement_received", Utils::String::VA("%s", timeString.c_str())); + ChangeItemDefText("achievements_ingame", "date_achievement_received", data_unlocked); else ChangeItemDefText("achievements_ingame", "date_achievement_received", "--:--"); } @@ -374,7 +376,7 @@ namespace Components { // Check the achievement status. Update the itemDefs if the achievement has been received if (Dvars::Functions::Dvar_FindVar("ui_achievement_status")->current.integer == 1) - ChangeItemDefText("achievements_page_1_ingame", "date_achievement_received", Utils::String::VA("%s", timeString.c_str())); + ChangeItemDefText("achievements_page_1_ingame", "date_achievement_received", data_unlocked); else ChangeItemDefText("achievements_page_1_ingame", "date_achievement_received", "--:--"); } @@ -382,7 +384,7 @@ namespace Components { // Check the achievement status. Update the itemDefs if the achievement has been received if (Dvars::Functions::Dvar_FindVar("ui_achievement_status")->current.integer == 1) - ChangeItemDefText("achievements_page_2_ingame", "date_achievement_received", Utils::String::VA("%s", timeString.c_str())); + ChangeItemDefText("achievements_page_2_ingame", "date_achievement_received", data_unlocked); else ChangeItemDefText("achievements_page_2_ingame", "date_achievement_received", "--:--"); } @@ -398,7 +400,9 @@ namespace Components static double startWidth = 0.000000; static int slideTime = 450; - int totalWidth = 493; + int totalWidth = Dvars::console_menu_style->current.enabled ? 253 : 493; + + const char* achievement_count = VA_fake("%d/%d", Achievements::GetEarnedAchievementCount(&file), ACHIEVEMENT_TOTAL_COUNT); if (!Game::CL_IsCgameInitialized()) { @@ -406,9 +410,9 @@ namespace Components ChangeItemDefWidth("achievements_page_1", "achievement_progress_bar", startWidth); ChangeItemDefWidth("achievements_page_2", "achievement_progress_bar", startWidth); - ChangeItemDefText("achievements", "achievement_total_count_info", VA_fake("%d/%d", Achievements::GetEarnedAchievementCount(&file), ACHIEVEMENT_TOTAL_COUNT)); - ChangeItemDefText("achievements_page_1", "achievement_total_count_info", VA_fake("%d/%d", Achievements::GetEarnedAchievementCount(&file), ACHIEVEMENT_TOTAL_COUNT)); - ChangeItemDefText("achievements_page_2", "achievement_total_count_info", VA_fake("%d/%d", Achievements::GetEarnedAchievementCount(&file), ACHIEVEMENT_TOTAL_COUNT)); + ChangeItemDefText("achievements", "achievement_total_count_info", achievement_count); + ChangeItemDefText("achievements_page_1", "achievement_total_count_info", achievement_count); + ChangeItemDefText("achievements_page_2", "achievement_total_count_info", achievement_count); int startTime = Game::Sys_MilliSeconds(); @@ -428,9 +432,9 @@ namespace Components ChangeItemDefWidth("achievements_page_1_ingame", "achievement_progress_bar", startWidth); ChangeItemDefWidth("achievements_page_2_ingame", "achievement_progress_bar", startWidth); - ChangeItemDefText("achievements_ingame", "achievement_total_count_info", VA_fake("%d/%d", Achievements::GetEarnedAchievementCount(&file), ACHIEVEMENT_TOTAL_COUNT)); - ChangeItemDefText("achievements_page_1_ingame", "achievement_total_count_info", VA_fake("%d/%d", Achievements::GetEarnedAchievementCount(&file), ACHIEVEMENT_TOTAL_COUNT)); - ChangeItemDefText("achievements_page_2_ingame", "achievement_total_count_info", VA_fake("%d/%d", Achievements::GetEarnedAchievementCount(&file), ACHIEVEMENT_TOTAL_COUNT)); + ChangeItemDefText("achievements_ingame", "achievement_total_count_info", achievement_count); + ChangeItemDefText("achievements_page_1_ingame", "achievement_total_count_info", achievement_count); + ChangeItemDefText("achievements_page_2_ingame", "achievement_total_count_info", achievement_count); int startTime = Game::Sys_MilliSeconds();