mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-12 11:00:33 +00:00
Code Issues Projects Releases Wiki Activity

cleaned up patching of virtual functions; started CAutomobile

Browse source
This commit is contained in:
aap 2019-07-08 08:46:42 +02:00
commit 12af85ca3d
64 changed files with 771 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/entities/Physical.h
View file

@ -3,12 +3,13 @@
#include "Lists.h"
#include "Timer.h"
#include "Entity.h"
#include "Treadable.h"
enum {
PHYSICAL_MAX_COLLISIONRECORDS = 6
};
class CTreadable;
class CPhysical : public CEntity
{
public:
@ -65,13 +66,14 @@ public:
~CPhysical(void);
// from CEntity
virtual void Add(void);
virtual void Remove(void);
virtual CRect GetBoundRect(void);
virtual void ProcessControl(void);
void Add(void);
void Remove(void);
CRect GetBoundRect(void);
void ProcessControl(void);
void ProcessShift(void);
void ProcessCollision(void);
virtual int32 ProcessEntityCollision(CEntity *ent, CColPoint *point);
virtual void ProcessShift(void);
virtual void ProcessCollision(void);
void RemoveAndAdd(void);
void AddToMovingList(void);
@ -137,15 +139,5 @@ public:
bool ProcessCollisionSectorList(CPtrList *lists);
bool CheckCollision(void);
bool CheckCollision_SimpleCar(void);
// to make patching virtual functions possible
void dtor(void) { this->CPhysical::~CPhysical(); }
void Add_(void) { CPhysical::Add(); }
void Remove_(void) { CPhysical::Remove(); }
CRect GetBoundRect_(void) { return CPhysical::GetBoundRect(); }
void ProcessControl_(void) { CPhysical::ProcessControl(); }
void ProcessShift_(void) { CPhysical::ProcessShift(); }
void ProcessCollision_(void) { CPhysical::ProcessCollision(); }
int32 ProcessEntityCollision_(CEntity *ent, CColPoint *point) { return CPhysical::ProcessEntityCollision(ent, point); }
};
static_assert(sizeof(CPhysical) == 0x128, "CPhysical: error");