Fix conflicts

Author: TheNormalnij

Client/game_sa/CBuildingSA.cpp

@@ -74,9 +74,9 @@ void CBuildingSA::AllocateMatrix()
 {
     auto* newMatrix = g_matrixPool.AllocateItem();
     std::memset(newMatrix, 0, sizeof(CMatrixLinkSAInterface));
-    newMatrix->SetTranslateOnly(m_pInterface->Placeable.m_transform.m_translate);
+    newMatrix->SetTranslateOnly(m_pInterface->m_transform.m_translate);
 
-    m_pInterface->Placeable.matrix = reinterpret_cast<CMatrix_Padded*>(newMatrix);
+    m_pInterface->matrix = reinterpret_cast<CMatrix_Padded*>(newMatrix);
 }
 
 void CBuildingSA::ReallocateMatrix()
@@ -85,26 +85,26 @@ void CBuildingSA::ReallocateMatrix()
         return;
 
     auto* newMatrix = g_matrixPool.AllocateItem();
-    std::memcpy(newMatrix, m_pInterface->Placeable.matrix, sizeof(CMatrixLinkSAInterface));
+    std::memcpy(newMatrix, m_pInterface->matrix, sizeof(CMatrixLinkSAInterface));
     newMatrix->m_pOwner = nullptr;
     newMatrix->m_pPrev = nullptr;
     newMatrix->m_pNext = nullptr;
 
     m_pInterface->RemoveMatrix();
-    m_pInterface->Placeable.matrix = reinterpret_cast<CMatrix_Padded*>(newMatrix);
+    m_pInterface->matrix = reinterpret_cast<CMatrix_Padded*>(newMatrix);
 }
 
 void CBuildingSA::RemoveAllocatedMatrix()
 {
     if (!m_pInterface->HasMatrix())
         return;
 
-    CMatrixLinkSAInterface* pMatrix = reinterpret_cast<CMatrixLinkSAInterface*>(m_pInterface->Placeable.matrix);
+    CMatrixLinkSAInterface* pMatrix = reinterpret_cast<CMatrixLinkSAInterface*>(m_pInterface->matrix);
 
     if (pMatrix->m_pOwner || (pMatrix->m_pNext && pMatrix->m_pPrev))
         return;
 
-    g_matrixPool.RemoveItem(reinterpret_cast<CMatrixLinkSAInterface*>(m_pInterface->Placeable.matrix));
+    g_matrixPool.RemoveItem(reinterpret_cast<CMatrixLinkSAInterface*>(m_pInterface->matrix));
     g_matrixPool.SetCapacity(0);
-    m_pInterface->Placeable.matrix = nullptr;
+    m_pInterface->matrix = nullptr;
 }

Client/game_sa/CDummyPoolSA.cpp

@@ -43,7 +43,7 @@ void CDummyPoolSA::RemoveAllWithBackup()
             pDummyPool->Release(i);
 
             (*m_pOriginalElementsBackup)[i].first = true;
-            (*m_pOriginalElementsBackup)[i].second = *building;
+            std::memcpy((*m_pOriginalElementsBackup)[i].second, building, sizeof(CEntitySAInterface));
         }
         else
         {
@@ -63,9 +63,9 @@ void CDummyPoolSA::RestoreBackup()
     {
         if (originalData[i].first)
         {
-            pDummyPool->AllocateAt(i);
+            pDummyPool->AllocateAtNoInit(i);
             auto pDummy = pDummyPool->GetObject(i);
-            *pDummy = originalData[i].second;
+            std::memcpy(pDummy, &originalData[i].second, sizeof(CEntitySAInterface));
 
             pGame->GetWorld()->Add(pDummy, CDummyPool_Constructor);
         }
@@ -88,7 +88,7 @@ void CDummyPoolSA::UpdateBackupLodOffset(const std::uint32_t offset)
     {
         if (it.first)
         {
-            CEntitySAInterface* object = &it.second;
+            CEntitySAInterface* object = reinterpret_cast<CEntitySAInterface*>(&it.second);
             CEntitySAInterface* lod = object->GetLod();
             if (lod)
                 object->SetLod((CEntitySAInterface*)((std::uint32_t)lod + offset));

Client/game_sa/CDummyPoolSA.h

@@ -35,6 +35,7 @@ class CDummyPoolSA final : public CDummyPool
 private:
     CPoolSAInterface<CEntitySAInterface>**  m_ppDummyPoolInterface;
 
-    using pool_backup_t = std::array<std::pair<bool, CEntitySAInterface>, MAX_DUMMIES_DEFAULT>;
+    using building_buffer_t = std::uint8_t[sizeof(CEntitySAInterface)];
+    using pool_backup_t = std::array<std::pair<bool, building_buffer_t>, MAX_DUMMIES_DEFAULT>;
     std::unique_ptr<pool_backup_t> m_pOriginalElementsBackup;
 };

Client/game_sa/CEntitySA.h

@@ -219,20 +219,11 @@ class CEntitySAInterface : public CPlaceableSAInterface
         ((CStencilShadow_dtorByOwner)0x711730)(this);
     };
 
-    void SetOrientation(float x, float y, float z) {
-        using CPlacetable_SetOrientation = void(__thiscall*)(CEntitySAInterface * pEntity, float, float, float);
-        ((CPlacetable_SetOrientation)0x439A80)(this, x, y, z);
-    }
-
     void RemoveRWObjectWithReferencesCleanup() {
         DeleteRwObject();
         ResolveReferences();
         RemoveShadows();
     }
-
-    bool HasMatrix() const noexcept { return Placeable.matrix != nullptr; }
-
-    void RemoveMatrix() { ((void(__thiscall*)(void*))0x54F3B0)(this); }
 };
 
 static_assert(sizeof(CEntitySAInterface) == 0x38, "Invalid size for CEntitySAInterface");

Client/game_sa/CPlaceableSA.h

@@ -29,6 +29,8 @@ class CPlaceableSAInterface
     bool HasMatrix() const noexcept { return matrix != nullptr; }
     void RemoveMatrix() { ((void(__thiscall*)(void*))0x54F3B0)(this); }
 
+    void SetOrientation(float x, float y, float z) { ((void(__thiscall*)(CPlaceableSAInterface * pEntity, float, float, float))0x439A80)(this, x, y, z); }
+
 public:
     CSimpleTransformSAInterface m_transform;
     CMatrix_Padded*             matrix;            // This is actually XYZ*, change later

Client/game_sa/CWorldSA.cpp

@@ -536,8 +536,8 @@ CEntity* CWorldSA::TestSphereAgainstWorld(const CVector& sphereCenter, float rad
 
     result.collisionDetected = true;
     result.modelID = entity->m_nModelIndex;
-    result.entityPosition = entity->Placeable.matrix->vPos;
-    ConvertMatrixToEulerAngles(*entity->Placeable.matrix, result.entityRotation.fX, result.entityRotation.fY, result.entityRotation.fZ);
+    result.entityPosition = entity->matrix->vPos;
+    ConvertMatrixToEulerAngles(*entity->matrix, result.entityRotation.fX, result.entityRotation.fY, result.entityRotation.fZ);
     result.entityRotation = -result.entityRotation;
     result.lodID = entity->m_pLod ? entity->m_pLod->m_nModelIndex : 0;
     result.type = static_cast<eEntityType>(entity->nType);