From f93aeb3c72494ad271600cb7b8a62c7f14e9a829 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Sun, 30 Jun 2024 17:51:35 -0400 Subject: [PATCH] Remove in-game changelog panel --- src/pc/configfile.c | 4 ---- src/pc/configfile.h | 1 - src/pc/djui/djui.c | 5 ----- src/pc/djui/djui_panel_changelog.c | 34 ------------------------------ src/pc/djui/djui_panel_changelog.h | 4 ---- src/pc/djui/djui_panel_info.c | 7 +----- 6 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 src/pc/djui/djui_panel_changelog.c delete mode 100644 src/pc/djui/djui_panel_changelog.h diff --git a/src/pc/configfile.c b/src/pc/configfile.c index 767f9c30..a050afaf 100644 --- a/src/pc/configfile.c +++ b/src/pc/configfile.c @@ -183,7 +183,6 @@ bool configDjuiThemeCenter = true; unsigned int configDjuiThemeFont = FONT_NORMAL; unsigned int configDjuiScale = 0; // other -char configLastVersion[MAX_CONFIG_STRING] = ""; unsigned int configRulesVersion = 0; static const struct ConfigOption options[] = { @@ -308,7 +307,6 @@ static const struct ConfigOption options[] = { {.name = "djui_theme_font", .type = CONFIG_TYPE_UINT, .uintValue = &configDjuiThemeFont}, {.name = "djui_scale", .type = CONFIG_TYPE_UINT, .uintValue = &configDjuiScale}, // other - {.name = "last_version", .type = CONFIG_TYPE_STRING, .stringValue = (char*)&configLastVersion, .maxStringLength = MAX_CONFIG_STRING}, {.name = "rules_version", .type = CONFIG_TYPE_UINT, .uintValue = &configRulesVersion} }; @@ -687,8 +685,6 @@ NEXT_OPTION: if (configDjuiTheme >= DJUI_THEME_MAX) { configDjuiTheme = 0; } if (configDjuiScale >= 5) { configDjuiScale = 0; } - if (!strcmp(configLastVersion, "")) { snprintf(configLastVersion, MAX_CONFIG_STRING, "%s", get_version()); } - #ifndef COOPNET configNetworkSystem = NS_SOCKET; #endif diff --git a/src/pc/configfile.h b/src/pc/configfile.h index 8d8e8c46..16119684 100644 --- a/src/pc/configfile.h +++ b/src/pc/configfile.h @@ -134,7 +134,6 @@ extern bool configDjuiThemeCenter; extern unsigned int configDjuiThemeFont; extern unsigned int configDjuiScale; // other -extern char configLastVersion[MAX_CONFIG_STRING]; extern unsigned int configRulesVersion; void enable_queued_mods(void); diff --git a/src/pc/djui/djui.c b/src/pc/djui/djui.c index bea07398..236a4211 100644 --- a/src/pc/djui/djui.c +++ b/src/pc/djui/djui.c @@ -5,7 +5,6 @@ #include "djui_panel_pause.h" #include "djui_panel_join.h" #include "djui_panel_join_message.h" -#include "djui_panel_changelog.h" #include "djui_fps_display.h" #include "../debuglog.h" #include "pc/cliopts.h" @@ -108,10 +107,6 @@ void djui_init_late(void) { gPanelLanguageOnStartup = true; djui_panel_language_create(NULL); } - if (strcmp(configLastVersion, get_version())) { - snprintf(configLastVersion, MAX_CONFIG_STRING, "%s", get_version()); - djui_panel_changelog_create(NULL); - } // djui_panel_debug_create(); djui_cursor_create(); diff --git a/src/pc/djui/djui_panel_changelog.c b/src/pc/djui/djui_panel_changelog.c deleted file mode 100644 index 6b449bbc..00000000 --- a/src/pc/djui/djui_panel_changelog.c +++ /dev/null @@ -1,34 +0,0 @@ -#include "djui.h" -#include "djui_panel.h" -#include "djui_panel_menu.h" - -#define PAGE_COUNT 1 - -static char sChangelog[PAGE_COUNT][1024]; - -void djui_panel_changelog_create(struct DjuiBase* caller) { - struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(CHANGELOG, CHANGELOG_TITLE)); - struct DjuiBase* body = djui_three_panel_get_body(panel); - - { - struct DjuiPaginated* paginated = djui_paginated_create(body, 1); - struct DjuiBase* layoutBase = &paginated->layout->base; - - snprintf(sChangelog[0], 1024, "Hi! This is Gabe Newell, welcome to sm64coopdx %s. If you have downloaded this build and do not come from the sm64coopdx v1.0 Testing Thread, please delete it and inform agentxlp.", SM64COOPDX_VERSION); - - for (int i = 0; i < PAGE_COUNT; i++) { - struct DjuiText* text = djui_text_create(layoutBase, sChangelog[i]); - djui_base_set_location(&text->base, 0, 0); - djui_base_set_size(&text->base, (DJUI_DEFAULT_PANEL_WIDTH * (configDjuiThemeCenter ? DJUI_THEME_CENTERED_WIDTH : 1)) - 64, 360); - djui_base_set_color(&text->base, 220, 220, 220, 255); - djui_text_set_drop_shadow(text, 64, 64, 64, 100); - djui_text_set_alignment(text, DJUI_HALIGN_LEFT, DJUI_VALIGN_TOP); - } - - djui_paginated_calculate_height(paginated); - - djui_button_create(body, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back); - } - - djui_panel_add(caller, panel, NULL); -} \ No newline at end of file diff --git a/src/pc/djui/djui_panel_changelog.h b/src/pc/djui/djui_panel_changelog.h deleted file mode 100644 index adb13310..00000000 --- a/src/pc/djui/djui_panel_changelog.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "djui.h" - -void djui_panel_changelog_create(struct DjuiBase* caller); \ No newline at end of file diff --git a/src/pc/djui/djui_panel_info.c b/src/pc/djui/djui_panel_info.c index b0c5c828..22b71e64 100644 --- a/src/pc/djui/djui_panel_info.c +++ b/src/pc/djui/djui_panel_info.c @@ -1,7 +1,6 @@ #include "djui.h" #include "djui_panel.h" #include "djui_panel_menu.h" -#include "djui_panel_changelog.h" #include "pc/lua/utils/smlua_misc_utils.h" static char sInfo[512]; @@ -22,11 +21,7 @@ More features, customization, and power to the Lua API allow modders and players djui_text_set_drop_shadow(text, 64, 64, 64, 100); djui_text_set_alignment(text, DJUI_HALIGN_CENTER, DJUI_VALIGN_CENTER); - struct DjuiRect* rect1 = djui_rect_container_create(body, 64); - { - djui_button_left_create(&rect1->base, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back); - djui_button_right_create(&rect1->base, DLANG(INFORMATION, CHANGELOG), DJUI_BUTTON_STYLE_NORMAL, djui_panel_changelog_create); - } + djui_button_create(body, DLANG(MENU, BACK), DJUI_BUTTON_STYLE_BACK, djui_panel_menu_back); } djui_panel_add(caller, panel, NULL);