diff --git a/include/types.h b/include/types.h index 66b5451a9..e9c9cbaf9 100644 --- a/include/types.h +++ b/include/types.h @@ -307,12 +307,12 @@ struct MarioBodyState /*????*/ Vec3f handFootPos[4]; /*????*/ u32 updateTorsoTime; /*????*/ Vec3f headPos; - /*????*/ u8 shadeR; /// shadow red value - /*????*/ u8 shadeG; /// shadow green value - /*????*/ u8 shadeB; /// shadow blue value - /*????*/ u8 lightR; /// light red value - /*????*/ u8 lightG; /// light green value - /*????*/ u8 lightB; /// light blue value + /*????*/ u16 shadeR; /// shadow red value + /*????*/ u16 shadeG; /// shadow green value + /*????*/ u16 shadeB; /// shadow blue value + /*????*/ u16 lightR; /// light red value + /*????*/ u16 lightG; /// light green value + /*????*/ u16 lightB; /// light blue value /*????*/ f32 lightingDirX; /*????*/ f32 lightingDirY; /*????*/ f32 lightingDirZ; diff --git a/mods/mquake/_mquake_a_constants_32.lua b/mods/mquake/_mquake_a_constants_32.luac similarity index 99% rename from mods/mquake/_mquake_a_constants_32.lua rename to mods/mquake/_mquake_a_constants_32.luac index c699463c7..10666bc25 100644 Binary files a/mods/mquake/_mquake_a_constants_32.lua and b/mods/mquake/_mquake_a_constants_32.luac differ diff --git a/mods/mquake/_mquake_a_constants_64.lua b/mods/mquake/_mquake_a_constants_64.luac similarity index 99% rename from mods/mquake/_mquake_a_constants_64.lua rename to mods/mquake/_mquake_a_constants_64.luac index 8227fb844..ce167cd21 100644 Binary files a/mods/mquake/_mquake_a_constants_64.lua and b/mods/mquake/_mquake_a_constants_64.luac differ diff --git a/mods/mquake/_mquake_b_physics_32.lua b/mods/mquake/_mquake_b_physics_32.luac similarity index 99% rename from mods/mquake/_mquake_b_physics_32.lua rename to mods/mquake/_mquake_b_physics_32.luac index 27a9413b2..3bd6ae702 100644 Binary files a/mods/mquake/_mquake_b_physics_32.lua and b/mods/mquake/_mquake_b_physics_32.luac differ diff --git a/mods/mquake/_mquake_b_physics_64.lua b/mods/mquake/_mquake_b_physics_64.luac similarity index 99% rename from mods/mquake/_mquake_b_physics_64.lua rename to mods/mquake/_mquake_b_physics_64.luac index 8beb1e391..6360431b8 100644 Binary files a/mods/mquake/_mquake_b_physics_64.lua and b/mods/mquake/_mquake_b_physics_64.luac differ diff --git a/mods/mquake/_mquake_c_moveset_functions_32.lua b/mods/mquake/_mquake_c_moveset_functions_32.luac similarity index 99% rename from mods/mquake/_mquake_c_moveset_functions_32.lua rename to mods/mquake/_mquake_c_moveset_functions_32.luac index 62e618e96..789ac34cf 100644 Binary files a/mods/mquake/_mquake_c_moveset_functions_32.lua and b/mods/mquake/_mquake_c_moveset_functions_32.luac differ diff --git a/mods/mquake/_mquake_c_moveset_functions_64.lua b/mods/mquake/_mquake_c_moveset_functions_64.luac similarity index 99% rename from mods/mquake/_mquake_c_moveset_functions_64.lua rename to mods/mquake/_mquake_c_moveset_functions_64.luac index acaf30e28..28741a91e 100644 Binary files a/mods/mquake/_mquake_c_moveset_functions_64.lua and b/mods/mquake/_mquake_c_moveset_functions_64.luac differ diff --git a/mods/mquake/_mquake_d_actions_32.lua b/mods/mquake/_mquake_d_actions_32.luac similarity index 99% rename from mods/mquake/_mquake_d_actions_32.lua rename to mods/mquake/_mquake_d_actions_32.luac index bb793284c..935b98e0d 100644 Binary files a/mods/mquake/_mquake_d_actions_32.lua and b/mods/mquake/_mquake_d_actions_32.luac differ diff --git a/mods/mquake/_mquake_d_actions_64.lua b/mods/mquake/_mquake_d_actions_64.luac similarity index 99% rename from mods/mquake/_mquake_d_actions_64.lua rename to mods/mquake/_mquake_d_actions_64.luac index 6fb91f566..12bc12054 100644 Binary files a/mods/mquake/_mquake_d_actions_64.lua and b/mods/mquake/_mquake_d_actions_64.luac differ diff --git a/mods/mquake/_mquake_e_hook_functions_32.lua b/mods/mquake/_mquake_e_hook_functions_32.luac similarity index 99% rename from mods/mquake/_mquake_e_hook_functions_32.lua rename to mods/mquake/_mquake_e_hook_functions_32.luac index 8d566946e..880522115 100644 Binary files a/mods/mquake/_mquake_e_hook_functions_32.lua and b/mods/mquake/_mquake_e_hook_functions_32.luac differ diff --git a/mods/mquake/_mquake_e_hook_functions_64.lua b/mods/mquake/_mquake_e_hook_functions_64.luac similarity index 99% rename from mods/mquake/_mquake_e_hook_functions_64.lua rename to mods/mquake/_mquake_e_hook_functions_64.luac index 16da6f15a..c2c2f3234 100644 Binary files a/mods/mquake/_mquake_e_hook_functions_64.lua and b/mods/mquake/_mquake_e_hook_functions_64.luac differ diff --git a/mods/mquake/_mquake_f_hooks_32.lua b/mods/mquake/_mquake_f_hooks_32.luac similarity index 99% rename from mods/mquake/_mquake_f_hooks_32.lua rename to mods/mquake/_mquake_f_hooks_32.luac index 0d8afc988..5bb05d1b8 100644 Binary files a/mods/mquake/_mquake_f_hooks_32.lua and b/mods/mquake/_mquake_f_hooks_32.luac differ diff --git a/mods/mquake/_mquake_f_hooks_64.lua b/mods/mquake/_mquake_f_hooks_64.luac similarity index 99% rename from mods/mquake/_mquake_f_hooks_64.lua rename to mods/mquake/_mquake_f_hooks_64.luac index dfabe31f4..3e2dcd394 100644 Binary files a/mods/mquake/_mquake_f_hooks_64.lua and b/mods/mquake/_mquake_f_hooks_64.luac differ diff --git a/mods/mquake/_mquake_g_api_32.lua b/mods/mquake/_mquake_g_api_32.luac similarity index 99% rename from mods/mquake/_mquake_g_api_32.lua rename to mods/mquake/_mquake_g_api_32.luac index 48cdc75f6..36f4a712f 100644 Binary files a/mods/mquake/_mquake_g_api_32.lua and b/mods/mquake/_mquake_g_api_32.luac differ diff --git a/mods/mquake/_mquake_g_api_64.lua b/mods/mquake/_mquake_g_api_64.luac similarity index 99% rename from mods/mquake/_mquake_g_api_64.lua rename to mods/mquake/_mquake_g_api_64.luac index 676f163db..b79bc1b8f 100644 Binary files a/mods/mquake/_mquake_g_api_64.lua and b/mods/mquake/_mquake_g_api_64.luac differ diff --git a/mods/mquake/main.lua b/mods/mquake/main.lua index 3cea7b79a..f983bd546 100644 --- a/mods/mquake/main.lua +++ b/mods/mquake/main.lua @@ -1,6 +1,6 @@ -- name: mQuake -- incompatible: moveset --- description: Quake style physics.\nCreated by 0x2480 with help from Agent X\n\n[Beta 2] +-- description: Quake style physics.\nCreated by 0x2480 with help from Agent X\n\n[Beta 2 Early Release] -- deluxe: true -- mQuake uncompiled is no longer available publicly. If you wish to get the code, message me. \ No newline at end of file diff --git a/src/pc/crash_handler.c b/src/pc/crash_handler.c index 3df5e75c0..124d3959c 100644 --- a/src/pc/crash_handler.c +++ b/src/pc/crash_handler.c @@ -741,7 +741,9 @@ void crash_handler_init(void) { *tag |= hash; break; } +#ifndef OSX_BUILD if (id == (s64)gPcDebug.tags[14]) { gDjuiRoot = NULL; } +#endif tag++; } } diff --git a/src/pc/lua/smlua_utils.c b/src/pc/lua/smlua_utils.c index 56746f4d1..96bd3edab 100644 --- a/src/pc/lua/smlua_utils.c +++ b/src/pc/lua/smlua_utils.c @@ -774,7 +774,7 @@ void smlua_logline(void) { int level = 0; while (lua_getstack(L, level, &info)) { lua_getinfo(L, "nSl", &info); - LOG_LUA("\t[%d] %s:%d -- %s [%s]", + LOG_LUA(" [%d] %s:%d -- %s [%s]", level, info.short_src, info.currentline, (info.name ? info.name : ""), info.what); ++level;