mirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2024-12-24 17:55:29 +00:00
Code Issues Projects Releases Wiki Activity

Original enum name

Browse source
This commit is contained in:
Sergeanur 2020-11-24 17:15:51 +02:00
parent 1906a08f72
commit 8f5e60f787
9 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/modelinfo/VehicleModelInfo.cpp
View file

@ -484,7 +484,7 @@ CVehicleModelInfo::SetAtomicRenderCallbacks(void)
RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_BigVehicle, nil); RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_BigVehicle, nil);
else if(m_vehicleType == VEHICLE_TYPE_BOAT) else if(m_vehicleType == VEHICLE_TYPE_BOAT)
RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_Boat, m_clump); RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_Boat, m_clump);
else if(mod_HandlingManager.GetHandlingData((eHandlingId)m_handlingId)->Flags & HANDLING_IS_HELI) else if(mod_HandlingManager.GetHandlingData((tVehicleType)m_handlingId)->Flags & HANDLING_IS_HELI)
RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_RealHeli, m_clump); RpClumpForAllAtomics(m_clump, SetAtomicRendererCB_RealHeli, m_clump);
else else
RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, m_clump); RpClumpForAllAtomics(m_clump, SetAtomicRendererCB, m_clump);
@ -614,7 +614,7 @@ CVehicleModelInfo::SetVehicleComponentFlags(RwFrame *frame, uint32 flags)
{ {
tHandlingData *handling; tHandlingData *handling;
handling = mod_HandlingManager.GetHandlingData((eHandlingId)m_handlingId); handling = mod_HandlingManager.GetHandlingData((tVehicleType)m_handlingId);
#define SETFLAGS(f) RwFrameForAllObjects(frame, SetAtomicFlagCB, (void*)(f)) #define SETFLAGS(f) RwFrameForAllObjects(frame, SetAtomicFlagCB, (void*)(f))

4
src/vehicles/Automobile.cpp
View file

@ -100,8 +100,8 @@ CAutomobile::CAutomobile(int32 id, uint8 CreatedBy)
break; break;
} }
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((tVehicleType)mi->m_handlingId);
pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)mi->m_handlingId); pFlyingHandling = mod_HandlingManager.GetFlyingPointer((tVehicleType)mi->m_handlingId);
m_auto_unused1 = 20.0f; m_auto_unused1 = 20.0f;
m_auto_unused2 = 0; m_auto_unused2 = 0;

6
src/vehicles/Bike.cpp
View file

@ -93,9 +93,9 @@ CBike::CBike(int32 id, uint8 CreatedBy)
SetModelIndex(id); SetModelIndex(id);
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((tVehicleType)mi->m_handlingId);
pBikeHandling = mod_HandlingManager.GetBikePointer((eHandlingId)mi->m_handlingId); pBikeHandling = mod_HandlingManager.GetBikePointer((tVehicleType)mi->m_handlingId);
pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)mi->m_handlingId); pFlyingHandling = mod_HandlingManager.GetFlyingPointer((tVehicleType)mi->m_handlingId);
m_bike_unused1 = 20.0f; m_bike_unused1 = 20.0f;
m_bike_unused2 = 0; m_bike_unused2 = 0;

6
src/vehicles/Boat.cpp
View file

@ -63,9 +63,9 @@ CBoat::CBoat(int mi, uint8 owner) : CVehicle(owner)
m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds(); m_nPoliceShoutTimer = CTimer::GetTimeInMilliseconds();
SetModelIndex(mi); SetModelIndex(mi);
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)minfo->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((tVehicleType)minfo->m_handlingId);
pFlyingHandling = mod_HandlingManager.GetFlyingPointer((eHandlingId)minfo->m_handlingId); pFlyingHandling = mod_HandlingManager.GetFlyingPointer((tVehicleType)minfo->m_handlingId);
pBoatHandling = mod_HandlingManager.GetBoatPointer((eHandlingId)minfo->m_handlingId); pBoatHandling = mod_HandlingManager.GetBoatPointer((tVehicleType)minfo->m_handlingId);
minfo->ChooseVehicleColour(m_currentColour1, m_currentColour2); minfo->ChooseVehicleColour(m_currentColour1, m_currentColour2);
m_fMass = pHandling->fMass; m_fMass = pHandling->fMass;

