From 00045a67765f0cd0f5c86f91b498f8ea380dfd46 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Wed, 3 Jul 2024 22:04:26 -0400 Subject: [PATCH] Make -- pausable true by default --- mods/arena/main.lua | 1 + mods/char-select-cjes-and-vl/main.lua | 1 - mods/char-select-extra-chars/main.lua | 1 - mods/cheats.lua | 1 - mods/faster-swimming.lua | 1 - mods/hide-and-seek.lua | 1 + mods/personal-starcount-ex.lua | 1 - src/pc/djui/djui_panel_menu_options.c | 2 ++ src/pc/djui/djui_panel_misc.c | 10 ---------- src/pc/mods/mod.c | 1 + 10 files changed, 5 insertions(+), 15 deletions(-) diff --git a/mods/arena/main.lua b/mods/arena/main.lua index 83cf930b..458fc786 100644 --- a/mods/arena/main.lua +++ b/mods/arena/main.lua @@ -1,6 +1,7 @@ -- name: Arena -- description: An arena-shooter inspired game mode with custom weapons and levels.\nSeven gamemodes in one, three custom stages, and five weapons. -- incompatible: gamemode arena +-- pausable: false GAME_STATE_ACTIVE = 1 GAME_STATE_INACTIVE = 2 diff --git a/mods/char-select-cjes-and-vl/main.lua b/mods/char-select-cjes-and-vl/main.lua index f665610b..50e00f1b 100644 --- a/mods/char-select-cjes-and-vl/main.lua +++ b/mods/char-select-cjes-and-vl/main.lua @@ -1,6 +1,5 @@ -- name: [CS] VL-Tone & Cjes Luigi -- description: [CS] VL-Tone & Cjes Luigi\nBy Coop Deluxe Team\n\nnThis Character Select pack adds VL-Tone Luigi and Cjes Luigi, who was originally the model for luigi in earlier versions of sm64ex-coop. --- pausable: true if not _G.charSelectExists then local first = false diff --git a/mods/char-select-extra-chars/main.lua b/mods/char-select-extra-chars/main.lua index ef15f1b6..63b14391 100644 --- a/mods/char-select-extra-chars/main.lua +++ b/mods/char-select-extra-chars/main.lua @@ -1,6 +1,5 @@ -- name: [CS] Extra Characters -- description: [CS] Extra Characters\nBy Coop Deluxe Team\n\nThis Character Select pack adds other characters from the Mario series! --- pausable: true if not _G.charSelectExists then return end diff --git a/mods/cheats.lua b/mods/cheats.lua index 4a089958..d92c2de2 100644 --- a/mods/cheats.lua +++ b/mods/cheats.lua @@ -1,7 +1,6 @@ -- name: Cheats -- incompatible: cheats -- description: Cheats\nA mod that adds a bunch of cheats to the mod menu, accessible through the pause menu. --- pausable: true -- localize functions to improve performance local math_floor,smlua_text_utils_get_language,table_insert,approach_s32,set_mario_action,get_network_area_timer = math.floor,smlua_text_utils_get_language,table.insert,approach_s32,set_mario_action,get_network_area_timer diff --git a/mods/faster-swimming.lua b/mods/faster-swimming.lua index 1ef77b18..7b76cb9e 100644 --- a/mods/faster-swimming.lua +++ b/mods/faster-swimming.lua @@ -1,6 +1,5 @@ -- name: Faster Swimming -- description: Everyone swims faster. --- pausable: true function mario_before_phys_step(m) local hScale = 1.0 diff --git a/mods/hide-and-seek.lua b/mods/hide-and-seek.lua index 2de5b4f7..5711e772 100644 --- a/mods/hide-and-seek.lua +++ b/mods/hide-and-seek.lua @@ -1,6 +1,7 @@ -- name: Hide and Seek -- incompatible: gamemode -- description: A simple hide-and-seek gamemode for\nCo-op.\n\nThe game is split into two teams:\n\nHiders and Seekers. The goal is for all\n\Hiders to be converted into a Seeker within a certain timeframe.\n\nAll Seekers appear as a metal character.\n\nEnjoy! :D\n\nConcept by: Super Keeberghrh +-- pausable: false -- constants local ROUND_STATE_WAIT = 0 diff --git a/mods/personal-starcount-ex.lua b/mods/personal-starcount-ex.lua index 0c1d2f3d..6709a421 100644 --- a/mods/personal-starcount-ex.lua +++ b/mods/personal-starcount-ex.lua @@ -1,7 +1,6 @@ -- name: Personal Star Counter -- incompatible: gamemode -- description: See how many stars you've collected!\n\nCredits:\n\\#097419\\Mr.Needlemouse\\#FFFFFF\\ - Concept\nSunk\\#dcdcdc\\ - Creator\n\\#269A91\\Demnyx\\#dcdcdc\\ - Assistance\n\\#f296af\\PeachyPeach\\#dcdcdc\\ - Global functions --- pausable: true ------------------------------ ----- Localize functions ----- diff --git a/src/pc/djui/djui_panel_menu_options.c b/src/pc/djui/djui_panel_menu_options.c index 264816cd..c0adb639 100644 --- a/src/pc/djui/djui_panel_menu_options.c +++ b/src/pc/djui/djui_panel_menu_options.c @@ -53,6 +53,8 @@ void djui_panel_main_menu_create(struct DjuiBase* caller) { struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MENU_OPTIONS, MENU_TITLE), false); struct DjuiBase* body = djui_three_panel_get_body(panel); + djui_themes_init(); + { djui_checkbox_create(body, DLANG(DJUI_THEMES, CENTER), &configDjuiThemeCenter, djui_panel_menu_options_djui_setting_change); char* themeChoices[DJUI_THEME_MAX]; diff --git a/src/pc/djui/djui_panel_misc.c b/src/pc/djui/djui_panel_misc.c index b3e8e560..8ea12364 100644 --- a/src/pc/djui/djui_panel_misc.c +++ b/src/pc/djui/djui_panel_misc.c @@ -15,17 +15,10 @@ #include #endif -static void djui_panel_compatibility_checkbox_on_value_change(UNUSED struct DjuiBase* caller) { -#ifdef DISCORD_SDK - gDiscordInitialized = false; -#endif -} - #ifdef DEVELOPMENT void djui_panel_options_debug_create(struct DjuiBase* caller) { struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MISC, DEBUG_TITLE), false); struct DjuiBase* body = djui_three_panel_get_body(panel); - { djui_checkbox_create(body, DLANG(MISC, FIXED_COLLISIONS), (bool*)&gLevelValues.fixCollisionBugs, NULL); djui_checkbox_create(body, DLANG(MISC, LUA_PROFILER), &configLuaProfiler, NULL); @@ -61,9 +54,6 @@ static void djui_panel_options_open_user_folder(UNUSED struct DjuiBase* caller) void djui_panel_misc_create(struct DjuiBase* caller) { struct DjuiThreePanel* panel = djui_panel_menu_create(DLANG(MISC, MISC_TITLE), false); struct DjuiBase* body = djui_three_panel_get_body(panel); - - djui_themes_init(); - { djui_checkbox_create(body, DLANG(MISC, DISABLE_POPUPS), &configDisablePopups, NULL); #ifndef DEVELOPMENT diff --git a/src/pc/mods/mod.c b/src/pc/mods/mod.c index 8ca436d4..79abf70c 100644 --- a/src/pc/mods/mod.c +++ b/src/pc/mods/mod.c @@ -404,6 +404,7 @@ static void mod_extract_fields(struct Mod* mod) { mod->name = NULL; mod->incompatible = NULL; mod->description = NULL; + mod->pausable = true; // read line-by-line #define BUFFER_SIZE MAX(MAX(MOD_NAME_MAX_LENGTH, MOD_INCOMPATIBLE_MAX_LENGTH), MOD_DESCRIPTION_MAX_LENGTH)