Skip to content

Commit 3550735

Browse files
github-actions[bot]github-actions[bot]
committed
Synchronize changes from 1.6 master branch [ci skip]
81242ed Lua API for buildings (#3274)
2 parents af45cde + 81242ed commit 3550735

32 files changed

+739
-51
lines changed

‎Client/game_sa/CBuildingSA.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
/*****************************************************************************
2+
*
3+
* PROJECT: Multi Theft Auto v1.0
4+
* LICENSE: See LICENSE in the top level directory
5+
* FILE: game_sa/CBuildingSA.cpp
6+
* PURPOSE: Building entity
7+
*
8+
* Multi Theft Auto is available from http://www.multitheftauto.com/
9+
*
10+
*****************************************************************************/
11+
12+
#include "StdInc.h"
13+
#include "CBuildingSA.h"
14+
15+
CBuildingSA::CBuildingSA(CBuildingSAInterface* pInterface)
16+
{
17+
SetInterface(pInterface);
18+
}

‎Client/game_sa/CBuildingSA.h

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/*****************************************************************************
2+
*
3+
* PROJECT: Multi Theft Auto v1.0
4+
* LICENSE: See LICENSE in the top level directory
5+
* FILE: game_sa/CBuildingSA.h
6+
* PURPOSE: Header file for game building class
7+
*
8+
* Multi Theft Auto is available from http://www.multitheftauto.com/
9+
*
10+
*****************************************************************************/
11+
12+
#pragma once
13+
14+
#include <game/CBuilding.h>
15+
#include "CEntitySA.h"
16+
17+
class CBuildingSAInterface : public CEntitySAInterface
18+
{
19+
};
20+
static_assert(sizeof(CBuildingSAInterface) == 0x38, "Invalid size CBuildingSAInterface");
21+
22+
class CBuildingSA final : public virtual CBuilding, public virtual CEntitySA
23+
{
24+
public:
25+
CBuildingSA(CBuildingSAInterface* pInterface);
26+
27+
CBuildingSAInterface* GetBuildingInterface() { return reinterpret_cast<CBuildingSAInterface*>(GetInterface()); };
28+
};

‎Client/game_sa/CFileLoaderSA.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@ void CFileLoaderSA::StaticSetHooks()
2828
HookInstall(0x538690, (DWORD)CFileLoader_LoadObjectInstance, 5);
2929
}
3030

31+
CEntitySAInterface* CFileLoaderSA::LoadObjectInstance(SFileObjectInstance* obj)
32+
{
33+
// Second argument is model name. It's unused in the function
34+
return ((CEntitySAInterface * (__cdecl*)(SFileObjectInstance*, const char*))0x538090)(obj, nullptr);
35+
}
36+
3137
class CAtomicModelInfo
3238
{
3339
public:

‎Client/game_sa/CFileLoaderSA.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ class CFileLoaderSA
2929
CFileLoaderSA();
3030
~CFileLoaderSA();
3131

32+
static CEntitySAInterface* LoadObjectInstance(SFileObjectInstance*);
33+
3234
static void StaticSetHooks();
3335
};
3436

‎Client/game_sa/CModelInfoSA.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,8 @@ class CModelInfoSA : public CModelInfo
465465
// Vehicle towing functions
466466
bool IsTowableBy(CModelInfo* towingModel) override;
467467

468+
bool IsDynamic() { return m_pInterface ? m_pInterface->usDynamicIndex != 0xffff : false; };
469+
468470
private:
469471
void CopyStreamingInfoFromModel(ushort usCopyFromModelID);
470472
void RwSetSupportedUpgrades(RwFrame* parent, DWORD dwModel);

‎Client/game_sa/CPoolsSA.cpp

