From 8903a37e8b62125447b1c985a314a6742261d344 Mon Sep 17 00:00:00 2001 From: gromchek Date: Sun, 7 Sep 2025 13:32:50 +0300 Subject: [PATCH] feat(profile): fix types --- .../3.3.5a-windows-386/include/map/CMapArea.h | 2 +- .../3.3.5a-windows-386/include/map/CMapObj.h | 192 +++++++++--------- 2 files changed, 97 insertions(+), 97 deletions(-) diff --git a/profile/3.3.5a-windows-386/include/map/CMapArea.h b/profile/3.3.5a-windows-386/include/map/CMapArea.h index a2db346..57ee8b7 100644 --- a/profile/3.3.5a-windows-386/include/map/CMapArea.h +++ b/profile/3.3.5a-windows-386/include/map/CMapArea.h @@ -70,7 +70,7 @@ struct CMapArea int32_t* textureFlags; uint8_t* unk_B8; //MH20 - CMapChunk mapChunks[256]; + CMapChunk* mapChunks[256]; }; struct CMapChunk diff --git a/profile/3.3.5a-windows-386/include/map/CMapObj.h b/profile/3.3.5a-windows-386/include/map/CMapObj.h index bace827..0a21b27 100644 --- a/profile/3.3.5a-windows-386/include/map/CMapObj.h +++ b/profile/3.3.5a-windows-386/include/map/CMapObj.h @@ -13,13 +13,13 @@ struct CMapObjGroup; struct CMapObj { - int objectIndex; - int unk_04; - int unk_08; - int unk_0C; - int unk_10; - int unk_14; - int unk_18; + int32_t objectIndex; + int32_t unk_04; + int32_t unk_08; + int32_t unk_0C; + int32_t unk_10; + int32_t unk_14; + int32_t unk_18; char m_wmoName[260]; SMOHeader *header; char* textureNameList; @@ -38,139 +38,139 @@ struct CMapObj SMOFog* fogList; C4Plane* convexVolumePlanes; SMOMaterial* materialList; - int texturesSize; - int groupNameSize; - int groupInfoCount; - int planeVertCount; - int portalsCount; - int portalRefCount; - int visBlockVertCount; - int visBlockCount; - int ligtsCount; - int doodadSetCount; - int doodadNameSize; - int doodadDefCount; - int fogsCount; - int convexVolumePlaneCount; - int materialsCount; + int32_t texturesSize; + int32_t groupNameSize; + int32_t groupInfoCount; + int32_t planeVertCount; + int32_t portalsCount; + int32_t portalRefCount; + int32_t visBlockVertCount; + int32_t visBlockCount; + int32_t ligtsCount; + int32_t doodadSetCount; + int32_t doodadNameSize; + int32_t doodadDefCount; + int32_t fogsCount; + int32_t convexVolumePlaneCount; + int32_t materialsCount; uint32_t argb_color; - int unk_1A4; + int32_t unk_1A4; CAaBox bbox; float distToCamera; - int unk_1C4; - int unk_1C8; + int32_t unk_1C4; + int32_t unk_1C8; void* pWmoData; - int wmoFileSize; - int refCount; + int32_t wmoFileSize; + int32_t refCount; float flushTimer; CAsyncObject* asyncObject; - int isGroupLoaded; - int unk_1E4; - int TSExplicitList__m_linkOffset; + int32_t isGroupLoaded; + int32_t unk_1E4; + int32_t TSExplicitList__m_linkOffset; void* TSExplicitList__ptr1; void* TSExplicitList__ptr2; - int mapObjGroupCount; + int32_t mapObjGroupCount; CMapObjGroup* mapObjGroupArray[512]; }; struct CMapObjGroup { - int objectIndex; - int unk_04; - int unk_08; - int unk_0C; - int unk_10; - int unk_14; + int32_t objectIndex; + int32_t unk_04; + int32_t unk_08; + int32_t unk_0C; + int32_t unk_10; + int32_t unk_14; float timer; - int unk_1C; - int unk_20; - int unk_24; - int unk_28; - int unk_2C; - int flags; + int32_t unk_1C; + int32_t unk_20; + int32_t unk_24; + int32_t unk_28; + int32_t unk_2C; + int32_t flags; CAaBox bbox; float distToCamera; - int portalStart; - int portalCount; - int fogs; + int32_t portalStart; + int32_t portalCount; + int32_t fogs; uint16_t transparencyBatchesCount; uint16_t intBatchCount; - int extBatchCount; + int32_t extBatchCount; void* CAaBspNodePtr; void* CAaBspNodePtr; uint16_t* nodeFaceIndices; - int bspNodesCount; - int nodeFaceIndicesCount; - int unk_7C; - int unk_80; - int unk_84; - int unk_88; - int unk_8C; - int unk_90; - int unk_94; - int unk_98; - int unk_9C; - int unk_A0; - int unk_A4; - int unk_A8; - int unk_AC; - int unk_B0; + int32_t bspNodesCount; + int32_t nodeFaceIndicesCount; + int32_t unk_7C; + int32_t unk_80; + int32_t unk_84; + int32_t unk_88; + int32_t unk_8C; + int32_t unk_90; + int32_t unk_94; + int32_t unk_98; + int32_t unk_9C; + int32_t unk_A0; + int32_t unk_A4; + int32_t unk_A8; + int32_t unk_AC; + int32_t unk_B0; CAaBox bbox2; - int unk_CC; - int unkFlags; - int unk_D4; - int unk_D8; + int32_t unk_CC; + int32_t unkFlags; + int32_t unk_D4; + int32_t unk_D8; char* groupName; SMOPoly* polyList; uint16_t* indices; - int unk_E8; + int32_t unk_E8; C3Vector* vertexList; C3Vector* normalList; C2Vector* textureVertexList; - int unk_F8; + int32_t unk_F8; SMOBatch* batchList; - int unk_100; - int unk_104; + int32_t unk_100; + int32_t unk_104; uint16_t* doodadRefList; CImVector* colorVertexList; CImVector* colorVertexListExtra; - int unk_114; + int32_t unk_114; C2iVector liquidVerts; C2iVector liquidTiles; C3Vector liquidCorner; - int luquidMaterialId; + int32_t luquidMaterialId; SMOLiquidVert* liquidVertexList; SMOLTile* liquidTileList; float liquidHeight; - int unk_144; - int unk_148; - int unkFlag; - int unk_150; - int polyListSize; - int indicesCount; - int unk_15C; - int vertexListCount; - int normalListCount; - int textureVertexListCount; - int unk_16C; - int batchListCount; - int unk_174; - int doodadRefListCount; - int colorVertexListSize; - int colorVertexListExtraSize; + int32_t unk_144; + int32_t unk_148; + int32_t unkFlag; + int32_t unk_150; + int32_t polyListSize; + int32_t indicesCount; + int32_t unk_15C; + int32_t vertexListCount; + int32_t normalListCount; + int32_t textureVertexListCount; + int32_t unk_16C; + int32_t batchListCount; + int32_t unk_174; + int32_t doodadRefListCount; + int32_t colorVertexListSize; + int32_t colorVertexListExtraSize; - int wmoGroupId; + int32_t wmoGroupId; void* filePtr; - int fileSize; + int32_t fileSize; CMapObj* parent; - int unk_194; + int32_t unk_194; CAsyncObject* asyncObjPtr; - int unkLoadedFlag; - int unkIndexMin1; - int unkIndexMax1; + int32_t unkLoadedFlag; + int32_t unkIndexMin1; + int32_t unkIndexMax1; uint16_t unkIndexMin2; uint16_t unkIndexMax2; - int TSExplicitList__m_linkoffset; + int32_t TSExplicitList__m_linkoffset; void* TSExplicitList__ptr; void* TSExplicitList__ptr2; CMapObjGroup* perv;