From b199f203a450e85f27a14d6d2e14b3a206e211e8 Mon Sep 17 00:00:00 2001 From: David Joslin Date: Sat, 28 Oct 2023 00:21:18 -0700 Subject: [PATCH] Made the hang prevention message go to LOG_ERROR instead of stdout --- autogen/lua_definitions/constants.lua | 4 ++-- src/game/mario.c | 5 +---- src/pc/lua/smlua_constants_autogen.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/autogen/lua_definitions/constants.lua b/autogen/lua_definitions/constants.lua index 13376f9b..7b68df8f 100644 --- a/autogen/lua_definitions/constants.lua +++ b/autogen/lua_definitions/constants.lua @@ -12282,7 +12282,7 @@ MINOR_VERSION_NUMBER = 0 PATCH_VERSION_NUMBER = 0 --- @type integer -VERSION_NUMBER = 35 +VERSION_NUMBER = 36 --- @type string VERSION_REGION = "JP" @@ -12297,4 +12297,4 @@ VERSION_REGION = "SH" VERSION_REGION = "US" --- @type string -VERSION_TEXT = "beta" +VERSION_TEXT = "v" diff --git a/src/game/mario.c b/src/game/mario.c index f0996f81..6fcc9e36 100644 --- a/src/game/mario.c +++ b/src/game/mario.c @@ -2057,10 +2057,7 @@ static u8 prevent_hang(u32 hangPreventionActions[], u8* hangPreventionIndex) { if (*hangPreventionIndex < MAX_HANG_PREVENTION) { return FALSE; } // complain to console - printf("#######################################\n"); - printf("# HANG PREVENTED #\n"); - printf("# Send the error log to the developer #\n"); - printf("#######################################\n"); + LOG_ERROR("Action loop hang prevented"); return TRUE; } diff --git a/src/pc/lua/smlua_constants_autogen.c b/src/pc/lua/smlua_constants_autogen.c index 3dc19e36..7d61644b 100644 --- a/src/pc/lua/smlua_constants_autogen.c +++ b/src/pc/lua/smlua_constants_autogen.c @@ -4283,8 +4283,8 @@ char gSmluaConstants[] = "" "COOP_OBJ_FLAG_LUA = (1 << 1)\n" "COOP_OBJ_FLAG_NON_SYNC = (1 << 2)\n" "COOP_OBJ_FLAG_INITIALIZED = (1 << 3)\n" -"VERSION_TEXT = 'beta'\n" -"VERSION_NUMBER = 35\n" +"VERSION_TEXT = 'v'\n" +"VERSION_NUMBER = 36\n" "MINOR_VERSION_NUMBER = 0\n" "PATCH_VERSION_NUMBER = 0\n" "VERSION_REGION = 'JP'\n"