thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove gCamera from Lua
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Details
Build coop / build-windows (push) Waiting to run
Details
Build coop / build-macos-arm (push) Waiting to run
Details
Build coop / build-macos-intel (push) Waiting to run
Details

Browse source 
rip any mods that use it
This commit is contained in:
Isaac0-dev 2025-04-04 11:24:23 +10:00
parent 049e767ac6
commit f6d6de7fc8
3 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/camera.c
View file

@ -537,11 +537,6 @@ void skip_camera_interpolation(void) {
gCamSkipInterp = 1; 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 * Starts a camera shake triggered by an interaction
*/ */
@ -3178,7 +3173,7 @@ void update_camera(struct Camera *c) {
if (!c) { return; } if (!c) { return; }
UNUSED u8 unused[24]; UNUSED u8 unused[24];
set_gcamera(c); gCamera = c;
update_camera_hud_status(c); update_camera_hud_status(c);
if ((gOverrideFreezeCamera || get_first_person_enabled()) && !gDjuiInMainMenu) { if ((gOverrideFreezeCamera || get_first_person_enabled()) && !gDjuiInMainMenu) {
@ -3420,7 +3415,7 @@ void soft_reset_camera(struct Camera* c) {
*/ */
void reset_camera(struct Camera *c) { void reset_camera(struct Camera *c) {
if (!c) { return; } if (!c) { return; }
set_gcamera(c); gCamera = c;
gCameraMovementFlags = 0; gCameraMovementFlags = 0;
s2ndRotateFlags = 0; s2ndRotateFlags = 0;
sStatusFlags = 0; sStatusFlags = 0;

4
src/pc/lua/smlua_cobject.c
View file

@ -23,8 +23,6 @@ int gSmLuaCPointers = 0;
int gSmLuaCObjectMetatable = 0; int gSmLuaCObjectMetatable = 0;
int gSmLuaCPointerMetatable = 0; int gSmLuaCPointerMetatable = 0;
CObject *gCameraCObject = NULL;
struct LuaObjectField* smlua_get_object_field_from_ot(struct LuaObjectTable* ot, const char* key) { struct LuaObjectField* smlua_get_object_field_from_ot(struct LuaObjectTable* ot, const char* key) {
// binary search // binary search
s32 min = 0; s32 min = 0;
@ -776,8 +774,6 @@ void smlua_cobject_init_globals(void) {
EXPOSE_GLOBAL(LOT_SERVERSETTINGS, gServerSettings); EXPOSE_GLOBAL(LOT_SERVERSETTINGS, gServerSettings);
EXPOSE_GLOBAL(LOT_NAMETAGSSETTINGS, gNametagsSettings); 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) { void smlua_cobject_init_per_file_globals(const char* path) {

2
src/pc/lua/smlua_cobject.h
View file

@ -74,8 +74,6 @@ extern int gSmLuaCPointers;
extern int gSmLuaCObjectMetatable; extern int gSmLuaCObjectMetatable;
extern int gSmLuaCPointerMetatable; extern int gSmLuaCPointerMetatable;
extern CObject *gCameraCObject;
bool smlua_valid_lot(u16 lot); bool smlua_valid_lot(u16 lot);
bool smlua_valid_lvt(u16 lvt); bool smlua_valid_lvt(u16 lvt);
const char *smlua_get_lvt_name(u16 lvt); const char *smlua_get_lvt_name(u16 lvt);