From b1381add583cb995bf2c3c9ba577cfc61f1a2eb5 Mon Sep 17 00:00:00 2001
From: CovenEsme <84377742+CovenEsme@users.noreply.github.com>
Date: Tue, 27 May 2025 15:50:39 +0100
Subject: [PATCH] Improve dAcOdistantShip_c::create

---
 src/REL/d/a/obj/d_a_obj_distant_ship.cpp | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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 b30fde1e..6ca6c8ef 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
@@ -17,15 +17,11 @@ bool dAcOdistantShip_c::createHeap() {
 }
 
 int dAcOdistantShip_c::create() {
-    // Sure, why not
-    // Scratch for anyone who wants to look for a better solution:
-    // https://decomp.me/scratch/0qPPj
     mIsVisible = false;
-    u32 p = params;
-    u16 r = getRoomId();
-    mSubtype = (p >> 8) & 0xF;
+    u8 flag = getFromParams(0, 0xFF);
+    mSubtype = getFromParams(8, 0xF);
 
-    if (SceneflagManager::sInstance->checkBoolFlag(r, p & 0xFF)) {
+    if (SceneflagManager::sInstance->checkBoolFlag(roomid, flag)) {
         mIsVisible = true;
     }