Cleanup

Author: yaz0r

AzelLib/LCS.cpp

@@ -1,4 +1,5 @@
 #include "PDS.h"
+#include "items.h"
 
 p_workArea createLCSSelectedTask(s_LCSTask* r4, sLCSTarget* r5);
 void DrawLCSTarget(s_LCSTask* r14, sVec2_S16* r5, s32 r6);
@@ -27,7 +28,7 @@ void LCSTaskDrawSub1Sub2Sub6(void*)
     PDS_unimplemented("LCSTaskDrawSub1Sub2Sub6");
 }
 
-void createLCSTarget(sLCSTarget* r4, s_workArea* r5, void (*r6)(p_workArea, sLCSTarget*), const sVec3_FP* r7, const sVec3_FP* optionalRotation, s16 flags, s16 argA, s16 receivedItemId, s32 receivedItemQuantity, s32 arg14)
+void createLCSTarget(sLCSTarget* r4, s_workArea* r5, void (*r6)(p_workArea, sLCSTarget*), const sVec3_FP* r7, const sVec3_FP* optionalRotation, s16 flags, s16 argA, eItems receivedItemId, s32 receivedItemQuantity, s32 arg14)
 {
     r4->m0 = r5;
     r4->m4_callback = r6;
@@ -792,54 +793,19 @@ s32 LCSTaskDrawSub1Sub2Sub2(s_LCSTask* r4)
     return 1;
 }
 
-sObjectListEntry* getObjectListEntry(s32 entry)
-{
-    static std::unordered_map<s32, sObjectListEntry*> cache;
-
-    std::unordered_map<s32, sObjectListEntry*>::iterator cacheEntry = cache.find(entry);
-    if (cacheEntry != cache.end())
-    {
-        return cacheEntry->second;
-    }
-
-    sSaturnPtr EA = gCommonFile.getSaturnPtr(0x20C3F4);
-    EA += 3 * 4 * entry;
-
-    sObjectListEntry* pNewObjectEntry = new sObjectListEntry;
-
-    pNewObjectEntry->m0 = readSaturnS8(EA + 0);
-    pNewObjectEntry->m1 = readSaturnS8(EA + 1);
-    pNewObjectEntry->m2 = readSaturnS8(EA + 2);
-    pNewObjectEntry->m3 = readSaturnS8(EA + 3);
-    pNewObjectEntry->m4_name = readSaturnString(readSaturnEA(EA + 4));
-    pNewObjectEntry->m8_description = readSaturnString(readSaturnEA(EA + 8));
-
-    cache.insert_or_assign(entry, pNewObjectEntry);
-
-    return pNewObjectEntry;
-}
-
-s32 getObjectIcon(s32 objectID)
-{
-    sObjectListEntry* pObject = getObjectListEntry(objectID);
-
-    static const std::array<s32, 10> objectTypeLookupTable =
-    { 0,1,2,3,4,5,6,7,8,9 };
-
-    return objectTypeLookupTable[pObject->m1];
-}
-
 static const std::array<s8, 10> LCSTaskDrawSub1Sub2Sub0Sub1Sub0Sub0Data1 =
 {
     2,1,0,2,1,0,2,1,0,3
 };
 
 s8 LCSTaskDrawSub1Sub2Sub0Sub1Sub0Sub0(sLCSTarget* r4)
 {
-    if (r4->m14_receivedItemId < 0)
-        return r4->m14_receivedItemId;
+    if (r4->m14_receivedItemId > -1)
+    {
+        return LCSTaskDrawSub1Sub2Sub0Sub1Sub0Sub0Data1[getObjectListEntry(r4->m14_receivedItemId)->m1_type];
+    }
 
-    return LCSTaskDrawSub1Sub2Sub0Sub1Sub0Sub0Data1[getObjectListEntry(r4->m14_receivedItemId)->m1];
+    return r4->m14_receivedItemId;
 }
 
 void LCSTaskDrawSub1Sub2Sub0Sub1Sub0(s_LCSTask* r4, sLCSTarget* r5, s32 r6)

AzelLib/LCS.h

@@ -35,7 +35,7 @@ struct sLCSTarget
     const sVec3_FP* mC_optionalRotation;
     s16 m10_flags;
     s16 m12;
-    s16 m14_receivedItemId;
+    eItems m14_receivedItemId;
     s8 m16_receivedItemQuantity;
     s8 m17;
     s8 m18_diableFlags; // 1: disabled, 4: not visible/facing away?
@@ -141,7 +141,7 @@ struct s_LCSTask340Sub : public s_workAreaTemplateWithArg<s_LCSTask340Sub, sLase
     sVec3_FP* m18;
     sLCSTarget* m1C;
     struct s_LCSTask340* m20;
-    s16 m24_receivedItemId;
+    eItems m24_receivedItemId;
     s8 m26_receivedItemQuantity;
     s8 m27;
     void (*m28_laserInit)(s_LCSTask340Sub*);
@@ -269,20 +269,7 @@ struct sLCSSelected : public s_workAreaTemplate<sLCSSelected>
     //size 0x30
 };
 
-struct sObjectListEntry
-{
-    s8 m0;
-    s8 m1;
-    s8 m2;
-    s8 m3;
-    std::string m4_name;
-    std::string m8_description;
-};
-
-sObjectListEntry* getObjectListEntry(s32 entry);
-s32 getObjectIcon(s32 objectID);
-
-void createLCSTarget(sLCSTarget* r4, s_workArea* r5, void (*r6)(p_workArea, sLCSTarget*), const sVec3_FP* r7, const sVec3_FP* arg0, s16 flags, s16 argA, s16 receivedItemId, s32 receivedItemQuantity, s32 arg14);
+void createLCSTarget(sLCSTarget* r4, s_workArea* r5, void (*r6)(p_workArea, sLCSTarget*), const sVec3_FP* r7, const sVec3_FP* arg0, s16 flags, s16 argA, eItems receivedItemId, s32 receivedItemQuantity, s32 arg14);
 void updateLCSTarget(sLCSTarget* r14);
 void LCSTaskDrawSub();
 void allocateLCSEntry(s_visibilityGridWorkArea* r4, sProcessed3dModel* r5, fixedPoint r6);

AzelLib/battle/BTL_A3/BTL_A3_map6.cpp

@@ -682,7 +682,6 @@ void BTL_A3_Env_DrawSub8(s_BTL_A3_Env* pThis)
     sVec3_FP cameraRotation = pThis->m18_cameraRotation;
     if (pThis->m18_cameraRotation[0] == 0)
     {
-        assert(0);
         cameraRotation[0] = -0x12345; // was that a debug piece of code left over?
     }