Lines changed: 117 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "CBikeSA.h"
1414
#include "CBmxSA.h"
1515
#include "CBoatSA.h"
16+
#include "CBuildingSA.h"
1617
#include "CGameSA.h"
1718
#include "CHeliSA.h"
1819
#include "CMonsterTruckSA.h"
@@ -24,6 +25,7 @@
2425
#include "CTrainSA.h"
2526
#include "CWorldSA.h"
2627
#include "CKeyGenSA.h"
28+
#include "CFileLoaderSA.h"
2729

2830
extern CGameSA* pGame;
2931

@@ -33,6 +35,7 @@ CPoolsSA::CPoolsSA()
3335
m_ppObjectPoolInterface = (CPoolSAInterface<CObjectSAInterface>**)0xB7449C;
3436
m_ppVehiclePoolInterface = (CPoolSAInterface<CVehicleSAInterface>**)0xB74494;
3537
m_ppTxdPoolInterface = (CPoolSAInterface<CTextureDictonarySAInterface>**)0xC8800C;
38+
m_ppBuildingPoolInterface = (CPoolSAInterface<CBuildingSAInterface>**)0xB74498;
3639

3740
m_bGetVehicleEnabled = true;
3841
}
@@ -329,6 +332,107 @@ void CPoolsSA::DeleteAllObjects()
329332
}
330333
}
331334

335+
//////////////////////////////////////////////////////////////////////////////////////////
336+
// BUILDINGS POOL //
337+
//////////////////////////////////////////////////////////////////////////////////////////
338+
339+
inline bool CPoolsSA::AddBuildingToPool(CClientBuilding* pClientBuilding, CBuildingSA* pBuilding)
340+
{
341+
// Grab the new object interface
342+
CBuildingSAInterface* pInterface = pBuilding->GetBuildingInterface();
343+
344+
if (!pInterface)
345+
return false;
346+
347+
DWORD dwElementIndexInPool = GetBuildingPoolIndex((std::uint8_t*)pInterface);
348+
if (dwElementIndexInPool >= MAX_BUILDINGS)
349+
{
350+
return false;
351+
}
352+
353+
m_buildingPool.arrayOfClientEntities[dwElementIndexInPool] = {pBuilding, (CClientEntity*)pClientBuilding};
354+
355+
// Increase the count of objects
356+
++m_buildingPool.ulCount;
357+
358+
return true;
359+
}
360+
361+
CBuilding* CPoolsSA::AddBuilding(CClientBuilding* pClientBuilding, uint16_t modelId, CVector *vPos, CVector4D *vRot, uint8_t interior)
362+
{
363+
if (!HasFreeBuildingSlot())
364+
return nullptr;
365+
366+
// Load building
367+
SFileObjectInstance instance;
368+
instance.modelID = modelId;
369+
instance.lod = -1;
370+
instance.interiorID = interior;
371+
instance.position = *vPos;
372+
instance.rotation = *vRot;
373+
374+
// Fix strange SA rotation
375+
instance.rotation.fW = -instance.rotation.fW;
376+
377+
auto pBuilding = static_cast<CBuildingSAInterface*>(CFileLoaderSA::LoadObjectInstance(&instance));
378+
379+
// Disable lod and ipl
380+
pBuilding->m_pLod = nullptr;
381+
pBuilding->m_iplIndex = 0;
382+
383+
// Always stream model collosion
384+
// TODO We can setup collison bounding box and use GTA streamer for it
385+
auto modelInfo = pGame->GetModelInfo(modelId);
386+
modelInfo->AddColRef();
387+
388+
// Add building in world
389+
auto pBuildingSA = new CBuildingSA(pBuilding);
390+
pGame->GetWorld()->Add(pBuildingSA, CBuildingPool_Constructor);
391+
392+
// Add CBuildingSA object in pool
393+
AddBuildingToPool(pClientBuilding, pBuildingSA);
394+
395+
return pBuildingSA;
396+
}
397+
398+
void CPoolsSA::RemoveBuilding(CBuilding* pBuilding)
399+
{
400+
assert(NULL != pBuilding);
401+
402+
CBuildingSAInterface* pInterface = pBuilding->GetBuildingInterface();
403+
404+
DWORD dwElementIndexInPool = GetBuildingPoolIndex((std::uint8_t*)pInterface);
405+
if (dwElementIndexInPool >= MAX_BUILDINGS)
406+
{
407+
return;
408+
}
409+
410+
// Remove building from world
411+
pGame->GetWorld()->Remove(pInterface, CBuildingPool_Destructor);
412+
413+
// Remove col reference
414+
auto modelInfo = pGame->GetModelInfo(pBuilding->GetModelIndex());
415+
modelInfo->RemoveColRef();
416+
417+
// Remove from BuildingSA pool
418+
auto* pBuildingSA = m_buildingPool.arrayOfClientEntities[dwElementIndexInPool].pEntity;
419+
m_buildingPool.arrayOfClientEntities[dwElementIndexInPool] = {nullptr, nullptr};
420+
421+
// Delete it from memory
422+
delete pBuildingSA;
423+
424+
// Remove building from SA pool
425+
(*m_ppBuildingPoolInterface)->Release(dwElementIndexInPool);
426+
427+
// Decrease the count of elements in the pool
428+
--m_buildingPool.ulCount;
429+
}
430+
431+
bool CPoolsSA::HasFreeBuildingSlot()
432+
{
433+
return (*m_ppBuildingPoolInterface)->GetFreeSlot() != -1;
434+
}
435+
332436
//////////////////////////////////////////////////////////////////////////////////////////
333437
// PEDS POOL //
334438
//////////////////////////////////////////////////////////////////////////////////////////
@@ -676,7 +780,7 @@ DWORD CPoolsSA::GetPedPoolIndex(std::uint8_t* pInterface)
676780
{
677781
return MAX_PEDS;
678782
}
679-
return ((pInterface - pTheObjects) / dwAlignedSize);
783+
return ((pInterface - pTheObjects) / dwAlignedSize);
680784
}
681785

