mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-25 17:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix weak func order for d_stage

Browse Source
This commit is contained in:
LagoLunatic
2025-08-22 00:31:41 -04:00
parent db3753b3c9
commit 8d928199ce
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_camera.cpp
+5 -5
View File
@@ -246,9 +246,9 @@ void dCamera_c::initialize(camera_class* camera, fopAc_ac_c* playerActor, u32 ca
mTrimSize = 0;
mTrimTypeForce = -1;
dStage_stageDt_c* stage_dt = &dComIfGp_getStage();
dStage_dt_c* stage_dt = &dComIfGp_getStage();
if (stage_dt != NULL) {
stage_stag_info_class* stag_info = stage_dt->getStagInfo();
stage_stag_info_class* stag_info = stage_dt->getStagInfo();
if (stag_info && stag_info->mCameraMapToolID != -1) { // Bug, comparing unsigned value with -1
mapToolType = GetCameraTypeFromMapToolID(stag_info->mCameraMapToolID, -1);
if (mapToolType != 0xFF && Chtyp(mapToolType)) {
@@ -1510,7 +1510,7 @@ bool dCamera_c::onStyleChange(s32 i_style1, s32 i_style2) {
/* 80164F5C-8016513C .text GetCameraTypeFromMapToolID__9dCamera_cFll */
int dCamera_c::GetCameraTypeFromMapToolID(s32 r27, s32 i_roomNo) {
dStage_stageDt_c& stage_dt = *(dStage_stageDt_c*)&dComIfGp_getStage();
dStage_dt_c& stage_dt = *(dStage_dt_c*)&dComIfGp_getStage();
int cam_type_num;
int arrowIdx;
@@ -4633,7 +4633,7 @@ void store(camera_process_class* i_this) {
int camera_id = get_camera_id(a_this);
dStage_stageDt_c* stage = &dComIfGp_getStage();
dStage_dt_c* stage = &dComIfGp_getStage();
cXyz oldCenter = *fopCamM_GetCenter_p(a_this);
cXyz oldEye = *fopCamM_GetEye_p(a_this);
@@ -4834,7 +4834,7 @@ cPhs_State init_phase2(camera_class* i_this) {
float farPlane = 160000.0f;
if (dComIfGp_getStage().getStagInfo() != NULL) {
dStage_stageDt_c* stage_dt = &dComIfGp_getStage();
dStage_dt_c* stage_dt = &dComIfGp_getStage();
stage_dt->getStagInfo();
farPlane = stage_dt->getStagInfo()->mFarPlane;