Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix class hierarchy. Remove VTBL hacks #3766

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix class hierarchy. Remove VTBL hacks #3766

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1ba1bc0
First draw
TheNormalnij Sep 29, 2024
56fce1d
Fix camera class definitions
TheNormalnij Sep 30, 2024
2d0b7a4
Fix methods declaration
TheNormalnij Oct 1, 2024
a72a16f
use constexpr
TheNormalnij Oct 2, 2024
ce6b190
Merge remote-tracking branch 'mta_main/master' into TheNormalnij/remo…
TheNormalnij Oct 3, 2024
4f5aae1
Fix IsUsesEntityDeleteRwObject
TheNormalnij Oct 3, 2024
ae60251
Fix doors
TheNormalnij Oct 3, 2024
dd0d38f
Merge remote-tracking branch 'mta_main/master' into TheNormalnij/remo…
TheNormalnij Oct 26, 2024
0d55a24
Small fixes
TheNormalnij Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 48 additions & 48 deletions Client/game_sa/CBuildingRemovalSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ void CBuildingRemovalSA::RemoveBuilding(uint16_t usModelToRemove, float fRange,
if (pFind->m_iCount <= 0 && pFind->m_pInterface)
{
// Grab distances across each axis
float fDistanceX = fX - pFind->m_pInterface->Placeable.m_transform.m_translate.fX;
float fDistanceY = fY - pFind->m_pInterface->Placeable.m_transform.m_translate.fY;
float fDistanceZ = fZ - pFind->m_pInterface->Placeable.m_transform.m_translate.fZ;
float fDistanceX = fX - pFind->m_pInterface->m_transform.m_translate.fX;
float fDistanceY = fY - pFind->m_pInterface->m_transform.m_translate.fY;
float fDistanceZ = fZ - pFind->m_pInterface->m_transform.m_translate.fZ;

if (pFind->m_pInterface->Placeable.matrix != NULL)
if (pFind->m_pInterface->matrix != NULL)
{
fDistanceX = fX - pFind->m_pInterface->Placeable.matrix->vPos.fX;
fDistanceY = fY - pFind->m_pInterface->Placeable.matrix->vPos.fY;
fDistanceZ = fZ - pFind->m_pInterface->Placeable.matrix->vPos.fZ;
fDistanceX = fX - pFind->m_pInterface->matrix->vPos.fX;
fDistanceY = fY - pFind->m_pInterface->matrix->vPos.fY;
fDistanceZ = fZ - pFind->m_pInterface->matrix->vPos.fZ;
}

// Square root 'em
Expand All @@ -80,7 +80,7 @@ void CBuildingRemovalSA::RemoveBuilding(uint16_t usModelToRemove, float fRange,
if ((pInterface->nType == ENTITY_TYPE_BUILDING || pInterface->nType == ENTITY_TYPE_DUMMY || pInterface->nType == ENTITY_TYPE_OBJECT) &&
pInterface->bRemoveFromWorld != 1)
{
if ((DWORD)(pInterface->vtbl) != VTBL_CPlaceable)
if (!pInterface->IsPlaceableVTBL())
{
// Add the Data Building to the list
pRemoval->AddDataBuilding(pInterface);
Expand Down Expand Up @@ -113,15 +113,15 @@ void CBuildingRemovalSA::RemoveBuilding(uint16_t usModelToRemove, float fRange,
if (pFindBinary->m_iCount <= 0 && pFindBinary->m_pInterface)
{
// Grab distances across each axis
float fDistanceX = fX - pFindBinary->m_pInterface->Placeable.m_transform.m_translate.fX;
float fDistanceY = fY - pFindBinary->m_pInterface->Placeable.m_transform.m_translate.fY;
float fDistanceZ = fZ - pFindBinary->m_pInterface->Placeable.m_transform.m_translate.fZ;
float fDistanceX = fX - pFindBinary->m_pInterface->m_transform.m_translate.fX;
float fDistanceY = fY - pFindBinary->m_pInterface->m_transform.m_translate.fY;
float fDistanceZ = fZ - pFindBinary->m_pInterface->m_transform.m_translate.fZ;

if (pFindBinary->m_pInterface->Placeable.matrix != NULL)
if (pFindBinary->m_pInterface->matrix != NULL)
{
fDistanceX = fX - pFindBinary->m_pInterface->Placeable.matrix->vPos.fX;
fDistanceY = fY - pFindBinary->m_pInterface->Placeable.matrix->vPos.fY;
fDistanceZ = fZ - pFindBinary->m_pInterface->Placeable.matrix->vPos.fZ;
fDistanceX = fX - pFindBinary->m_pInterface->matrix->vPos.fX;
fDistanceY = fY - pFindBinary->m_pInterface->matrix->vPos.fY;
fDistanceZ = fZ - pFindBinary->m_pInterface->matrix->vPos.fZ;
}

// Square root 'em
Expand All @@ -139,7 +139,7 @@ void CBuildingRemovalSA::RemoveBuilding(uint16_t usModelToRemove, float fRange,
if ((pInterface->nType == ENTITY_TYPE_BUILDING || pInterface->nType == ENTITY_TYPE_DUMMY || pInterface->nType == ENTITY_TYPE_OBJECT) &&
pInterface->bRemoveFromWorld != 1)
{
if ((DWORD)(pInterface->vtbl) != VTBL_CPlaceable)
if (!pInterface->IsPlaceableVTBL())
{
// Add the Data Building to the list
pRemoval->AddBinaryBuilding(pInterface);
Expand Down Expand Up @@ -211,7 +211,7 @@ bool CBuildingRemovalSA::RestoreBuilding(uint16_t usModelToRestore, float fRange
pEntity->bRemoveFromWorld != 1)
{
// Don't call this on entities being removed.
if ((DWORD)(pEntity->vtbl) != VTBL_CPlaceable)
if (!pEntity->IsPlaceableVTBL())
{
pGame->GetWorld()->Add(pEntity, Building_Restore);
m_pRemovedEntities[(DWORD)pEntity] = false;
Expand Down Expand Up @@ -243,7 +243,7 @@ bool CBuildingRemovalSA::RestoreBuilding(uint16_t usModelToRestore, float fRange
if ((pEntity->nType == ENTITY_TYPE_BUILDING || pEntity->nType == ENTITY_TYPE_DUMMY || pEntity->nType == ENTITY_TYPE_OBJECT) &&
pEntity->bRemoveFromWorld != 1)
{
if ((DWORD)(pEntity->vtbl) != VTBL_CPlaceable)
if (!pEntity->IsPlaceableVTBL())
{
pGame->GetWorld()->Add(pEntity, Building_Restore2);
m_pRemovedEntities[(DWORD)pEntity] = false;
Expand Down Expand Up @@ -277,15 +277,15 @@ bool CBuildingRemovalSA::RestoreBuilding(uint16_t usModelToRestore, float fRange
if (pFound)
{
// Grab distances across each axis
float fDistanceX = fX - pFound->m_pInterface->Placeable.m_transform.m_translate.fX;
float fDistanceY = fY - pFound->m_pInterface->Placeable.m_transform.m_translate.fY;
float fDistanceZ = fZ - pFound->m_pInterface->Placeable.m_transform.m_translate.fZ;
float fDistanceX = fX - pFound->m_pInterface->m_transform.m_translate.fX;
float fDistanceY = fY - pFound->m_pInterface->m_transform.m_translate.fY;
float fDistanceZ = fZ - pFound->m_pInterface->m_transform.m_translate.fZ;

if (pFound->m_pInterface->Placeable.matrix != NULL)
if (pFound->m_pInterface->matrix != NULL)
{
fDistanceX = fX - pFound->m_pInterface->Placeable.matrix->vPos.fX;
fDistanceY = fY - pFound->m_pInterface->Placeable.matrix->vPos.fY;
fDistanceZ = fZ - pFound->m_pInterface->Placeable.matrix->vPos.fZ;
fDistanceX = fX - pFound->m_pInterface->matrix->vPos.fX;
fDistanceY = fY - pFound->m_pInterface->matrix->vPos.fY;
fDistanceZ = fZ - pFound->m_pInterface->matrix->vPos.fZ;
}

// Square root 'em
Expand All @@ -309,15 +309,15 @@ bool CBuildingRemovalSA::RestoreBuilding(uint16_t usModelToRestore, float fRange
if (pFoundBinary)
{
// Grab distances across each axis
float fDistanceX = fX - pFoundBinary->m_pInterface->Placeable.m_transform.m_translate.fX;
float fDistanceY = fY - pFoundBinary->m_pInterface->Placeable.m_transform.m_translate.fY;
float fDistanceZ = fZ - pFoundBinary->m_pInterface->Placeable.m_transform.m_translate.fZ;
float fDistanceX = fX - pFoundBinary->m_pInterface->m_transform.m_translate.fX;
float fDistanceY = fY - pFoundBinary->m_pInterface->m_transform.m_translate.fY;
float fDistanceZ = fZ - pFoundBinary->m_pInterface->m_transform.m_translate.fZ;

if (pFoundBinary->m_pInterface->Placeable.matrix != NULL)
if (pFoundBinary->m_pInterface->matrix != NULL)
{
fDistanceX = fX - pFoundBinary->m_pInterface->Placeable.matrix->vPos.fX;
fDistanceY = fY - pFoundBinary->m_pInterface->Placeable.matrix->vPos.fY;
fDistanceZ = fZ - pFoundBinary->m_pInterface->Placeable.matrix->vPos.fZ;
fDistanceX = fX - pFoundBinary->m_pInterface->matrix->vPos.fX;
fDistanceY = fY - pFoundBinary->m_pInterface->matrix->vPos.fY;
fDistanceZ = fZ - pFoundBinary->m_pInterface->matrix->vPos.fZ;
}

// Square root 'em
Expand Down Expand Up @@ -386,15 +386,15 @@ bool CBuildingRemovalSA::IsObjectRemoved(CEntitySAInterface* pInterface)
if (pFind->m_cInterior == -1 || pFind->m_cInterior == pInterface->m_areaCode)
{
// Grab the distance
float fDistanceX = pFind->m_vecPos.fX - pInterface->Placeable.m_transform.m_translate.fX;
float fDistanceY = pFind->m_vecPos.fY - pInterface->Placeable.m_transform.m_translate.fY;
float fDistanceZ = pFind->m_vecPos.fZ - pInterface->Placeable.m_transform.m_translate.fZ;
float fDistanceX = pFind->m_vecPos.fX - pInterface->m_transform.m_translate.fX;
float fDistanceY = pFind->m_vecPos.fY - pInterface->m_transform.m_translate.fY;
float fDistanceZ = pFind->m_vecPos.fZ - pInterface->m_transform.m_translate.fZ;

if (pInterface->Placeable.matrix != NULL)
if (pInterface->matrix != NULL)
{
fDistanceX = pFind->m_vecPos.fX - pInterface->Placeable.matrix->vPos.fX;
fDistanceY = pFind->m_vecPos.fY - pInterface->Placeable.matrix->vPos.fY;
fDistanceZ = pFind->m_vecPos.fZ - pInterface->Placeable.matrix->vPos.fZ;
fDistanceX = pFind->m_vecPos.fX - pInterface->matrix->vPos.fX;
fDistanceY = pFind->m_vecPos.fY - pInterface->matrix->vPos.fY;
fDistanceZ = pFind->m_vecPos.fZ - pInterface->matrix->vPos.fZ;
}

float fDistance = sqrt(fDistanceX * fDistanceX + fDistanceY * fDistanceY + fDistanceZ * fDistanceZ);
Expand Down Expand Up @@ -457,7 +457,7 @@ void CBuildingRemovalSA::ClearRemovedBuildingLists(uint* pOutAmount)
pEntity->bRemoveFromWorld != 1)
{
// Don't call this on entities being removed.
if ((DWORD)(pEntity->vtbl) != VTBL_CPlaceable)
if (!pEntity->IsPlaceableVTBL())
{
pGame->GetWorld()->Add(pEntity, BuildingRemovalReset);
m_pRemovedEntities[(DWORD)pEntity] = false;
Expand All @@ -483,7 +483,7 @@ void CBuildingRemovalSA::ClearRemovedBuildingLists(uint* pOutAmount)
pEntity->bRemoveFromWorld != 1)
{
// Don't call this on entities being removed.
if ((DWORD)(pEntity->vtbl) != VTBL_CPlaceable)
if (!pEntity->IsPlaceableVTBL())
{
pGame->GetWorld()->Add(pEntity, BuildingRemovalReset2);
m_pRemovedEntities[(DWORD)pEntity] = false;
Expand Down Expand Up @@ -546,15 +546,15 @@ SBuildingRemoval* CBuildingRemovalSA::GetBuildingRemoval(CEntitySAInterface* pIn
if (pFind)
{
// Grab the distance
float fDistanceX = pFind->m_vecPos.fX - pInterface->Placeable.m_transform.m_translate.fX;
float fDistanceY = pFind->m_vecPos.fY - pInterface->Placeable.m_transform.m_translate.fY;
float fDistanceZ = pFind->m_vecPos.fZ - pInterface->Placeable.m_transform.m_translate.fZ;
float fDistanceX = pFind->m_vecPos.fX - pInterface->m_transform.m_translate.fX;
float fDistanceY = pFind->m_vecPos.fY - pInterface->m_transform.m_translate.fY;
float fDistanceZ = pFind->m_vecPos.fZ - pInterface->m_transform.m_translate.fZ;

if (pInterface->Placeable.matrix != NULL)
if (pInterface->matrix != NULL)
{
fDistanceX = pFind->m_vecPos.fX - pInterface->Placeable.matrix->vPos.fX;
fDistanceY = pFind->m_vecPos.fY - pInterface->Placeable.matrix->vPos.fY;
fDistanceZ = pFind->m_vecPos.fZ - pInterface->Placeable.matrix->vPos.fZ;
fDistanceX = pFind->m_vecPos.fX - pInterface->matrix->vPos.fX;
fDistanceY = pFind->m_vecPos.fY - pInterface->matrix->vPos.fY;
fDistanceZ = pFind->m_vecPos.fZ - pInterface->matrix->vPos.fZ;
}

float fDistance = sqrt(fDistanceX * fDistanceX + fDistanceY * fDistanceY + fDistanceZ * fDistanceZ);
Expand Down
17 changes: 8 additions & 9 deletions Client/game_sa/CBuildingsPoolSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ void CBuildingsPoolSA::RemoveBuilding(CBuilding* pBuilding)
pGame->GetWorld()->Remove(pInterface, CBuildingPool_Destructor);

// Call virtual destructor
((void*(__thiscall*)(void*, char))pInterface->vtbl->SCALAR_DELETING_DESTRUCTOR)(pInterface, 0);
pInterface->Destructor(false);

// Remove col reference
auto modelInfo = pGame->GetModelInfo(pBuilding->GetModelIndex());
Expand Down Expand Up @@ -140,7 +140,7 @@ void CBuildingsPoolSA::RemoveAllBuildings()
using CStencilShadowObjects_dtorAll = void* (*)();
((CStencilShadowObjects_dtorAll)0x711390)();

m_pOriginalBuildingsBackup = std::make_unique<std::array<std::pair<bool, CBuildingSAInterface>, MAX_BUILDINGS>>();
m_pOriginalBuildingsBackup = std::make_unique<backup_array_t>();

auto pBuildsingsPool = (*m_ppBuildingPoolInterface);
for (size_t i = 0; i < MAX_BUILDINGS; i++)
Expand All @@ -157,7 +157,7 @@ void CBuildingsPoolSA::RemoveAllBuildings()
pBuildsingsPool->Release(i);

(*m_pOriginalBuildingsBackup)[i].first = true;
(*m_pOriginalBuildingsBackup)[i].second = *building;
std::memcpy(&(*m_pOriginalBuildingsBackup)[i].second, building, sizeof(CBuildingSAInterface));
}
else
{
Expand All @@ -177,9 +177,8 @@ void CBuildingsPoolSA::RestoreAllBuildings()
{
if (originalData[i].first)
{
pBuildsingsPool->AllocateAt(i);
auto pBuilding = pBuildsingsPool->GetObject(i);
*pBuilding = originalData[i].second;
auto* pBuilding = pBuildsingsPool->AllocateAtNoInit(i);
std::memcpy(pBuilding, &originalData[i].second, sizeof(CBuildingSAInterface));

pGame->GetWorld()->Add(pBuilding, CBuildingPool_Constructor);
}
Expand Down Expand Up @@ -289,13 +288,13 @@ void CBuildingsPoolSA::UpdateIplEntrysPointers(uint32_t offset)

void CBuildingsPoolSA::UpdateBackupLodPointers(uint32_t offset)
{
std::array<std::pair<bool, CBuildingSAInterface>, MAX_BUILDINGS> *arr = m_pOriginalBuildingsBackup.get();
backup_array_t* arr = m_pOriginalBuildingsBackup.get();
for (auto i = 0; i < MAX_BUILDINGS; i++)
{
std::pair<bool, CBuildingSAInterface>* data = &(*arr)[i];
std::pair<bool, building_buffer_t>* data = &(*arr)[i];
if (data->first)
{
CBuildingSAInterface* building = &data->second;
CBuildingSAInterface* building = reinterpret_cast<CBuildingSAInterface*>(&data->second);
if (building->m_pLod != nullptr)
{
building->m_pLod = (CBuildingSAInterface*)((uint32_t)building->m_pLod + offset);
Expand Down
5 changes: 4 additions & 1 deletion Client/game_sa/CBuildingsPoolSA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,8 @@ class CBuildingsPoolSA : public CBuildingsPool
SVectorPoolData<CBuildingSA> m_buildingPool{MAX_BUILDINGS};
CPoolSAInterface<CBuildingSAInterface>** m_ppBuildingPoolInterface;

std::unique_ptr<std::array<std::pair<bool, CBuildingSAInterface>, MAX_BUILDINGS>> m_pOriginalBuildingsBackup;
typedef std::uint8_t building_buffer_t[sizeof(CBuildingSAInterface)];
typedef std::array<std::pair<bool, building_buffer_t>, MAX_BUILDINGS> backup_array_t;
TheNormalnij marked this conversation as resolved.
Show resolved Hide resolved

std::unique_ptr<backup_array_t> m_pOriginalBuildingsBackup;
};
4 changes: 2 additions & 2 deletions Client/game_sa/CCameraSA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ void CCameraSA::RestoreLastGoodState()

CMatrix* CCameraSA::GetMatrix(CMatrix* matrix)
{
CMatrix_Padded* pCamMatrix = &GetInterface()->m_cameraMatrix; // ->Placeable.matrix;
CMatrix_Padded* pCamMatrix = &GetInterface()->m_cameraMatrix; // ->matrix;
if (pCamMatrix)
{
matrix->vFront = pCamMatrix->vFront;
Expand All @@ -210,7 +210,7 @@ CMatrix* CCameraSA::GetMatrix(CMatrix* matrix)

void CCameraSA::SetMatrix(CMatrix* matrix)
{
CMatrix_Padded* pCamMatrix = GetInterface()->Placeable.matrix;
CMatrix_Padded* pCamMatrix = GetInterface()->matrix;
if (pCamMatrix)
{
pCamMatrix->vFront = matrix->vFront;
Comment on lines 211 to 216
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code had no effect previously. matrix was always nullptr because Placeable was misplaced

Expand Down
7 changes: 1 addition & 6 deletions Client/game_sa/CCameraSA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,9 @@ class CTrainCamNode

/*** END PURE R* CLASSES ***/

class CCameraSAInterface
class CCameraSAInterface : public CPlaceableSAInterface
{
public:
// CPlaceable
CPlaceableSAInterface Placeable;
std::uint8_t specialPadding[4]; // Temporary padding due to incorrect CPlaceableSAInterface class
// End CPlaceable

// move these out the class, have decided to set up a mirrored enumerated type thingy at the top
bool m_bAboveGroundTrainNodesLoaded;
bool m_bBelowGroundTrainNodesLoaded;
Expand Down
Loading
Loading