diff options
| author | Caroline Madsen <69010899+randomsalience@users.noreply.github.com> | 2025-04-01 22:05:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-01 19:05:30 -0700 |
| commit | e55c504f28caf0815a0bf7ba31c4014dd8d3d849 (patch) | |
| tree | 83510f9cd7889fa10bbdb5d522093c6977a99036 /src/d/d_meter_map.cpp | |
| parent | 9847b2a2787b0db8ce931552fa6d99da21ad0873 (diff) | |
d_camera work (#2369)
* bumpCheck matching
* checkGroundInfo matching
* chaseCamera matching
* lockonCamera attempted
* talktoCamera matching
* subjectCamera, magneCamera matching
* colosseumCamera close, plus various fixes
* towerCamera attempted
* hookshotCamera matching
Diffstat (limited to 'src/d/d_meter_map.cpp')
| -rw-r--r-- | src/d/d_meter_map.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp index ba1f6e6c1c..cb6c0bbb84 100644 --- a/src/d/d_meter_map.cpp +++ b/src/d/d_meter_map.cpp @@ -32,10 +32,9 @@ bool dMeterMap_c::isEnableDispMap() { /* 8020D528-8020D650 207E68 0128+00 3/3 0/0 0/0 .text getMapDispSizeTypeNo__11dMeterMap_cFv */ int dMeterMap_c::getMapDispSizeTypeNo() { int uvar6 = 7; - s32 stayNo = dComIfGp_roomControl_getStayNo(); dStage_FileList_dt_c* fList = - dComIfGp_roomControl_getStatusRoomDt(stayNo)->getFileListInfo(); + dComIfGp_roomControl_getStatusRoomDt(dComIfGp_roomControl_getStayNo())->getFileListInfo(); if (fList != NULL) { uvar6 = dStage_FileList_dt_getMiniMap(fList); } @@ -291,7 +290,7 @@ void dMeterMap_c::_move(u32 param_0) { dMeter2Info_setPauseStatus(2); } } - s32 stayNo = dComIfGp_roomControl_getStayNo(); + int stayNo = dComIfGp_roomControl_getStayNo(); field_0x14 = param_0; field_0x2a = checkMoveStatus(); |