682786
DWORD CPoolsSA::GetVehiclePoolIndex(std::uint8_t* pInterface)
@@ -703,6 +807,18 @@ DWORD CPoolsSA::GetObjectPoolIndex(std::uint8_t* pInterface)
703807
return ((pInterface - pTheObjects) / dwAlignedSize);
704808
}
705809

810+
DWORD CPoolsSA::GetBuildingPoolIndex(std::uint8_t* pInterface)
811+
{
812+
DWORD dwAlignedSize = sizeof(CBuildingSAInterface);
813+
std::uint8_t* pTheObjects = (std::uint8_t*)(*m_ppBuildingPoolInterface)->m_pObjects;
814+
DWORD dwMaxIndex = MAX_BUILDINGS - 1;
815+
if (pInterface < pTheObjects || pInterface > pTheObjects + (dwMaxIndex * dwAlignedSize))
816+
{
817+
return MAX_BUILDINGS;
818+
}
819+
return ((pInterface - pTheObjects) / dwAlignedSize);
820+
}
821+
706822
uint CPoolsSA::GetModelIdFromClump(RpClump* pRpClump)
707823
{
708824
// Search our pools for a match

‎Client/game_sa/CPoolsSA.h

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "CPedSA.h"
1515
#include "CVehicleSA.h"
1616
#include "CObjectSA.h"
17+
#include "CBuildingSA.h"
1718
#include "CTextureDictonarySA.h"
1819

1920
#define INVALID_POOL_ARRAY_ID 0xFFFFFFFF
@@ -170,6 +171,15 @@ class CPoolsSA : public CPools
170171
unsigned long GetObjectCount() { return m_objectPool.ulCount; }
171172
void DeleteAllObjects();
172173

174+
// Buildings pool
175+
private:
176+
bool AddBuildingToPool(CClientBuilding* pClientBuilding, CBuildingSA* pBuilding);
177+
178+
public:
179+
CBuilding* AddBuilding(CClientBuilding*, uint16_t modelId, CVector *vPos, CVector4D *vRot, uint8_t interior);
180+
void RemoveBuilding(CBuilding* pBuilding);
181+
bool HasFreeBuildingSlot();
182+
173183
// Peds pool
174184
CPed* AddPed(CClientPed* pClientPed, unsigned int nModelIndex);
175185
CPed* AddPed(CClientPed* pClientPed, DWORD* pGameInterface);
@@ -195,6 +205,7 @@ class CPoolsSA : public CPools
195205
DWORD GetPedPoolIndex(std::uint8_t* pInterface);
196206
DWORD GetVehiclePoolIndex(std::uint8_t* pInterfacee);
197207
DWORD GetObjectPoolIndex(std::uint8_t* pInterface);
208+
DWORD GetBuildingPoolIndex(std::uint8_t* pInterface);
198209

199210
int GetNumberOfUsedSpaces(ePools pools);
200211
int GetPoolDefaultCapacity(ePools pool);
@@ -231,16 +242,16 @@ class CPoolsSA : public CPools
231242
};
232243