8
src/vehicles/HandlingMgr.cpp
View file

@ -187,7 +187,7 @@ cHandlingDataMgr::LoadHandlingData(void)
handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS); handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
assert(handlingId >= 0 && handlingId < NUMHANDLINGS); assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
bikeHandling = GetBikePointer(handlingId); bikeHandling = GetBikePointer(handlingId);
bikeHandling->nIdentifier = (eHandlingId)handlingId; bikeHandling->nIdentifier = (tVehicleType)handlingId;
break; break;
case 2: bikeHandling->fLeanFwdCOM = atof(word); break; case 2: bikeHandling->fLeanFwdCOM = atof(word); break;
case 3: bikeHandling->fLeanFwdForce = atof(word); break; case 3: bikeHandling->fLeanFwdForce = atof(word); break;
@ -220,7 +220,7 @@ cHandlingDataMgr::LoadHandlingData(void)
handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS); handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
assert(handlingId >= 0 && handlingId < NUMHANDLINGS); assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
flyingHandling = GetFlyingPointer(handlingId); flyingHandling = GetFlyingPointer(handlingId);
flyingHandling->nIdentifier = (eHandlingId)handlingId; flyingHandling->nIdentifier = (tVehicleType)handlingId;
break; break;
case 2: flyingHandling->fThrust = atof(word); break; case 2: flyingHandling->fThrust = atof(word); break;
case 3: flyingHandling->fThrustFallOff = atof(word); break; case 3: flyingHandling->fThrustFallOff = atof(word); break;
@ -255,7 +255,7 @@ cHandlingDataMgr::LoadHandlingData(void)
handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS); handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
assert(handlingId >= 0 && handlingId < NUMHANDLINGS); assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
boatHandling = GetBoatPointer(handlingId); boatHandling = GetBoatPointer(handlingId);
boatHandling->nIdentifier = (eHandlingId)handlingId; boatHandling->nIdentifier = (tVehicleType)handlingId;
break; break;
case 2: boatHandling->fThrustY = atof(word); break; case 2: boatHandling->fThrustY = atof(word); break;
case 3: boatHandling->fThrustZ = atof(word); break; case 3: boatHandling->fThrustZ = atof(word); break;
@ -284,7 +284,7 @@ cHandlingDataMgr::LoadHandlingData(void)
handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS); handlingId = FindExactWord(word, (const char*)VehicleNames, 14, NUMHANDLINGS);
assert(handlingId >= 0 && handlingId < NUMHANDLINGS); assert(handlingId >= 0 && handlingId < NUMHANDLINGS);
handling = &HandlingData[handlingId]; handling = &HandlingData[handlingId];
handling->nIdentifier = (eHandlingId)handlingId; handling->nIdentifier = (tVehicleType)handlingId;
break; break;
case 1: handling->fMass = atof(word); break; case 1: handling->fMass = atof(word); break;
case 2: handling->Dimension.x = atof(word); break; case 2: handling->Dimension.x = atof(word); break;

16
src/vehicles/HandlingMgr.h
View file

