From f6d6de7fc8260e238252946756146529fa8fd4b7 Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Fri, 4 Apr 2025 11:24:23 +1000 Subject: [PATCH] remove gCamera from Lua rip any mods that use it --- src/game/camera.c | 9 ++------- src/pc/lua/smlua_cobject.c | 4 ---- src/pc/lua/smlua_cobject.h | 2 -- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/game/camera.c b/src/game/camera.c index 928f79729..ac69d689d 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -537,11 +537,6 @@ void skip_camera_interpolation(void) { gCamSkipInterp = 1; } -static void set_gcamera(struct Camera *c) { - gCamera = c; - if (gCameraCObject != NULL) { gCameraCObject->pointer = c; } -} - /** * Starts a camera shake triggered by an interaction */ @@ -3178,7 +3173,7 @@ void update_camera(struct Camera *c) { if (!c) { return; } UNUSED u8 unused[24]; - set_gcamera(c); + gCamera = c; update_camera_hud_status(c); if ((gOverrideFreezeCamera || get_first_person_enabled()) && !gDjuiInMainMenu) { @@ -3420,7 +3415,7 @@ void soft_reset_camera(struct Camera* c) { */ void reset_camera(struct Camera *c) { if (!c) { return; } - set_gcamera(c); + gCamera = c; gCameraMovementFlags = 0; s2ndRotateFlags = 0; sStatusFlags = 0; diff --git a/src/pc/lua/smlua_cobject.c b/src/pc/lua/smlua_cobject.c index fac9b1c5b..558b17cfb 100644 --- a/src/pc/lua/smlua_cobject.c +++ b/src/pc/lua/smlua_cobject.c @@ -23,8 +23,6 @@ int gSmLuaCPointers = 0; int gSmLuaCObjectMetatable = 0; int gSmLuaCPointerMetatable = 0; -CObject *gCameraCObject = NULL; - struct LuaObjectField* smlua_get_object_field_from_ot(struct LuaObjectTable* ot, const char* key) { // binary search s32 min = 0; @@ -776,8 +774,6 @@ void smlua_cobject_init_globals(void) { EXPOSE_GLOBAL(LOT_SERVERSETTINGS, gServerSettings); EXPOSE_GLOBAL(LOT_NAMETAGSSETTINGS, gNametagsSettings); - - gCameraCObject = smlua_push_object(L, LOT_CAMERA, gCamera, NULL); lua_setglobal(L, "gCamera"); } void smlua_cobject_init_per_file_globals(const char* path) { diff --git a/src/pc/lua/smlua_cobject.h b/src/pc/lua/smlua_cobject.h index 8e1ba9aec..717240798 100644 --- a/src/pc/lua/smlua_cobject.h +++ b/src/pc/lua/smlua_cobject.h @@ -74,8 +74,6 @@ extern int gSmLuaCPointers; extern int gSmLuaCObjectMetatable; extern int gSmLuaCPointerMetatable; -extern CObject *gCameraCObject; - bool smlua_valid_lot(u16 lot); bool smlua_valid_lvt(u16 lvt); const char *smlua_get_lvt_name(u16 lvt);