Review

Author: FileEX

Client/game_sa/CModelInfoSA.h

@@ -232,6 +232,11 @@ class CBaseModelInfoSAInterface
     // +726 = Word array as referenced in CVehicleModelInfo::GetVehicleUpgrade(int)
     // +762 = Array of WORD containing something relative to paintjobs
     // +772 = Anim file index
+
+    void Shutdown()
+    {
+        ((void(*)())VFTBL->Shutdown)();
+    }
 };
 static_assert(sizeof(CBaseModelInfoSAInterface) == 0x20, "Invalid size for CBaseModelInfoSAInterface");
 
@@ -278,30 +283,31 @@ class CVehicleModelVisualInfoSAInterface            // Not sure about this name.
     int                          m_maskComponentDamagable;
 };
 
-class CVehicleModelInfoSAInterface : public CBaseModelInfoSAInterface
+class CVehicleModelInfoSAInterface : public CClumpModelInfoSAInterface
 {
 public:
-    uint32                              pad1;                      // +32
-    RpMaterial*                         pPlateMaterial;            // +36
+    RpMaterial*                         pPlateMaterial;
     char                                plateText[8];
-    char                                pad[2];
+    std::uint8_t                        field_30;
+    std::uint8_t                        plateType;
     char                                gameName[8];
-    char                                pad2[2];
-    unsigned int                        uiVehicleType;
+    std::uint8_t                        field_3A[2];
+    std::uint32_t                       vehicleType;
     float                               fWheelSizeFront;
     float                               fWheelSizeRear;
-    short                               sWheelModel;
-    short                               sHandlingID;
-    byte                                ucNumDoors;
-    byte                                ucVehicleList;
-    byte                                ucVehicleFlags;
-    byte                                ucWheelUpgradeClass;
-    byte                                ucTimesUsed;
-    short                               sVehFrequency;
-    unsigned int                        uiComponentRules;
-    float                               fSteeringAngle;
-    CVehicleModelVisualInfoSAInterface* pVisualInfo;            // +92
-    char                                pad3[464];
+    std::int16_t                        wheelModelID;
+    std::int16_t                        handlingID;
+    std::uint8_t                        numDoors;
+    std::uint8_t                        vehicleClass;
+    std::uint8_t                        vehicleFlags;
+    std::uint8_t                        wheelUpgradeClass;
+    std::uint8_t                        timesUsed;
+    std::uint8_t                        field_51;
+    std::int16_t                        vehFrequency;
+    std::uint32_t                       componentRules;
+    float                               bikeSteeringAngle;
+    CVehicleModelVisualInfoSAInterface* pVisualInfo;            // vehicleStruct
+    std::uint8_t                        field_60[464];
 
     union
     {
@@ -311,24 +317,22 @@ class CVehicleModelInfoSAInterface : public CBaseModelInfoSAInterface
             size_t       m_numDirtMaterials;
             RpMaterial*  m_staticDirtMaterials[30];
         };
-        RpMaterial* pDirtMaterial[32];
     };
 
-    char                                pad4[64];
-    char                                primColors[8];
-    char                                secondColors[8];
-    char                                treeColors[8];
-    char                                fourColors[8];
-    unsigned char                       ucNumOfColorVariations;
-    unsigned char                       ucLastColorVariation;
-    unsigned char                       ucPrimColor;
-    unsigned char                       ucSecColor;
-    unsigned char                       ucTertColor;
-    unsigned char                       ucQuatColor;
-    char                                upgrades[36];
-    char                                anRemapTXDs[8];
-    char                                pad5[2];
-    char                                pAnimBlock[4];
+    std::uint8_t primColors[8];
+    std::uint8_t secondColors[8];
+    std::uint8_t treeColors[8];
+    std::uint8_t fourColors[8];
+    std::uint8_t numOfColorVariations;
+    std::uint8_t lastColorVariation;
+    std::uint8_t primColor;
+    std::uint8_t secColor;
+    std::uint8_t tertColor;
+    std::uint8_t quatColor;
+    std::uint8_t upgrades[36];
+    std::uint8_t anRemapTXDs[8];
+    std::uint8_t field_302[2];
+    void*        pAnimBlock;            // CAnimBlock*
 };
 
 class CModelInfoSA : public CModelInfo

Client/multiplayer_sa/CMultiplayerSA_Vehicles.cpp

@@ -11,7 +11,6 @@
 #include "StdInc.h"
 #include "..\game_sa\gamesa_renderware.h"
 
-#define FUNC_CVehicleModelInfo_ResetColors 0x4C8490
 #define FUNC_CBaseModelInfo_Shutdown       0x4C4D50
 #define IN_PLACE_BUFFER_DIRT_SIZE          30
 
@@ -114,18 +113,12 @@ static void _declspec(naked) HOOK_CAEVehicleAudioEntity__Initialise()
     }
 }
 
-static void CVehicleModelInfo_Shutdown()
+static void __fastcall CVehicleModelInfo_Shutdown(CVehicleModelInfoSAInterface* mi)
 {
-    CVehicleModelInfoSAInterface* mi = nullptr;
-    _asm
-    {
-        mov mi, ecx
-    }
-
     if (!mi)
         return;
 
-    ((void(__cdecl*)(void*))FUNC_CBaseModelInfo_Shutdown)(mi);
+    mi->Shutdown();
 
     delete[] mi->m_dirtMaterials;
     mi->m_dirtMaterials = nullptr;
@@ -145,12 +138,10 @@ static void _declspec(naked) HOOK_CVehicleModelInfo_SetDirtTextures()
 {
     _asm
     {
-        pushad
         push ebx
         push esi
         call SetDirtTextures
         add esp, 8
-        popad
 
         jmp CONTINUE_CVehicleModelInfo_SetDirtTextures
     }
@@ -195,7 +186,10 @@ static void __fastcall FindEditableMaterialList(CVehicleModelInfoSAInterface* mi
         std::copy(list.begin(), list.end(), mi->m_staticDirtMaterials);
     }
 
-    ((void(__thiscall*)(CVehicleModelInfoSAInterface*))FUNC_CVehicleModelInfo_ResetColors)(mi);
+    mi->primColor = 255;
+    mi->secColor = 255;
+    mi->tertColor = 255;
+    mi->quatColor = 255;
 }
 
 #define HOOKPOS_CVehicleModelInfo_SetClump 0x4C9648
@@ -205,9 +199,9 @@ static void _declspec(naked) HOOK_CVehicleModelInfo_SetClump()
 {
     _asm
     {
-        pushad
+        push ecx
         call FindEditableMaterialList
-        popad
+        pop ecx
 
         jmp CONTINUE_CVehicleModelInfo_SetClump
     }