archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-06-29 08:16:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Many fixes and cleanup

Browse Source
This commit is contained in:
eray orçunus
2020-04-15 19:19:45 +03:00
parent eb0b9f6255
commit 4da1879975
18 changed files with 174 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vehicles/Automobile.cpp
View File

@ -356,7 +356,7 @@ CAutomobile::ProcessControl(void)
PruneReferences();
if(m_status == STATUS_PLAYER && CRecordDataForChase::IsRecording())
if(m_status == STATUS_PLAYER && !CRecordDataForChase::IsRecording())
DoDriveByShootings();
}
break;
@ -4206,8 +4206,7 @@ GetCurrentAtomicObjectCB(RwObject *object, void *data)
return object;
}
CColPoint aTempPedColPts[32]; // this name doesn't make any sense
// they probably copied it from Ped (both serves same purpose) and didn't change the name
CColPoint spherepoints[MAX_COLLISION_POINTS];
CObject*
CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
@ -4327,7 +4326,7 @@ CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
if(CCollision::ProcessColModels(obj->GetMatrix(), *obj->GetColModel(),
this->GetMatrix(), *this->GetColModel(),
aTempPedColPts, nil, nil) > 0)
spherepoints, nil, nil) > 0)
obj->m_pCollidingEntity = this;
if(bRenderScorched)

12
src/vehicles/Vehicle.cpp
View File

@ -19,12 +19,12 @@
#include "Fire.h"
#include "Darkel.h"
bool &CVehicle::bWheelsOnlyCheat = *(bool *)0x95CD78;
bool &CVehicle::bAllDodosCheat = *(bool *)0x95CD75;
bool &CVehicle::bCheat3 = *(bool *)0x95CD66;
bool &CVehicle::bCheat4 = *(bool *)0x95CD65;
bool &CVehicle::bCheat5 = *(bool *)0x95CD64;
bool &CVehicle::m_bDisableMouseSteering = *(bool *)0x60252C;
bool CVehicle::bWheelsOnlyCheat;
bool CVehicle::bAllDodosCheat;
bool CVehicle::bCheat3;
bool CVehicle::bCheat4;
bool CVehicle::bCheat5;
bool CVehicle::m_bDisableMouseSteering;
void *CVehicle::operator new(size_t sz) { return CPools::GetVehiclePool()->New(); }
void *CVehicle::operator new(size_t sz, int handle) { return CPools::GetVehiclePool()->New(handle); }

12
src/vehicles/Vehicle.h
View File

@ -277,12 +277,12 @@ public:
bool IsTaxi(void) { return GetModelIndex() == MI_TAXI || GetModelIndex() == MI_CABBIE || GetModelIndex() == MI_BORGNINE; }
AnimationId GetDriverAnim(void) { return IsCar() && bLowVehicle ? ANIM_CAR_LSIT : (IsBoat() && GetModelIndex() != MI_SPEEDER ? ANIM_DRIVE_BOAT : ANIM_CAR_SIT); }
static bool &bWheelsOnlyCheat;
static bool &bAllDodosCheat;
static bool &bCheat3;
static bool &bCheat4;
static bool &bCheat5;
static bool &m_bDisableMouseSteering;
static bool bWheelsOnlyCheat;
static bool bAllDodosCheat;
static bool bCheat3;
static bool bCheat4;
static bool bCheat5;
static bool m_bDisableMouseSteering;
};
static_assert(sizeof(CVehicle) == 0x288, "CVehicle: error");