233244
// Pools
234-
typedef SPoolData<CVehicleSA, CVehicleSAInterface, MAX_VEHICLES> vehiclePool_t;
235-
typedef SPoolData<CPedSA, CPedSAInterface, MAX_PEDS> pedPool_t;
236-
typedef SPoolData<CObjectSA, CObjectSAInterface, MAX_OBJECTS> objectPool_t;
237-
vehiclePool_t m_vehiclePool;
238-
pedPool_t m_pedPool;
239-
objectPool_t m_objectPool;
240-
CPoolSAInterface<CPedSAInterface>** m_ppPedPoolInterface;
241-
CPoolSAInterface<CObjectSAInterface>** m_ppObjectPoolInterface;
242-
CPoolSAInterface<CVehicleSAInterface>** m_ppVehiclePoolInterface;
243-
CPoolSAInterface<CTextureDictonarySAInterface>** m_ppTxdPoolInterface;
245+
SPoolData<CVehicleSA, CVehicleSAInterface, MAX_VEHICLES> m_vehiclePool;
246+
SPoolData<CPedSA, CPedSAInterface, MAX_PEDS> m_pedPool;
247+
SPoolData<CObjectSA, CObjectSAInterface, MAX_OBJECTS> m_objectPool;
248+
SPoolData<CBuildingSA, CBuildingSAInterface, MAX_BUILDINGS> m_buildingPool;
249+
250+
CPoolSAInterface<CPedSAInterface>** m_ppPedPoolInterface;
251+
CPoolSAInterface<CObjectSAInterface>** m_ppObjectPoolInterface;
252+
CPoolSAInterface<CVehicleSAInterface>** m_ppVehiclePoolInterface;
253+
CPoolSAInterface<CTextureDictonarySAInterface>** m_ppTxdPoolInterface;
254+
CPoolSAInterface<CBuildingSAInterface>** m_ppBuildingPoolInterface;
244255

245256
bool m_bGetVehicleEnabled;
246257
};

‎Client/mods/deathmatch/StdInc.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include <CClientCommon.h>
5757
#include <CClientManager.h>
5858
#include <CClient3DMarker.h>
59+
#include <CClientBuilding.h>
5960
#include <CClientCheckpoint.h>
6061
#include <CClientColShape.h>
6162
#include <CClientColCircle.h>
@@ -143,6 +144,7 @@
143144
#include <luadefs/CLuaWaterDefs.h>
144145
#include <luadefs/CLuaWeaponDefs.h>
145146
#include <luadefs/CLuaWorldDefs.h>
147+
#include <luadefs/CLuaBuildingDefs.h>
146148
#include <CRemoteCalls.h>
147149

148150
// Shared includes

0 commit comments

Comments
 (0)