From 37cfd9ae04d1fd28c1f8ba00874b34006a5dc563 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Mon, 1 Jan 2024 14:43:34 -0500 Subject: [PATCH] Tidying up --- include/types.h | 12 ++++++------ ...nts_32.lua => _mquake_a_constants_32.luac} | Bin 15250 -> 15251 bytes ...nts_64.lua => _mquake_a_constants_64.luac} | Bin 15250 -> 15251 bytes ...ysics_32.lua => _mquake_b_physics_32.luac} | Bin 7630 -> 7631 bytes ...ysics_64.lua => _mquake_b_physics_64.luac} | Bin 7630 -> 7631 bytes ...ua => _mquake_c_moveset_functions_32.luac} | Bin 7853 -> 7854 bytes ...ua => _mquake_c_moveset_functions_64.luac} | Bin 7853 -> 7854 bytes ...tions_32.lua => _mquake_d_actions_32.luac} | Bin 13576 -> 13577 bytes ...tions_64.lua => _mquake_d_actions_64.luac} | Bin 13576 -> 13577 bytes ...2.lua => _mquake_e_hook_functions_32.luac} | Bin 17950 -> 17951 bytes ...4.lua => _mquake_e_hook_functions_64.luac} | Bin 17950 -> 17951 bytes ...f_hooks_32.lua => _mquake_f_hooks_32.luac} | Bin 5807 -> 5808 bytes ...f_hooks_64.lua => _mquake_f_hooks_64.luac} | Bin 5807 -> 5808 bytes ...ake_g_api_32.lua => _mquake_g_api_32.luac} | Bin 5473 -> 5474 bytes ...ake_g_api_64.lua => _mquake_g_api_64.luac} | Bin 5473 -> 5474 bytes mods/mquake/main.lua | 2 +- src/pc/crash_handler.c | 2 ++ src/pc/lua/smlua_utils.c | 2 +- 18 files changed, 10 insertions(+), 8 deletions(-) rename mods/mquake/{_mquake_a_constants_32.lua => _mquake_a_constants_32.luac} (99%) rename mods/mquake/{_mquake_a_constants_64.lua => _mquake_a_constants_64.luac} (99%) rename mods/mquake/{_mquake_b_physics_32.lua => _mquake_b_physics_32.luac} (99%) rename mods/mquake/{_mquake_b_physics_64.lua => _mquake_b_physics_64.luac} (99%) rename mods/mquake/{_mquake_c_moveset_functions_32.lua => _mquake_c_moveset_functions_32.luac} (99%) rename mods/mquake/{_mquake_c_moveset_functions_64.lua => _mquake_c_moveset_functions_64.luac} (99%) rename mods/mquake/{_mquake_d_actions_32.lua => _mquake_d_actions_32.luac} (99%) rename mods/mquake/{_mquake_d_actions_64.lua => _mquake_d_actions_64.luac} (99%) rename mods/mquake/{_mquake_e_hook_functions_32.lua => _mquake_e_hook_functions_32.luac} (99%) rename mods/mquake/{_mquake_e_hook_functions_64.lua => _mquake_e_hook_functions_64.luac} (99%) rename mods/mquake/{_mquake_f_hooks_32.lua => _mquake_f_hooks_32.luac} (99%) rename mods/mquake/{_mquake_f_hooks_64.lua => _mquake_f_hooks_64.luac} (99%) rename mods/mquake/{_mquake_g_api_32.lua => _mquake_g_api_32.luac} (99%) rename mods/mquake/{_mquake_g_api_64.lua => _mquake_g_api_64.luac} (99%) 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 c699463c7b1013ec69022fdac6f7b9c2c49f4ab6..10666bc2558f11a24ff3eaeb1ceb5ba8b12241ea 100644 GIT binary patch delta 18 ZcmbPKKDnGz+NU%zm_c$f??#R;YXCeP1>^t# delta 17 YcmbPSKB=5T+NU%zm_c&#M$Rs405^IC*8l(j 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 8227fb844923d49a6449ef98bc3644d0988f42bb..ce167cd21be09c4521f49143722deb242a80caaa 100644 GIT binary patch delta 18 ZcmbPKKDnGz+NU%zm_c$f??#R;YXCeP1>^t# delta 17 YcmbPSKB=5T+NU%zm_c&#M$Rs405^IC*8l(j 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 27a9413b2b47ca006f483f19206d0300691e1206..3bd6ae7020a6e94cc1d1ccf0acefe12513a74f50 100644 GIT binary patch delta 18 ZcmX?SecqZ=+NU%zm_c$f??#SevH(2p1_A&8 delta 17 YcmX?aea@Og+NU%zm_c&#M$Tih060tq^#A|> 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 8beb1e391d0cd4e55935007dbeb9823a5df2f97b..6360431b8fefdb0af9e384444ac30a0d6777363c 100644 GIT binary patch delta 18 ZcmX?SecqZ=+NU%zm_c$f??#SevH(2p1_A&8 delta 17 YcmX?aea@Og+NU%zm_c&#M$Tih060tq^#A|> 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 62e618e962fab72dc83a583010055abc4969ebc9..789ac34cfe3520619209938c09a1079ffb1d948d 100644 GIT binary patch delta 18 ZcmZ2$yUvzV+NU%zm_c$f??#TLasW7s1*8A~ delta 17 YcmZ2yyVjON+NU%zm_c&#M$V;j05m5BmjD0& 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 acaf30e28daa691115f8ad6ee77b6b59926ba531..28741a91e9f25e559f4d10ac7ff13bff60d590e8 100644 GIT binary patch delta 18 ZcmZ2$yUvzV+NU%zm_c$f??#TLasW7s1*8A~ delta 17 YcmZ2yyVjON+NU%zm_c&#M$V;j05m5BmjD0& 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 bb793284c8ce05d2597362109102f5c3299a0aec..935b98e0d40a2599bd247d4d55627548cbca65fb 100644 GIT binary patch delta 17 YcmeCk>dfMl_9;yaW{{lByO6^a05a_b761SM delta 16 XcmeCo>d4}d_9;yaW{{k`kkb?ZE`|jO 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 6fb91f566e9f6961787b705007104f9a6ebd8381..12bc12054d48d88d47a9fbdf6e2fc07e879578d9 100644 GIT binary patch delta 17 YcmeCk>dfMl_9;yaW{{lByO6^a05a_b761SM delta 16 XcmeCo>d4}d_9;yaW{{k`kkb?ZE`|jO 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 8d566946eaf43cd397682f255e275b8f67c352c5..88052211570e8687c05ddfcf77996903056d0b2b 100644 GIT binary patch delta 20 bcmbQ&!#KZ(kyF~IG%=V#ax(8m4ly?XLm36X delta 19 acmbQ=!#J;pkwe<2G%=V#a`Hw_F*g7{GzGE% 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 16da6f15a1da38676cd8e0db008f5bf189f82161..c2c2f323442199f171e56118a3d1d04cd40fa558 100644 GIT binary patch delta 20 bcmbQ&!#KZ(kyF~IG%=V#ax(8m4ly?XLm36X delta 19 acmbQ=!#J;pkwe<2G%=V#a`Hw_F*g7{GzGE% 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 0d8afc9888b2139e61fe5a26d3a6ac7d01f1fd68..5bb05d1b8ad99236d339aeb6ad1498e6968240e2 100644 GIT binary patch delta 18 ZcmZ3lyFr&z+NU%zm_c$f??#U0VgNSF1%dzo delta 17 Ycmdm>yIz+=+NU%zm_c&#M$YA805XFGbpQYW 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 dfabe31f4e1352351b82600372463b072c0edd5a..3e2dcd394db96bfde7471299c03b0422548801fc 100644 GIT binary patch delta 18 ZcmZ3lyFr&z+NU%zm_c$f??#U0VgNSF1%dzo delta 17 Ycmdm>yIz+=+NU%zm_c&#M$YA805XFGbpQYW 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 48cdc75f6df728fe31789dc662564116af62a824..36f4a712ff3bd1834ad9cc93d0872e6b912e7462 100644 GIT binary patch delta 18 ZcmaE;^+=0T+NU%zm_c$f??#SDQ2;!01(5&% delta 17 YcmaE)^-zmL+NU%zm_c&#M$Sl405{A9ga7~l 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 676f163dbd779da3e97d455d78111fa23fcfee9f..b79bc1b8fa66620fccef279b697711fda8f2a8fc 100644 GIT binary patch delta 18 ZcmaE;^+=0T+NU%zm_c$f??#SDQ2;!01(5&% delta 17 YcmaE)^-zmL+NU%zm_c&#M$Sl405{A9ga7~l 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;