Clean up

Author: FileEX

Client/game_sa/CAutomobileSA.h

@@ -20,7 +20,6 @@
 
 #define MAX_PASSENGER_COUNT     8
 #define MAX_DOORS               6 // also in CDamageManager
-#define CAR_NODES_NUM           25
 
 class CBouncingPanelSAInterface
 {
@@ -38,7 +37,7 @@ class CAutomobileSAInterface : public CVehicleSAInterface
 public:
     CDamageManagerSAInterface m_damageManager;
     CDoorSAInterface          m_doors[MAX_DOORS];
-    RwFrame*                  m_aCarNodes[CAR_NODES_NUM];
+    RwFrame*                  m_aCarNodes[static_cast<std::size_t>(eCarNodes::NUM_NODES)];
     CBouncingPanelSAInterface m_panels[3];
     CDoorSAInterface          m_swingingChassis;
     CColPointSAInterface      m_wheelColPoint[MAX_WHEELS];

Client/game_sa/CBikeSA.h

@@ -14,24 +14,21 @@
 #include <game/CBike.h>
 #include "CVehicleSA.h"
 
-namespace eBikeNodes
+enum class eBikeNodes
 {
-    enum
-    {
-        NONE = 0,
-        CHASIS,
-        FORKS_FRONT,
-        FORKS_REAR,
-        WHEEL_FRONT,
-        WHEEL_REAR,
-        MUDGUARD,
-        HANDLEBARS,
-        MISC_A,
-        MISC_B,
+    NONE = 0,
+    CHASSIS,
+    FORKS_FRONT,
+    FORKS_REAR,
+    WHEEL_FRONT,
+    WHEEL_REAR,
+    MUDGUARD,
+    HANDLEBARS,
+    MISC_A,
+    MISC_B,
 
-        NUM_NODES
-    };
-}
+    NUM_NODES
+};
 
 struct sRideAnimData
 {
@@ -48,7 +45,7 @@ static_assert(sizeof(sRideAnimData) == 0x1C, "Invalid size for sRideAnimData");
 class CBikeSAInterface : public CVehicleSAInterface
 {
 public:
-    RwFrame*             m_apModelNodes[eBikeNodes::NUM_NODES];
+    RwFrame*             m_apModelNodes[static_cast<std::size_t>(eBikeNodes::NUM_NODES)];
     int8                 m_bLeanMatrixCalculated;
     int8                 pad0[3];            // Maybe prev value is int32
     int8                 m_mLeanMatrix[72];

Client/game_sa/CBmxSA.h

@@ -14,24 +14,21 @@
 #include <game/CBmx.h>
 #include "CBikeSA.h"
 
-namespace eBmxNodes
+enum class eBmxNodes
 {
-    enum
-    {
-        NONE = 0,
-        CHASIS,
-        FORKS_FRONT,
-        FORKS_REAR,
-        WHEEL_FRONT,
-        WHEEL_REAR,
-        HANDLEBARS,
-        CHAINSET,
-        PEDAL_R,
-        PEDAL_L,
+    NONE = 0,
+    CHASSIS,
+    FORKS_FRONT,
+    FORKS_REAR,
+    WHEEL_FRONT,
+    WHEEL_REAR,
+    HANDLEBARS,
+    CHAINSET,
+    PEDAL_R,
+    PEDAL_L,
 
-        NUM_NODES
-    };
-}
+    NUM_NODES
+};
 
 class CBmxSAInterface : public CBikeSAInterface
 {

Client/game_sa/CBoatSA.h

@@ -14,33 +14,30 @@
 #include <game/CBoat.h>
 #include "CVehicleSA.h"
 
-namespace eBoatNodes
+enum class eBoatNodes
 {
-    enum
-    {
-        NONE = 0,
-        MOVING,
-        WINDSCREEN,
-        RUDDER,
-        FLAP_LEFT,
-        FLAP_RIGHT,
-        REARFLAP_LEFT,
-        REARFLAP_RIGHT,
-        STATIC_PROP,
-        MOVING_PROP,
-        STATIC_PROP2,
-        MOVING_PROP2,
+    NONE = 0,
+    MOVING,
+    WINDSCREEN,
+    RUDDER,
+    FLAP_LEFT,
+    FLAP_RIGHT,
+    REARFLAP_LEFT,
+    REARFLAP_RIGHT,
+    STATIC_PROP,
+    MOVING_PROP,
+    STATIC_PROP2,
+    MOVING_PROP2,
 
-        NUM_NODES
-    };
-}
+    NUM_NODES
+};
 
 class CBoatSAInterface : public CVehicleSAInterface
 {
 public:
     uint32               pad1[3];                                 // 1440
     uint32               BoatFlags;                               // 1452
-    RwFrame*             pBoatParts[eBoatNodes::NUM_NODES];       // 1456
+    RwFrame*             pBoatParts[static_cast<std::size_t>(eBoatNodes::NUM_NODES)];       // 1456
     uint32               pad2[3];                                 // 1500
     uint16               pad3;                                    // 1512
     uint8                pad4[2];                                 // 1514

Client/game_sa/CTrainSA.h

@@ -14,29 +14,27 @@
 #include "CVehicleSA.h"
 #include "CDoorSA.h"
 
-namespace eTrainNode
+enum class eTrainNodes
 {
-    enum
-    {
-        NONE = 0,
-        DOOR_LF = 1,
-        DOOR_RF = 2,
-        WHEEL_RF1 = 3,
-        WHEEL_RF2 = 4,
-        WHEEL_RF3 = 5,
-        WHEEL_RB1 = 6,
-        WHEEL_RB2 = 7,
-        WHEEL_RB3 = 8,
-        WHEEL_LF1 = 9,
-        WHEEL_LF2 = 10,
-        WHEEL_LF3 = 11,
-        WHEEL_LB1 = 12,
-        WHEEL_LB2 = 13,
-        WHEEL_LB3 = 14,
-        BOGIE_FRONT = 15,
-        BOGIE_REAR = 16,
-        NUM_NODES
-    };
+    NONE = 0,
+    DOOR_LF,
+    DOOR_RF,
+    WHEEL_RF1,
+    WHEEL_RF2,
+    WHEEL_RF3,
+    WHEEL_RB1,
+    WHEEL_RB2,
+    WHEEL_RB3,
+    WHEEL_LF1,
+    WHEEL_LF2,
+    WHEEL_LF3,
+    WHEEL_LB1,
+    WHEEL_LB2,
+    WHEEL_LB3,
+    BOGIE_FRONT,
+    BOGIE_REAR,
+
+    NUM_NODES
 };
 
 enum class eTrainPassengersGenerationState : unsigned char
@@ -101,7 +99,7 @@ class CTrainSAInterface : public CVehicleSAInterface
     CTrainSAInterface*              m_prevCarriage;
     CTrainSAInterface*              m_nextCarriage;
     CDoorSAInterface                m_aDoors[MAX_DOORS];
-    RwFrame*                        m_aTrainNodes[eTrainNode::NUM_NODES];
+    RwFrame*                        m_aTrainNodes[static_cast<std::size_t>(eTrainNodes::NUM_NODES)];
 };
 static_assert(sizeof(CTrainSAInterface) == 0x6AC, "Invalid size for CTrainSAInterface");
 

Client/game_sa/CVehicleSA.cpp

@@ -1502,13 +1502,13 @@ void CVehicleSA::SetGravity(const CVector* pvecGravity)
     m_vecGravity = *pvecGravity;
 }
 
