From e55c504f28caf0815a0bf7ba31c4014dd8d3d849 Mon Sep 17 00:00:00 2001
From: Caroline Madsen <69010899+randomsalience@users.noreply.github.com>
Date: Tue, 1 Apr 2025 22:05:30 -0400
Subject: 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
---
 src/d/d_map_path_fmap.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/d/d_map_path_fmap.cpp')

diff --git a/src/d/d_map_path_fmap.cpp b/src/d/d_map_path_fmap.cpp
index 9820d68ccf..c95c1c7869 100644
--- a/src/d/d_map_path_fmap.cpp
+++ b/src/d/d_map_path_fmap.cpp
@@ -569,17 +569,15 @@ bool dMenuFmapIconDisp_c::getPosition(int* o_stageNo, int* o_roomNo, f32* o_posX
  */
 // NONMATCHING regalloc
 bool dMenuFmapIconDisp_c::isDrawDisp() {
-    bool ret;
-
     dMenu_Fmap_stage_arc_data_c* stage_arc = mpStageData->getStageArc();
     if (stage_arc == NULL) {
         return false;
     }
 
     u8 save_table_no = stage_arc->getSaveTableNo();
-    int room_no = mpRoomData->getRoomNo();
+    s32 room_no = mpRoomData->getRoomNo();
     bool bVar2 = (mStayStageNo == mStageNo && mStayRoomNo == room_no) || mpRoomData->isArrival();
-    ret = false;
+    bool ret = false;
     bool bVar1;
 
     switch (mTypeGroupNo) {
@@ -633,11 +631,9 @@ bool dMenuFmapIconDisp_c::isDrawDisp() {
 
     case 6:
         if (save_table_no == mSaveTbl) {
-            ret = dComIfGs_isSwitch(mpTresData->mSwBit, room_no) ? true : false;
-        } else {
-            if (mpTresData->mSwBit < 0x80) {
-                ret = dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit) ? true : false;
-            }
+            ret = dComIfGs_isSwitch(mpTresData->mSwBit, room_no) != FALSE;
+        } else if (mpTresData->mSwBit < 0x80) {
+            ret = dComIfGs_isStageSwitch(save_table_no, mpTresData->mSwBit) != FALSE;
         }
         break;
 
-- 
cgit v1.2.3