mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-12-28 02:31:48 +01:00
more CAutomobile
This commit is contained in:
parent
edf5ac2626
commit
2ae112fdf6
@ -19,7 +19,7 @@ WRAPPER void cDMAudio::ChangeMusicMode(uint8 mode) { EAXJMP(0x57CCF0); }
|
||||
WRAPPER void cDMAudio::PlayFrontEndSound(uint32, uint32) { EAXJMP(0x57CC20); }
|
||||
WRAPPER void cDMAudio::PlayFrontEndTrack(uint32, uint32) { EAXJMP(0x57CC80); }
|
||||
WRAPPER void cDMAudio::StopFrontEndTrack() { EAXJMP(0x57CCB0); }
|
||||
WRAPPER void cDMAudio::PlayOneShot(int32, uint16, float) { EAXJMP(0x57C840); }
|
||||
WRAPPER void cDMAudio::PlayOneShot(int32, uint16 /*eSound*/, float) { EAXJMP(0x57C840); }
|
||||
WRAPPER void cDMAudio::SetMusicMasterVolume(int8) { EAXJMP(0x57C8C0); }
|
||||
WRAPPER void cDMAudio::SetEffectsMasterVolume(int8) { EAXJMP(0x57C890); }
|
||||
WRAPPER int8 cDMAudio::SetCurrent3DProvider(int8) { EAXJMP(0x57C9B0); }
|
||||
|
@ -1012,7 +1012,7 @@ void CReplay::ProcessReplayCamera(void)
|
||||
default:
|
||||
break;
|
||||
}
|
||||
TheCamera.m_vecGameCamPos = *TheCamera.GetMatrix().GetPosition();
|
||||
TheCamera.m_vecGameCamPos = TheCamera.GetMatrix().GetPosition();
|
||||
TheCamera.CalculateDerivedValues();
|
||||
RwMatrixUpdate(RwFrameGetMatrix(RwCameraGetFrame(TheCamera.m_pRwCamera)));
|
||||
RwFrameUpdateObjects(RwCameraGetFrame(TheCamera.m_pRwCamera));
|
||||
|
@ -2261,7 +2261,7 @@ bool GetPadMoveUp()
|
||||
return
|
||||
(CPad::GetPad(0)->NewState.DPadUp && !CPad::GetPad(0)->OldState.DPadUp) ||
|
||||
(CPad::GetPad(0)->NewKeyState.UP && !CPad::GetPad(0)->OldKeyState.UP) ||
|
||||
(CPad::GetPad(0)->NewState.LeftStickY < 0 && !CPad::GetPad(0)->OldState.LeftStickY < 0);
|
||||
(CPad::GetPad(0)->NewState.LeftStickY < 0 && !(CPad::GetPad(0)->OldState.LeftStickY < 0));
|
||||
}
|
||||
|
||||
bool GetPadMoveDown()
|
||||
@ -2269,7 +2269,7 @@ bool GetPadMoveDown()
|
||||
return
|
||||
(CPad::GetPad(0)->NewState.DPadDown && !CPad::GetPad(0)->OldState.DPadDown) ||
|
||||
(CPad::GetPad(0)->NewKeyState.DOWN && !CPad::GetPad(0)->OldKeyState.DOWN) ||
|
||||
(CPad::GetPad(0)->NewState.LeftStickY > 0 && !CPad::GetPad(0)->OldState.LeftStickY > 0);
|
||||
(CPad::GetPad(0)->NewState.LeftStickY > 0 && !(CPad::GetPad(0)->OldState.LeftStickY > 0));
|
||||
}
|
||||
|
||||
bool GetPadMoveLeft()
|
||||
@ -2277,7 +2277,7 @@ bool GetPadMoveLeft()
|
||||
return
|
||||
(CPad::GetPad(0)->NewState.DPadLeft && !CPad::GetPad(0)->OldState.DPadLeft) ||
|
||||
(CPad::GetPad(0)->NewKeyState.LEFT && !CPad::GetPad(0)->OldKeyState.LEFT) ||
|
||||
(CPad::GetPad(0)->NewState.LeftStickX < 0 && !CPad::GetPad(0)->OldState.LeftStickX < 0);
|
||||
(CPad::GetPad(0)->NewState.LeftStickX < 0 && !(CPad::GetPad(0)->OldState.LeftStickX < 0));
|
||||
}
|
||||
|
||||
bool GetPadMoveRight()
|
||||
@ -2285,7 +2285,7 @@ bool GetPadMoveRight()
|
||||
return
|
||||
(CPad::GetPad(0)->NewState.DPadRight && !CPad::GetPad(0)->OldState.DPadRight) ||
|
||||
(CPad::GetPad(0)->NewKeyState.RIGHT && !CPad::GetPad(0)->OldKeyState.RIGHT) ||
|
||||
(CPad::GetPad(0)->NewState.LeftStickX > 0 && !CPad::GetPad(0)->OldState.LeftStickX > 0);
|
||||
(CPad::GetPad(0)->NewState.LeftStickX > 0 && !(CPad::GetPad(0)->OldState.LeftStickX > 0));
|
||||
}
|
||||
|
||||
bool GetMouseForward()
|
||||
|
@ -17,6 +17,11 @@ public:
|
||||
CMatrix &GetMatrix(void) { return m_matrix; }
|
||||
void SetTransform(RwMatrix *m) { m_matrix = CMatrix(m, false); }
|
||||
void SetHeading(float angle);
|
||||
void SetOrientation(float x, float y, float z){
|
||||
CVector pos = m_matrix.GetPosition();
|
||||
m_matrix.SetRotate(x, y, z);
|
||||
m_matrix.Translate(pos);
|
||||
}
|
||||
bool IsWithinArea(float x1, float y1, float x2, float y2);
|
||||
bool IsWithinArea(float x1, float y1, float z1, float x2, float y2, float z2);
|
||||
};
|
||||
|
@ -30,6 +30,8 @@ enum Config {
|
||||
NUMDUMMIES = 2802, // 2368 on PS2
|
||||
NUMAUDIOSCRIPTOBJECTS = 256,
|
||||
|
||||
NUMTEMPOBJECTS = 30,
|
||||
|
||||
// Link list lengths
|
||||
// TODO: alpha list
|
||||
NUMCOLCACHELINKS = 200,
|
||||
|
@ -154,6 +154,15 @@ spawnCar(int id)
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
FixCar(void)
|
||||
{
|
||||
CVehicle *veh = FindPlayerVehicle();
|
||||
if(veh == nil || !veh->IsCar())
|
||||
return;
|
||||
((CAutomobile*)veh)->Fix();
|
||||
}
|
||||
|
||||
void
|
||||
DebugMenuPopulate(void)
|
||||
{
|
||||
@ -198,6 +207,7 @@ DebugMenuPopulate(void)
|
||||
DebugMenuAddCmd("Cheats", "Strong grip", StrongGripCheat);
|
||||
DebugMenuAddCmd("Cheats", "Nasty limbs", NastyLimbsCheat);
|
||||
|
||||
DebugMenuAddCmd("Debug", "Fix Car", FixCar);
|
||||
DebugMenuAddVarBool8("Debug", "Show Ped Road Groups", (int8*)&gbShowPedRoadGroups, nil);
|
||||
DebugMenuAddVarBool8("Debug", "Show Car Road Groups", (int8*)&gbShowCarRoadGroups, nil);
|
||||
DebugMenuAddVarBool8("Debug", "Show Collision Polys", (int8*)&gbShowCollisionPolys, nil);
|
||||
|
@ -457,7 +457,7 @@ CPhysical::ApplySpringCollision(float springConst, CVector &springDir, CVector &
|
||||
float compression = 1.0f - springRatio;
|
||||
if(compression > 0.0f){
|
||||
float step = min(CTimer::GetTimeStep(), 3.0f);
|
||||
float impulse = -0.008f*m_fMass*step * springConst * compression * bias*2.0f;
|
||||
float impulse = -GRAVITY*m_fMass*step * springConst * compression * bias*2.0f;
|
||||
ApplyMoveForce(springDir*impulse);
|
||||
ApplyTurnForce(springDir*impulse, point);
|
||||
}
|
||||
@ -489,7 +489,7 @@ void
|
||||
CPhysical::ApplyGravity(void)
|
||||
{
|
||||
if(bAffectedByGravity)
|
||||
m_vecMoveSpeed.z -= 0.008f * CTimer::GetTimeStep();
|
||||
m_vecMoveSpeed.z -= GRAVITY * CTimer::GetTimeStep();
|
||||
}
|
||||
|
||||
void
|
||||
@ -1783,7 +1783,7 @@ CPhysical::ProcessShift(void)
|
||||
}
|
||||
bIsStuck = false;
|
||||
bIsInSafePosition = true;
|
||||
m_fDistanceTravelled = (GetPosition() - *matrix.GetPosition()).Magnitude();
|
||||
m_fDistanceTravelled = (GetPosition() - matrix.GetPosition()).Magnitude();
|
||||
RemoveAndAdd();
|
||||
}
|
||||
}
|
||||
@ -1925,7 +1925,7 @@ CPhysical::ProcessCollision(void)
|
||||
}
|
||||
}
|
||||
bHitByTrain = false;
|
||||
m_fDistanceTravelled = (GetPosition() - *savedMatrix.GetPosition()).Magnitude();
|
||||
m_fDistanceTravelled = (GetPosition() - savedMatrix.GetPosition()).Magnitude();
|
||||
m_phy_flagA80 = false;
|
||||
|
||||
bIsStuck = false;
|
||||
|
@ -8,6 +8,8 @@ enum {
|
||||
PHYSICAL_MAX_COLLISIONRECORDS = 6
|
||||
};
|
||||
|
||||
#define GRAVITY (0.008f)
|
||||
|
||||
class CTreadable;
|
||||
|
||||
class CPhysical : public CEntity
|
||||
@ -108,7 +110,23 @@ public:
|
||||
}
|
||||
|
||||
const CVector &GetMoveSpeed() { return m_vecMoveSpeed; }
|
||||
void SetMoveSpeed(float x, float y, float z) {
|
||||
m_vecMoveSpeed.x = x;
|
||||
m_vecMoveSpeed.y = y;
|
||||
m_vecMoveSpeed.z = z;
|
||||
}
|
||||
const CVector &GetTurnSpeed() { return m_vecTurnSpeed; }
|
||||
void SetTurnSpeed(float x, float y, float z) {
|
||||
m_vecTurnSpeed.x = x;
|
||||
m_vecTurnSpeed.y = y;
|
||||
m_vecTurnSpeed.z = z;
|
||||
}
|
||||
const CVector &GetCenterOfMass() { return m_vecCentreOfMass; }
|
||||
void SetCenterOfMass(float x, float y, float z) {
|
||||
m_vecCentreOfMass.x = x;
|
||||
m_vecCentreOfMass.y = y;
|
||||
m_vecCentreOfMass.z = z;
|
||||
}
|
||||
|
||||
void ApplyMoveSpeed(void);
|
||||
void ApplyTurnSpeed(void);
|
||||
|
@ -82,6 +82,32 @@ public:
|
||||
CVector &GetRight(void) { return *(CVector*)&m_matrix.right; }
|
||||
CVector &GetForward(void) { return *(CVector*)&m_matrix.up; }
|
||||
CVector &GetUp(void) { return *(CVector*)&m_matrix.at; }
|
||||
|
||||
void SetTranslate(float x, float y, float z){
|
||||
m_matrix.right.x = 1.0f;
|
||||
m_matrix.right.y = 0.0f;
|
||||
m_matrix.right.z = 0.0f;
|
||||
|
||||
m_matrix.up.x = 0.0f;
|
||||
m_matrix.up.y = 1.0f;
|
||||
m_matrix.up.z = 0.0f;
|
||||
|
||||
m_matrix.at.x = 0.0f;
|
||||
m_matrix.at.y = 0.0f;
|
||||
m_matrix.at.z = 1.0f;
|
||||
|
||||
m_matrix.pos.x = x;
|
||||
m_matrix.pos.y = y;
|
||||
m_matrix.pos.z = z;
|
||||
}
|
||||
void SetTranslate(const CVector &trans){ SetTranslate(trans.x, trans.y, trans.z); }
|
||||
void Translate(float x, float y, float z){
|
||||
m_matrix.pos.x += x;
|
||||
m_matrix.pos.y += y;
|
||||
m_matrix.pos.z += z;
|
||||
}
|
||||
void Translate(const CVector &trans){ Translate(trans.x, trans.y, trans.z); }
|
||||
|
||||
void SetScale(float s){
|
||||
m_matrix.right.x = s;
|
||||
m_matrix.right.y = 0.0f;
|
||||
@ -99,6 +125,7 @@ public:
|
||||
m_matrix.pos.y = 0.0f;
|
||||
m_matrix.pos.z = 0.0f;
|
||||
}
|
||||
|
||||
void SetRotateXOnly(float angle){
|
||||
float c = cos(angle);
|
||||
float s = sin(angle);
|
||||
|
@ -414,11 +414,13 @@ CVehicleModelInfo::SetAtomicFlagCB(RwObject *object, void *data)
|
||||
return object;
|
||||
}
|
||||
|
||||
RpAtomic*
|
||||
CVehicleModelInfo::ClearAtomicFlagCB(RpAtomic *atomic, void *data)
|
||||
RwObject*
|
||||
CVehicleModelInfo::ClearAtomicFlagCB(RwObject *object, void *data)
|
||||
{
|
||||
RpAtomic *atomic = (RpAtomic*)object;
|
||||
assert(RwObjectGetType(object) == rpATOMIC);
|
||||
CVisibilityPlugins::ClearAtomicFlag(atomic, (int)data);
|
||||
return atomic;
|
||||
return object;
|
||||
}
|
||||
|
||||
RwObject*
|
||||
|
@ -107,7 +107,7 @@ public:
|
||||
void SetAtomicRenderCallbacks(void);
|
||||
|
||||
static RwObject *SetAtomicFlagCB(RwObject *object, void *data);
|
||||
static RpAtomic *ClearAtomicFlagCB(RpAtomic *atomic, void *data);
|
||||
static RwObject *ClearAtomicFlagCB(RwObject *atomic, void *data);
|
||||
void SetVehicleComponentFlags(RwFrame *frame, uint32 flags);
|
||||
void PreprocessHierarchy(void);
|
||||
void GetWheelPosn(int32 n, CVector &pos);
|
||||
|
@ -7,6 +7,7 @@
|
||||
#include "Object.h"
|
||||
|
||||
WRAPPER void CObject::ObjectDamage(float amount) { EAXJMP(0x4BB240); }
|
||||
WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); }
|
||||
|
||||
int16 &CObject::nNoTempObjects = *(int16*)0x95CCA2;
|
||||
|
||||
@ -85,7 +86,13 @@ CObject::RemoveLighting(bool reset)
|
||||
WorldReplaceScorchedLightsWithNormal(Scene.world);
|
||||
}
|
||||
|
||||
WRAPPER void CObject::DeleteAllTempObjectInArea(CVector, float) { EAXJMP(0x4BBED0); }
|
||||
|
||||
void
|
||||
CObject::RefModelInfo(int32 modelId)
|
||||
{
|
||||
m_nRefModelIndex = modelId;
|
||||
CModelInfo::GetModelInfo(modelId)->AddRef();
|
||||
}
|
||||
|
||||
class CObject_ : public CObject
|
||||
{
|
||||
|
@ -72,6 +72,7 @@ public:
|
||||
void RemoveLighting(bool reset);
|
||||
|
||||
void ObjectDamage(float amount);
|
||||
void RefModelInfo(int32 modelId);
|
||||
|
||||
static void DeleteAllTempObjectInArea(CVector, float);
|
||||
};
|
||||
|
@ -669,7 +669,7 @@ CPed::AimGun(void)
|
||||
vector.y = pos.y;
|
||||
vector.z = pos.z;
|
||||
} else {
|
||||
vector = *(m_pSeekTarget->GetPosition());
|
||||
vector = m_pSeekTarget->GetPosition();
|
||||
}
|
||||
Say(SOUND_PED_ATTACK);
|
||||
|
||||
@ -1540,7 +1540,7 @@ CPed::GetPositionToOpenCarDoor(CVector *output, CVehicle *veh, uint32 enterType,
|
||||
GetLocalPositionToOpenCarDoor(output, veh, enterType, offset);
|
||||
doorPos = Multiply3x3(vehMat, *output);
|
||||
|
||||
*output = *veh->GetPosition() + doorPos;
|
||||
*output = veh->GetPosition() + doorPos;
|
||||
}
|
||||
|
||||
void
|
||||
@ -1659,7 +1659,7 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
|
||||
CVector neededPos;
|
||||
|
||||
if (phase == LINE_UP_TO_CAR_2) {
|
||||
neededPos = *GetPosition();
|
||||
neededPos = GetPosition();
|
||||
} else {
|
||||
GetPositionToOpenCarDoor(&neededPos, veh, m_vehEnterType, seatPosMult);
|
||||
}
|
||||
@ -2087,7 +2087,7 @@ CPed::CalculateNewOrientation(void)
|
||||
if (CReplay::IsPlayingBack() || !IsPedInControl())
|
||||
return;
|
||||
|
||||
CVector pos = *GetPosition();
|
||||
CVector pos = GetPosition();
|
||||
|
||||
GetMatrix().SetRotate(0.0f, 0.0f, m_fRotationCur);
|
||||
|
||||
|
@ -1,8 +1,15 @@
|
||||
#include "common.h"
|
||||
#include "patcher.h"
|
||||
#include "General.h"
|
||||
#include "ModelIndices.h"
|
||||
#include "VisibilityPlugins.h"
|
||||
#include "DMAudio.h"
|
||||
#include "World.h"
|
||||
#include "SurfaceTable.h"
|
||||
#include "HandlingMgr.h"
|
||||
#include "CarCtrl.h"
|
||||
#include "Ped.h"
|
||||
#include "Object.h"
|
||||
#include "Automobile.h"
|
||||
|
||||
bool &CAutomobile::m_sAllTaxiLights = *(bool*)0x95CD21;
|
||||
@ -23,7 +30,22 @@ CAutomobile::SetModelIndex(uint32 id)
|
||||
}
|
||||
|
||||
WRAPPER void CAutomobile::ProcessControl(void) { EAXJMP(0x531470); }
|
||||
WRAPPER void CAutomobile::Teleport(CVector v) { EAXJMP(0x535180); }
|
||||
|
||||
void
|
||||
CAutomobile::Teleport(CVector pos)
|
||||
{
|
||||
CWorld::Remove(this);
|
||||
|
||||
GetPosition() = pos;
|
||||
SetOrientation(0.0f, 0.0f, 0.0f);
|
||||
SetMoveSpeed(0.0f, 0.0f, 0.0f);
|
||||
SetTurnSpeed(0.0f, 0.0f, 0.0f);
|
||||
|
||||
ResetSuspension();
|
||||
|
||||
CWorld::Add(this);
|
||||
}
|
||||
|
||||
WRAPPER void CAutomobile::PreRender(void) { EAXJMP(0x535B40); }
|
||||
WRAPPER void CAutomobile::Render(void) { EAXJMP(0x539EA0); }
|
||||
|
||||
@ -51,16 +73,53 @@ void
|
||||
CAutomobile::SetComponentRotation(int32 component, CVector rotation)
|
||||
{
|
||||
CMatrix mat(RwFrameGetMatrix(m_aCarNodes[component]));
|
||||
CVector pos = *mat.GetPosition();
|
||||
CVector pos = mat.GetPosition();
|
||||
// BUG: all these set the whole matrix
|
||||
mat.SetRotateX(DEGTORAD(rotation.x));
|
||||
mat.SetRotateY(DEGTORAD(rotation.y));
|
||||
mat.SetRotateZ(DEGTORAD(rotation.z));
|
||||
mat.GetPosition() += pos;
|
||||
mat.Translate(pos);
|
||||
mat.UpdateRW();
|
||||
}
|
||||
|
||||
void
|
||||
CAutomobile::OpenDoor(int32 component, eDoors door, float openRatio)
|
||||
{
|
||||
CMatrix mat(RwFrameGetMatrix(m_aCarNodes[component]));
|
||||
CVector pos = mat.GetPosition();
|
||||
float axes[3] = { 0.0f, 0.0f, 0.0f };
|
||||
float wasClosed = false;
|
||||
|
||||
if(Doors[door].IsClosed()){
|
||||
// enable angle cull for closed doors
|
||||
RwFrameForAllObjects(m_aCarNodes[component], CVehicleModelInfo::ClearAtomicFlagCB, (void*)ATOMIC_FLAG_NOCULL);
|
||||
wasClosed = true;
|
||||
}
|
||||
|
||||
Doors[door].Open(openRatio);
|
||||
|
||||
if(wasClosed && Doors[door].RetAngleWhenClosed() != Doors[door].m_fAngle){
|
||||
// door opened
|
||||
HideAllComps();
|
||||
// turn off angle cull for swinging door
|
||||
RwFrameForAllObjects(m_aCarNodes[component], CVehicleModelInfo::SetAtomicFlagCB, (void*)ATOMIC_FLAG_NOCULL);
|
||||
DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_DOOR_OPEN_BONNET + door, 0.0f);
|
||||
}
|
||||
|
||||
if(!wasClosed && openRatio == 0.0f){
|
||||
// door closed
|
||||
if(Damage.GetDoorStatus(door) == DOOR_STATUS_SWINGING)
|
||||
Damage.SetDoorStatus(door, DOOR_STATUS_OK); // huh?
|
||||
ShowAllComps();
|
||||
DMAudio.PlayOneShot(m_audioEntityId, SOUND_CAR_DOOR_CLOSE_BONNET + door, 0.0f);
|
||||
}
|
||||
|
||||
axes[Doors[door].m_nAxis] = Doors[door].m_fAngle;
|
||||
mat.SetRotate(axes[0], axes[1], axes[2]);
|
||||
mat.Translate(pos);
|
||||
mat.UpdateRW();
|
||||
}
|
||||
|
||||
WRAPPER void CAutomobile::OpenDoor(int32, eDoors door, float) { EAXJMP(0x52E750); }
|
||||
WRAPPER void CAutomobile::ProcessOpenDoor(uint32, uint32, float) { EAXJMP(0x52E910); }
|
||||
|
||||
bool
|
||||
@ -139,7 +198,31 @@ CAutomobile::SetUpWheelColModel(CColModel *colModel)
|
||||
return true;
|
||||
}
|
||||
|
||||
WRAPPER void CAutomobile::BurstTyre(uint8 tyre) { EAXJMP(0x53C0E0); }
|
||||
// this probably isn't used in III yet
|
||||
void
|
||||
CAutomobile::BurstTyre(uint8 wheel)
|
||||
{
|
||||
switch(wheel){
|
||||
case CAR_PIECE_WHEEL_LF: wheel = VEHWHEEL_FRONT_LEFT; break;
|
||||
case CAR_PIECE_WHEEL_LR: wheel = VEHWHEEL_REAR_LEFT; break;
|
||||
case CAR_PIECE_WHEEL_RF: wheel = VEHWHEEL_FRONT_RIGHT; break;
|
||||
case CAR_PIECE_WHEEL_RR: wheel = VEHWHEEL_REAR_RIGHT; break;
|
||||
}
|
||||
|
||||
int status = Damage.GetWheelStatus(wheel);
|
||||
if(status == WHEEL_STATUS_OK){
|
||||
Damage.SetWheelStatus(wheel, WHEEL_STATUS_BURST);
|
||||
|
||||
if(m_status == STATUS_SIMPLE){
|
||||
m_status = STATUS_PHYSICS;
|
||||
CCarCtrl::SwitchVehicleToRealPhysics(this);
|
||||
}
|
||||
|
||||
ApplyMoveForce(GetRight() * CGeneral::GetRandomNumberInRange(-0.3f, 0.3f));
|
||||
ApplyTurnForce(GetRight() * CGeneral::GetRandomNumberInRange(-0.3f, 0.3f), GetForward());
|
||||
}
|
||||
}
|
||||
|
||||
WRAPPER bool CAutomobile::IsRoomForPedToLeaveCar(uint32, CVector *) { EAXJMP(0x53C5B0); }
|
||||
|
||||
float
|
||||
@ -148,13 +231,269 @@ CAutomobile::GetHeightAboveRoad(void)
|
||||
return m_fHeightAboveRoad;
|
||||
}
|
||||
|
||||
WRAPPER void CAutomobile::PlayCarHorn(void) { EAXJMP(0x53C450); }
|
||||
void
|
||||
CAutomobile::PlayCarHorn(void)
|
||||
{
|
||||
int r;
|
||||
|
||||
if(m_nCarHornTimer != 0)
|
||||
return;
|
||||
|
||||
r = CGeneral::GetRandomNumber() & 7;
|
||||
if(r < 2){
|
||||
m_nCarHornTimer = 45;
|
||||
}else if(r < 4){
|
||||
if(pDriver)
|
||||
pDriver->Say(SOUND_PED_CAR_COLLISION);
|
||||
m_nCarHornTimer = 45;
|
||||
}else{
|
||||
if(pDriver)
|
||||
pDriver->Say(SOUND_PED_CAR_COLLISION);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
CAutomobile::ResetSuspension(void)
|
||||
{
|
||||
int i;
|
||||
for(i = 0; i < 4; i++){
|
||||
m_aSuspensionSpringRatio[i] = 1.0f;
|
||||
m_aWheelSkidThing[i] = 0.0f;
|
||||
m_aWheelRotation[i] = 0.0f;
|
||||
m_aWheelState[i] = 0; // TODO: enum?
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
CAutomobile::ProcessSwingingDoor(int32 component, eDoors door)
|
||||
{
|
||||
if(Damage.GetDoorStatus(door) != DOOR_STATUS_SWINGING)
|
||||
return;
|
||||
|
||||
CMatrix mat(RwFrameGetMatrix(m_aCarNodes[component]));
|
||||
CVector pos = mat.GetPosition();
|
||||
float axes[3] = { 0.0f, 0.0f, 0.0f };
|
||||
|
||||
WRAPPER void CAutomobile::SpawnFlyingComponent(int32 component, uint32 type) { EAXJMP(0x530300); }
|
||||
Doors[door].Process(this);
|
||||
axes[Doors[door].m_nAxis] = Doors[door].m_fAngle;
|
||||
mat.SetRotate(axes[0], axes[1], axes[2]);
|
||||
mat.Translate(pos);
|
||||
mat.UpdateRW();
|
||||
}
|
||||
|
||||
void
|
||||
CAutomobile::Fix(void)
|
||||
{
|
||||
int component;
|
||||
|
||||
Damage.ResetDamageStatus();
|
||||
|
||||
if(m_handling->Flags & HANDLING_NO_DOORS){
|
||||
Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_MISSING);
|
||||
Damage.SetDoorStatus(DOOR_FRONT_RIGHT, DOOR_STATUS_MISSING);
|
||||
Damage.SetDoorStatus(DOOR_REAR_LEFT, DOOR_STATUS_MISSING);
|
||||
Damage.SetDoorStatus(DOOR_REAR_RIGHT, DOOR_STATUS_MISSING);
|
||||
}
|
||||
|
||||
bIsDamaged = false;
|
||||
RpClumpForAllAtomics((RpClump*)m_rwObject, CVehicleModelInfo::HideAllComponentsAtomicCB, (void*)ATOMIC_FLAG_DAM);
|
||||
|
||||
for(component = CAR_BUMP_FRONT; component < NUM_CAR_NODES; component++){
|
||||
if(m_aCarNodes[component]){
|
||||
CMatrix mat(RwFrameGetMatrix(m_aCarNodes[component]));
|
||||
mat.SetTranslate(mat.GetPosition());
|
||||
mat.UpdateRW();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
CAutomobile::SetupDamageAfterLoad(void)
|
||||
{
|
||||
if(m_aCarNodes[CAR_BUMP_FRONT])
|
||||
SetBumperDamage(CAR_BUMP_FRONT, VEHBUMPER_FRONT);
|
||||
if(m_aCarNodes[CAR_BONNET])
|
||||
SetDoorDamage(CAR_BONNET, DOOR_BONNET);
|
||||
if(m_aCarNodes[CAR_BUMP_REAR])
|
||||
SetBumperDamage(CAR_BUMP_REAR, VEHBUMPER_REAR);
|
||||
if(m_aCarNodes[CAR_BOOT])
|
||||
SetDoorDamage(CAR_BOOT, DOOR_BOOT);
|
||||
if(m_aCarNodes[CAR_DOOR_LF])
|
||||
SetDoorDamage(CAR_DOOR_LF, DOOR_FRONT_LEFT);
|
||||
if(m_aCarNodes[CAR_DOOR_RF])
|
||||
SetDoorDamage(CAR_DOOR_RF, DOOR_FRONT_RIGHT);
|
||||
if(m_aCarNodes[CAR_DOOR_LR])
|
||||
SetDoorDamage(CAR_DOOR_LR, DOOR_REAR_LEFT);
|
||||
if(m_aCarNodes[CAR_DOOR_RR])
|
||||
SetDoorDamage(CAR_DOOR_RR, DOOR_REAR_RIGHT);
|
||||
if(m_aCarNodes[CAR_WING_LF])
|
||||
SetPanelDamage(CAR_WING_LF, VEHPANEL_FRONT_LEFT);
|
||||
if(m_aCarNodes[CAR_WING_RF])
|
||||
SetPanelDamage(CAR_WING_RF, VEHPANEL_FRONT_RIGHT);
|
||||
if(m_aCarNodes[CAR_WING_LR])
|
||||
SetPanelDamage(CAR_WING_LR, VEHPANEL_REAR_LEFT);
|
||||
if(m_aCarNodes[CAR_WING_RR])
|
||||
SetPanelDamage(CAR_WING_RR, VEHPANEL_REAR_RIGHT);
|
||||
}
|
||||
|
||||
RwObject*
|
||||
GetCurrentAtomicObjectCB(RwObject *object, void *data)
|
||||
{
|
||||
RpAtomic *atomic = (RpAtomic*)object;
|
||||
assert(RwObjectGetType(object) == rpATOMIC);
|
||||
if(RpAtomicGetFlags(atomic) & rpATOMICRENDER)
|
||||
*(RpAtomic**)data = atomic;
|
||||
return object;
|
||||
}
|
||||
|
||||
CColPoint aTempPedColPts[32]; // this name doesn't make any sense
|
||||
|
||||
CObject*
|
||||
CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
|
||||
{
|
||||
RpAtomic *atomic;
|
||||
RwFrame *frame;
|
||||
RwMatrix *matrix;
|
||||
CObject *obj;
|
||||
|
||||
if(CObject::nNoTempObjects >= NUMTEMPOBJECTS)
|
||||
return nil;
|
||||
|
||||
atomic = nil;
|
||||
RwFrameForAllObjects(m_aCarNodes[component], GetCurrentAtomicObjectCB, &atomic);
|
||||
if(atomic == nil)
|
||||
return nil;
|
||||
|
||||
obj = new CObject;
|
||||
if(obj == nil)
|
||||
return nil;
|
||||
|
||||
if(component == CAR_WINDSCREEN){
|
||||
obj->SetModelIndexNoCreate(MI_CAR_BONNET);
|
||||
}else switch(type){
|
||||
case COMPGROUP_BUMPER:
|
||||
obj->SetModelIndexNoCreate(MI_CAR_BUMPER);
|
||||
break;
|
||||
case COMPGROUP_WHEEL:
|
||||
obj->SetModelIndexNoCreate(MI_CAR_WHEEL);
|
||||
break;
|
||||
case COMPGROUP_DOOR:
|
||||
obj->SetModelIndexNoCreate(MI_CAR_DOOR);
|
||||
obj->SetCenterOfMass(0.0f, -0.5f, 0.0f);
|
||||
break;
|
||||
case COMPGROUP_BONNET:
|
||||
obj->SetModelIndexNoCreate(MI_CAR_BONNET);
|
||||
obj->SetCenterOfMass(0.0f, 0.4f, 0.0f);
|
||||
break;
|
||||
case COMPGROUP_BOOT:
|
||||
obj->SetModelIndexNoCreate(MI_CAR_BOOT);
|
||||
obj->SetCenterOfMass(0.0f, -0.3f, 0.0f);
|
||||
break;
|
||||
case COMPGROUP_PANEL:
|
||||
default:
|
||||
obj->SetModelIndexNoCreate(MI_CAR_PANEL);
|
||||
break;
|
||||
}
|
||||
|
||||
// object needs base model
|
||||
obj->RefModelInfo(GetModelIndex());
|
||||
|
||||
// create new atomic
|
||||
matrix = RwFrameGetLTM(m_aCarNodes[component]);
|
||||
frame = RwFrameCreate();
|
||||
atomic = RpAtomicClone(atomic);
|
||||
*RwFrameGetMatrix(frame) = *matrix;
|
||||
RpAtomicSetFrame(atomic, frame);
|
||||
CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil);
|
||||
obj->AttachToRwObject((RwObject*)atomic);
|
||||
|
||||
// init object
|
||||
obj->m_fMass = 10.0f;
|
||||
obj->m_fTurnMass = 25.0f;
|
||||
obj->m_fAirResistance = 0.97f;
|
||||
obj->m_fElasticity = 0.1f;
|
||||
obj->m_fBuoyancy = obj->m_fMass*GRAVITY/0.75f;
|
||||
obj->ObjectCreatedBy = TEMP_OBJECT;
|
||||
obj->bIsStatic = true;
|
||||
obj->bIsPickup = false;
|
||||
obj->bUseVehicleColours = true;
|
||||
obj->m_colour1 = m_currentColour1;
|
||||
obj->m_colour2 = m_currentColour2;
|
||||
|
||||
// life time - the more objects the are, the shorter this one will live
|
||||
CObject::nNoTempObjects++;
|
||||
if(CObject::nNoTempObjects > 20)
|
||||
obj->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 20000/5.0f;
|
||||
else if(CObject::nNoTempObjects > 10)
|
||||
obj->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 20000/2.0f;
|
||||
else
|
||||
obj->m_nEndOfLifeTime = CTimer::GetTimeInMilliseconds() + 20000;
|
||||
|
||||
obj->m_vecMoveSpeed = m_vecMoveSpeed;
|
||||
if(obj->m_vecMoveSpeed.z > 0.0f){
|
||||
obj->m_vecMoveSpeed.z *= 1.5f;
|
||||
}else if(GetUp().z > 0.0f &&
|
||||
(component == COMPGROUP_BONNET || component == COMPGROUP_BOOT || component == CAR_WINDSCREEN)){
|
||||
obj->m_vecMoveSpeed.z *= -1.5f;
|
||||
obj->m_vecMoveSpeed.z += 0.04f;
|
||||
}else{
|
||||
obj->m_vecMoveSpeed.z *= 0.25f;
|
||||
}
|
||||
obj->m_vecMoveSpeed.x *= 0.75f;
|
||||
obj->m_vecMoveSpeed.y *= 0.75f;
|
||||
|
||||
obj->m_vecTurnSpeed = m_vecTurnSpeed*2.0f;
|
||||
|
||||
// push component away from car
|
||||
CVector dist = obj->GetPosition() - GetPosition();
|
||||
dist.Normalise();
|
||||
if(component == COMPGROUP_BONNET || component == COMPGROUP_BOOT || component == CAR_WINDSCREEN){
|
||||
// push these up some
|
||||
dist += GetUp();
|
||||
if(GetUp().z > 0.0f){
|
||||
// simulate fast upward movement if going fast
|
||||
float speed = CVector2D(m_vecMoveSpeed).MagnitudeSqr();
|
||||
obj->GetPosition() += GetUp()*speed;
|
||||
}
|
||||
}
|
||||
obj->ApplyMoveForce(dist);
|
||||
|
||||
if(type == COMPGROUP_WHEEL){
|
||||
obj->m_fTurnMass = 5.0f;
|
||||
obj->m_vecTurnSpeed.x = 0.5f;
|
||||
obj->m_fAirResistance = 0.99f;
|
||||
}
|
||||
|
||||
if(CCollision::ProcessColModels(obj->GetMatrix(), *CModelInfo::GetModelInfo(obj->GetModelIndex())->GetColModel(),
|
||||
this->GetMatrix(), *CModelInfo::GetModelInfo(this->GetModelIndex())->GetColModel(),
|
||||
aTempPedColPts, nil, nil) > 0)
|
||||
obj->m_pCollidingEntity = this;
|
||||
|
||||
if(bRenderScorched)
|
||||
obj->bRenderScorched = true;
|
||||
|
||||
CWorld::Add(obj);
|
||||
|
||||
return obj;
|
||||
}
|
||||
|
||||
CObject*
|
||||
CAutomobile::RemoveBonnetInPedCollision(void)
|
||||
{
|
||||
CObject *obj;
|
||||
|
||||
if(Damage.GetDoorStatus(DOOR_BONNET) != DOOR_STATUS_SWINGING &&
|
||||
Doors[DOOR_BONNET].RetAngleWhenOpen()*0.4f < Doors[DOOR_BONNET].m_fAngle){
|
||||
// BUG? why not COMPGROUP_BONNET?
|
||||
obj = SpawnFlyingComponent(CAR_BONNET, COMPGROUP_DOOR);
|
||||
// make both doors invisible on car
|
||||
SetComponentVisibility(m_aCarNodes[CAR_BONNET], ATOMIC_FLAG_NONE);
|
||||
Damage.SetDoorStatus(DOOR_BONNET, DOOR_STATUS_MISSING);
|
||||
return obj;
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
void
|
||||
CAutomobile::SetPanelDamage(int32 component, ePanels panel, bool noFlyingComponents)
|
||||
@ -245,7 +584,7 @@ void
|
||||
CAutomobile::SetComponentVisibility(RwFrame *frame, uint32 flags)
|
||||
{
|
||||
HideAllComps();
|
||||
m_veh_flagC2 = true;
|
||||
bIsDamaged = true;
|
||||
RwFrameForAllObjects(frame, SetVehicleAtomicVisibilityCB, (void*)flags);
|
||||
}
|
||||
|
||||
@ -327,16 +666,26 @@ public:
|
||||
STARTPATCHES
|
||||
InjectHook(0x52D170, &CAutomobile_::dtor, PATCH_JUMP);
|
||||
InjectHook(0x52D190, &CAutomobile_::SetModelIndex_, PATCH_JUMP);
|
||||
InjectHook(0x535180, &CAutomobile_::Teleport_, PATCH_JUMP);
|
||||
InjectHook(0x52E5F0, &CAutomobile_::GetComponentWorldPosition_, PATCH_JUMP);
|
||||
InjectHook(0x52E660, &CAutomobile_::IsComponentPresent_, PATCH_JUMP);
|
||||
InjectHook(0x52E680, &CAutomobile_::SetComponentRotation_, PATCH_JUMP);
|
||||
InjectHook(0x52E750, &CAutomobile_::OpenDoor_, PATCH_JUMP);
|
||||
InjectHook(0x52EF10, &CAutomobile_::IsDoorReady_, PATCH_JUMP);
|
||||
InjectHook(0x52EF90, &CAutomobile_::IsDoorFullyOpen_, PATCH_JUMP);
|
||||
InjectHook(0x52EFD0, &CAutomobile_::IsDoorClosed_, PATCH_JUMP);
|
||||
InjectHook(0x52F000, &CAutomobile_::IsDoorMissing_, PATCH_JUMP);
|
||||
InjectHook(0x53BF40, &CAutomobile_::RemoveRefsToVehicle_, PATCH_JUMP);
|
||||
InjectHook(0x53BF70, &CAutomobile_::SetUpWheelColModel_, PATCH_JUMP);
|
||||
InjectHook(0x53C0E0, &CAutomobile_::BurstTyre_, PATCH_JUMP);
|
||||
InjectHook(0x437690, &CAutomobile_::GetHeightAboveRoad_, PATCH_JUMP);
|
||||
InjectHook(0x53C450, &CAutomobile_::PlayCarHorn_, PATCH_JUMP);
|
||||
InjectHook(0x5353A0, &CAutomobile::ResetSuspension, PATCH_JUMP);
|
||||
InjectHook(0x535250, &CAutomobile::ProcessSwingingDoor, PATCH_JUMP);
|
||||
InjectHook(0x53C240, &CAutomobile::Fix, PATCH_JUMP);
|
||||
InjectHook(0x53C310, &CAutomobile::SetupDamageAfterLoad, PATCH_JUMP);
|
||||
InjectHook(0x530300, &CAutomobile::SpawnFlyingComponent, PATCH_JUMP);
|
||||
InjectHook(0x535320, &CAutomobile::RemoveBonnetInPedCollision, PATCH_JUMP);
|
||||
InjectHook(0x5301A0, &CAutomobile::SetPanelDamage, PATCH_JUMP);
|
||||
InjectHook(0x530120, &CAutomobile::SetBumperDamage, PATCH_JUMP);
|
||||
InjectHook(0x530200, &CAutomobile::SetDoorDamage, PATCH_JUMP);
|
||||
|
@ -4,6 +4,8 @@
|
||||
#include "DamageManager.h"
|
||||
#include "Door.h"
|
||||
|
||||
class CObject;
|
||||
|
||||
class CAutomobile : public CVehicle
|
||||
{
|
||||
public:
|
||||
@ -69,7 +71,7 @@ public:
|
||||
void GetComponentWorldPosition(int32 component, CVector &pos);
|
||||
bool IsComponentPresent(int32 component);
|
||||
void SetComponentRotation(int32 component, CVector rotation);
|
||||
void OpenDoor(int32, eDoors door, float);
|
||||
void OpenDoor(int32 component, eDoors door, float openRatio);
|
||||
void ProcessOpenDoor(uint32, uint32, float);
|
||||
bool IsDoorReady(eDoors door);
|
||||
bool IsDoorFullyOpen(eDoors door);
|
||||
@ -83,12 +85,16 @@ public:
|
||||
float GetHeightAboveRoad(void);
|
||||
void PlayCarHorn(void);
|
||||
|
||||
void SpawnFlyingComponent(int32 component, uint32 type);
|
||||
|
||||
void SetPanelDamage(int32 component, ePanels panel, bool noFlyingComponents);
|
||||
void SetBumperDamage(int32 component, ePanels panel, bool noFlyingComponents);
|
||||
void SetDoorDamage(int32 component, eDoors door, bool noFlyingComponents);
|
||||
void ProcessSwingingDoor(int32 component, eDoors door);
|
||||
void ResetSuspension(void);
|
||||
void SetupDamageAfterLoad(void);
|
||||
CObject *SpawnFlyingComponent(int32 component, uint32 type);
|
||||
CObject *RemoveBonnetInPedCollision(void);
|
||||
void SetPanelDamage(int32 component, ePanels panel, bool noFlyingComponents = false);
|
||||
void SetBumperDamage(int32 component, ePanels panel, bool noFlyingComponents = false);
|
||||
void SetDoorDamage(int32 component, eDoors door, bool noFlyingComponents = false);
|
||||
|
||||
void Fix(void);
|
||||
void SetComponentVisibility(RwFrame *frame, uint32 flags);
|
||||
void SetupModelNodes(void);
|
||||
void SetTaxiLight(bool light);
|
||||
|
@ -20,6 +20,12 @@ enum ePanelStatus
|
||||
PANEL_STATUS_MISSING,
|
||||
};
|
||||
|
||||
enum eWheelStatus
|
||||
{
|
||||
WHEEL_STATUS_OK,
|
||||
WHEEL_STATUS_BURST
|
||||
};
|
||||
|
||||
enum tComponent
|
||||
{
|
||||
COMPONENT_DEFAULT,
|
||||
|
@ -88,6 +88,14 @@ enum eLights
|
||||
VEHLIGHT_REAR_RIGHT,
|
||||
};
|
||||
|
||||
enum eWheels
|
||||
{
|
||||
VEHWHEEL_FRONT_LEFT,
|
||||
VEHWHEEL_FRONT_RIGHT,
|
||||
VEHWHEEL_REAR_LEFT,
|
||||
VEHWHEEL_REAR_RIGHT,
|
||||
};
|
||||
|
||||
enum
|
||||
{
|
||||
CAR_PIECE_WHEEL_LF = 13,
|
||||
@ -142,7 +150,7 @@ public:
|
||||
uint8 m_veh_flagB80 : 1;
|
||||
|
||||
uint8 m_veh_flagC1 : 1;
|
||||
uint8 m_veh_flagC2 : 1; // bIsDamaged
|
||||
uint8 bIsDamaged : 1;
|
||||
uint8 m_veh_flagC4 : 1;
|
||||
uint8 m_veh_flagC8 : 1;
|
||||
uint8 m_veh_flagC10 : 1;
|
||||
|
Loading…
Reference in New Issue
Block a user