-bool CVehicleSA::SpawnFlyingComponent(eCarNodes nodeIndex, eCarComponentCollisionTypes collisionType, std::int32_t removalTime)
+bool CVehicleSA::SpawnFlyingComponent(const eCarNodes& nodeIndex, const eCarComponentCollisionTypes& collisionType, std::int32_t removalTime)
 {
-    if (nodeIndex < 1)
+    if (nodeIndex == eCarNodes::NONE)
         return false;
 
     DWORD nodesOffset = OFFSET_CAutomobile_Nodes;
-    RwFrame* defaultBikeChassisFrame;
+    RwFrame* defaultBikeChassisFrame = nullptr;
 
     // CBike, CBmx, CBoat and CTrain don't inherit CAutomobile so let's do it manually!
     switch (static_cast<VehicleClass>(GetVehicleInterface()->m_vehicleClass))
@@ -1525,11 +1525,7 @@ bool CVehicleSA::SpawnFlyingComponent(eCarNodes nodeIndex, eCarComponentCollisio
         }
         case VehicleClass::TRAIN:
         {
-            auto* trainInterface = static_cast<CTrainSAInterface*>(GetVehicleInterface());
-            if (!trainInterface)
-                return false;
-
-            if (nodeIndex >= sizeof(trainInterface->m_aTrainNodes) / sizeof(RwFrame*))
+            if (static_cast<eTrainNodes>(nodeIndex) >= eTrainNodes::NUM_NODES)
                 return false;
 
             nodesOffset = OFFSET_CTrain_Nodes;
@@ -1542,30 +1538,26 @@ bool CVehicleSA::SpawnFlyingComponent(eCarNodes nodeIndex, eCarComponentCollisio
             if (!bikeInterface)
                 return false;
 
-            if (nodeIndex >= sizeof(bikeInterface->m_apModelNodes) / sizeof(RwFrame*))
+            if (static_cast<eBikeNodes>(nodeIndex) >= eBikeNodes::NUM_NODES)
                 return false;
 
             nodesOffset = OFFSET_CBike_Nodes;
-            if (nodeIndex != 1)
+            if (static_cast<eBikeNodes>(nodeIndex) != eBikeNodes::CHASSIS)
                 break;
 
             // Set the correct "bike_chassis" frame for bikes
             defaultBikeChassisFrame = bikeInterface->m_apModelNodes[1];
             if (defaultBikeChassisFrame && std::strcmp(defaultBikeChassisFrame->szName, "chassis_dummy") == 0)
             {
-                RwFrame* correctChassisFrame = ((RwFrame * (__cdecl*)(RpClump*, const char*))FUNC_CClumpModelInfo_GetFrameFromName)(bikeInterface->m_pRwObject, "chassis");
+                RwFrame* correctChassisFrame = RwFrameFindFrame(RpGetFrame(bikeInterface->m_pRwObject), "chassis");
                 if (correctChassisFrame)
                     bikeInterface->m_apModelNodes[1] = correctChassisFrame;
             }
             break;
         }
         case VehicleClass::BOAT:
         {
-            auto* boatInterface = static_cast<CBoatSAInterface*>(GetVehicleInterface());
-            if (!boatInterface)
-                return false;
-
-            if (nodeIndex >= sizeof(boatInterface->pBoatParts) / sizeof(RwFrame*))
+            if (static_cast<eBoatNodes>(nodeIndex) >= eBoatNodes::NUM_NODES)
                 return false;
 
             nodesOffset = OFFSET_CBoat_Nodes;
@@ -1579,24 +1571,15 @@ bool CVehicleSA::SpawnFlyingComponent(eCarNodes nodeIndex, eCarComponentCollisio
     MemPut(0x6A85B3, nodesOffset);
     MemPut(0x6A8631, nodesOffset);
 
-    DWORD dwInterface = (DWORD)GetInterface();
-    DWORD dwFunc = FUNC_CAutomobile__SpawnFlyingComponent;
-    DWORD dwReturn;
-    _asm
-    {
-        mov ecx, dwInterface
-        push collisionType
-        push nodeIndex
-        call dwFunc
-        mov dwReturn, eax
-    }
+    auto* componentObject = ((CObjectSAInterface * (__thiscall*)(CVehicleSAInterface*, int, int)) FUNC_CAutomobile__SpawnFlyingComponent)(GetVehicleInterface(), static_cast<int>(nodeIndex), static_cast<int>(collisionType));
 
     // Restore default nodes array in CAutomobile::SpawnFlyingComponent
+    // CAutomobile::m_aCarNodes offset
     MemPut(0x6A85B3, 0x648);
     MemPut(0x6A8631, 0x648);
 
     // Restore default chassis frame for bikes
-    if (nodeIndex == 1 && defaultBikeChassisFrame)
+    if (static_cast<eBikeNodes>(nodeIndex) == eBikeNodes::CHASSIS && defaultBikeChassisFrame)
     {
         auto* bikeInterface = static_cast<CBikeSAInterface*>(GetVehicleInterface());
         if (bikeInterface && bikeInterface->m_apModelNodes)
@@ -1606,11 +1589,7 @@ bool CVehicleSA::SpawnFlyingComponent(eCarNodes nodeIndex, eCarComponentCollisio
     if (removalTime <= -1)
         return true;
 
-    auto* componentObject = reinterpret_cast<CObjectSAInterface*>((DWORD*)dwReturn);
-    if (!componentObject)
-        return;
-
-    int CTimer_ms = *(int*)0xB7CB84; // CTimer::m_snTimeInMilliseconds
+    std::uint32_t CTimer_ms = *reinterpret_cast<std::uint32_t*>(VAR_CTimer_snTimeInMilliseconds);
     componentObject->uiObjectRemovalTime = CTimer_ms + static_cast<std::uint32_t>(removalTime);
 
     return true;
@@ -1623,16 +1602,16 @@ void CVehicleSA::SetWheelVisibility(eWheelPosition wheel, bool bVisible)
     switch (wheel)
     {
         case FRONT_LEFT_WHEEL:
-            pFrame = vehicle->m_aCarNodes[CAR_NODE_WHEEL_LF];
+            pFrame = vehicle->m_aCarNodes[static_cast<std::size_t>(eCarNodes::WHEEL_LF)];
             break;
         case REAR_LEFT_WHEEL:
-            pFrame = vehicle->m_aCarNodes[CAR_NODE_WHEEL_LB];
+            pFrame = vehicle->m_aCarNodes[static_cast<std::size_t>(eCarNodes::WHEEL_LB)];
             break;
         case FRONT_RIGHT_WHEEL:
-            pFrame = vehicle->m_aCarNodes[CAR_NODE_WHEEL_RF];
+            pFrame = vehicle->m_aCarNodes[static_cast<std::size_t>(eCarNodes::WHEEL_RF)];
             break;
         case REAR_RIGHT_WHEEL:
-            pFrame = vehicle->m_aCarNodes[CAR_NODE_WHEEL_RB];
+            pFrame = vehicle->m_aCarNodes[static_cast<std::size_t>(eCarNodes::WHEEL_RB)];
             break;
         default:
             break;

Client/game_sa/CVehicleSA.h

@@ -106,6 +106,8 @@ struct RwTexture;
 #define OFFSET_CBike_Nodes 0x5A0
 #define OFFSET_CBoat_Nodes 0x5B0
 
+#define VAR_CTimer_snTimeInMilliseconds 0xB7CB84
+
 struct SRailNodeSA
 {
     short sX;                       // x coordinate times 8
@@ -616,7 +618,7 @@ class CVehicleSA : public virtual CVehicle, public virtual CPhysicalSA
     SharedUtil::SColor GetHeadLightColor() { return m_HeadLightColor; }
     void               SetHeadLightColor(const SharedUtil::SColor color) { m_HeadLightColor = color; }
 
-    bool     SpawnFlyingComponent(eCarNodes nodeIndex, eCarComponentCollisionTypes collisionType, std::int32_t removalTime = -1);
+    bool     SpawnFlyingComponent(const eCarNodes& nodeIndex, const eCarComponentCollisionTypes& collisionType, std::int32_t removalTime = -1);
     void     SetWheelVisibility(eWheelPosition wheel, bool bVisible);
     CVector  GetWheelPosition(eWheelPosition wheel);