diff --git a/include/f/f_base.h b/include/f/f_base.h index 34bc8bec..34ecfa13 100644 --- a/include/f/f_base.h +++ b/include/f/f_base.h @@ -90,7 +90,7 @@ public: group_type = m_tmpCtData.group_type; } - inline u32 getFromParams(u8 shift, u32 mask) { + u32 getFromParams(u8 shift, u32 mask) { return (params >> shift) & mask; } diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index 2c8bf662..6d7e8870 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -20,11 +20,10 @@ int dAcOdistantShip_c::create() { // Sure, why not mIsVisible = false; u32 p = params; - u16 r = (s32)roomid; + u16 r = getRoomId(); mSubtype = (p >> 8) & 0xF; - bool flag = SceneflagManager::sInstance->checkFlag(r, p & 0xFF); - if (flag) { + if (SceneflagManager::sInstance->checkBoolFlag(r, p & 0xFF)) { mIsVisible = true; }