@ -2,7 +2,7 @@
#include "Transmission.h" #include "Transmission.h"
enum eHandlingId enum tVehicleType
{ {
HANDLING_LANDSTAL, HANDLING_LANDSTAL,
HANDLING_IDAHO, HANDLING_IDAHO,
@ -154,7 +154,7 @@ enum
struct tHandlingData struct tHandlingData
{ {
eHandlingId nIdentifier; tVehicleType nIdentifier;
float fMass; float fMass;
float fInvMass; float fInvMass;
float fTurnMass; float fTurnMass;
@ -187,7 +187,7 @@ struct tHandlingData
struct tBikeHandlingData struct tBikeHandlingData
{ {
eHandlingId nIdentifier; tVehicleType nIdentifier;
float fLeanFwdCOM; float fLeanFwdCOM;
float fLeanFwdForce; float fLeanFwdForce;
float fLeanBakCOM; float fLeanBakCOM;
@ -207,7 +207,7 @@ struct tBikeHandlingData
struct tBoatHandlingData struct tBoatHandlingData
{ {
eHandlingId nIdentifier; tVehicleType nIdentifier;
float fThrustY; float fThrustY;
float fThrustZ; float fThrustZ;
float fThrustAppZ; float fThrustAppZ;
@ -222,7 +222,7 @@ struct tBoatHandlingData
struct tFlyingHandlingData struct tFlyingHandlingData
{ {
eHandlingId nIdentifier; tVehicleType nIdentifier;
float fThrust; float fThrust;
float fThrustFallOff; float fThrustFallOff;
float fYaw; float fYaw;
@ -261,11 +261,11 @@ public:
void ConvertDataToGameUnits(tHandlingData *handling); void ConvertDataToGameUnits(tHandlingData *handling);
void ConvertBikeDataToGameUnits(tBikeHandlingData *handling); void ConvertBikeDataToGameUnits(tBikeHandlingData *handling);
int32 GetHandlingId(const char *name); int32 GetHandlingId(const char *name);
tHandlingData *GetHandlingData(eHandlingId id) { return &HandlingData[id]; } tHandlingData *GetHandlingData(tVehicleType id) { return &HandlingData[id]; }
tBikeHandlingData *GetBikePointer(uint8 id) { return &BikeHandlingData[id-HANDLING_BIKE]; } tBikeHandlingData *GetBikePointer(uint8 id) { return &BikeHandlingData[id-HANDLING_BIKE]; }
tFlyingHandlingData *GetFlyingPointer(uint8 id); tFlyingHandlingData *GetFlyingPointer(uint8 id);
tBoatHandlingData *GetBoatPointer(uint8 id); tBoatHandlingData *GetBoatPointer(uint8 id);
bool HasRearWheelDrive(eHandlingId id) { return HandlingData[id].Transmission.nDriveType == 'R'; } bool HasRearWheelDrive(tVehicleType id) { return HandlingData[id].Transmission.nDriveType == 'R'; }
bool HasFrontWheelDrive(eHandlingId id) { return HandlingData[id].Transmission.nDriveType == 'F'; } bool HasFrontWheelDrive(tVehicleType id) { return HandlingData[id].Transmission.nDriveType == 'F'; }
}; };
extern cHandlingDataMgr mod_HandlingManager; extern cHandlingDataMgr mod_HandlingManager;

2
src/vehicles/Heli.cpp
View file

@ -57,7 +57,7 @@ CHeli::CHeli(int32 id, uint8 CreatedBy)
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id); CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
m_vehType = VEHICLE_TYPE_HELI; m_vehType = VEHICLE_TYPE_HELI;
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((tVehicleType)mi->m_handlingId);
SetModelIndex(id); SetModelIndex(id);
m_heliStatus = HELI_STATUS_HOVER; m_heliStatus = HELI_STATUS_HOVER;
m_pathState = 0; m_pathState = 0;

2
src/vehicles/Plane.cpp
View file

@ -70,7 +70,7 @@ CPlane::CPlane(int32 id, uint8 CreatedBy)
{ {
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id); CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
m_vehType = VEHICLE_TYPE_PLANE; m_vehType = VEHICLE_TYPE_PLANE;
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((tVehicleType)mi->m_handlingId);
SetModelIndex(id); SetModelIndex(id);
m_fMass = 100000000.0f; m_fMass = 100000000.0f;

2
src/vehicles/Train.cpp
View file

@ -44,7 +44,7 @@ CTrain::CTrain(int32 id, uint8 CreatedBy)
#ifdef GTA_TRAIN #ifdef GTA_TRAIN
CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id); CVehicleModelInfo *mi = (CVehicleModelInfo*)CModelInfo::GetModelInfo(id);
m_vehType = VEHICLE_TYPE_TRAIN; m_vehType = VEHICLE_TYPE_TRAIN;
pHandling = mod_HandlingManager.GetHandlingData((eHandlingId)mi->m_handlingId); pHandling = mod_HandlingManager.GetHandlingData((tVehicleType)mi->m_handlingId);
SetModelIndex(id); SetModelIndex(id);
Doors[0].Init(0.8f, 0.0f, 1, 0); Doors[0].Init(0.8f, 0.0f, 1, 0);