mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 06:00:00 +00:00
uint8 enums fixed
This commit is contained in:
parent
14eb0cd286
commit
4696e3f9c8
|
@ -52,8 +52,8 @@ uint32 gHomeNextTime;
|
||||||
uint32 gCellNextTime;
|
uint32 gCellNextTime;
|
||||||
uint32 gNextCryTime;
|
uint32 gNextCryTime;
|
||||||
|
|
||||||
enum PLAY_STATUS : uint8 { PLAY_STATUS_STOPPED = 0, PLAY_STATUS_PLAYING, PLAY_STATUS_FINISHED };
|
enum PLAY_STATUS { PLAY_STATUS_STOPPED = 0, PLAY_STATUS_PLAYING, PLAY_STATUS_FINISHED };
|
||||||
enum LOADING_STATUS : uint8 { LOADING_STATUS_NOT_LOADED = 0, LOADING_STATUS_LOADED, LOADING_STATUS_FAILED };
|
enum LOADING_STATUS { LOADING_STATUS_NOT_LOADED = 0, LOADING_STATUS_LOADED, LOADING_STATUS_FAILED };
|
||||||
|
|
||||||
void
|
void
|
||||||
cAudioManager::PreInitialiseGameSpecificSetup() const
|
cAudioManager::PreInitialiseGameSpecificSetup() const
|
||||||
|
|
|
@ -103,9 +103,9 @@ void CAutoPilot::Load(uint8*& buf)
|
||||||
m_nNextDirection = ReadSaveBuf<int8>(buf);
|
m_nNextDirection = ReadSaveBuf<int8>(buf);
|
||||||
m_nCurrentLane = ReadSaveBuf<int8>(buf);
|
m_nCurrentLane = ReadSaveBuf<int8>(buf);
|
||||||
m_nNextLane = ReadSaveBuf<int8>(buf);
|
m_nNextLane = ReadSaveBuf<int8>(buf);
|
||||||
m_nDrivingStyle = (eCarDrivingStyle)ReadSaveBuf<uint8>(buf);
|
m_nDrivingStyle = ReadSaveBuf<uint8>(buf);
|
||||||
m_nCarMission = (eCarMission)ReadSaveBuf<uint8>(buf);
|
m_nCarMission = ReadSaveBuf<uint8>(buf);
|
||||||
m_nTempAction = (eCarTempAction)ReadSaveBuf<uint8>(buf);
|
m_nTempAction = ReadSaveBuf<uint8>(buf);
|
||||||
m_nTimeTempAction = ReadSaveBuf<uint32>(buf);
|
m_nTimeTempAction = ReadSaveBuf<uint32>(buf);
|
||||||
m_fMaxTrafficSpeed = ReadSaveBuf<float>(buf);
|
m_fMaxTrafficSpeed = ReadSaveBuf<float>(buf);
|
||||||
m_nCruiseSpeed = ReadSaveBuf<uint8>(buf);
|
m_nCruiseSpeed = ReadSaveBuf<uint8>(buf);
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
class CVehicle;
|
class CVehicle;
|
||||||
struct CPathNode;
|
struct CPathNode;
|
||||||
|
|
||||||
enum eCarMission : uint8
|
enum eCarMission
|
||||||
{
|
{
|
||||||
MISSION_NONE,
|
MISSION_NONE,
|
||||||
MISSION_CRUISE,
|
MISSION_CRUISE,
|
||||||
|
@ -28,7 +28,7 @@ enum eCarMission : uint8
|
||||||
MISSION_BLOCKCAR_HANDBRAKESTOP,
|
MISSION_BLOCKCAR_HANDBRAKESTOP,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum eCarTempAction : uint8
|
enum eCarTempAction
|
||||||
{
|
{
|
||||||
TEMPACT_NONE,
|
TEMPACT_NONE,
|
||||||
TEMPACT_WAIT,
|
TEMPACT_WAIT,
|
||||||
|
@ -43,7 +43,7 @@ enum eCarTempAction : uint8
|
||||||
TEMPACT_SWERVERIGHT
|
TEMPACT_SWERVERIGHT
|
||||||
};
|
};
|
||||||
|
|
||||||
enum eCarDrivingStyle : uint8
|
enum eCarDrivingStyle
|
||||||
{
|
{
|
||||||
DRIVINGSTYLE_STOP_FOR_CARS,
|
DRIVINGSTYLE_STOP_FOR_CARS,
|
||||||
DRIVINGSTYLE_SLOW_DOWN_FOR_CARS,
|
DRIVINGSTYLE_SLOW_DOWN_FOR_CARS,
|
||||||
|
@ -69,9 +69,9 @@ public:
|
||||||
int8 m_nNextDirection;
|
int8 m_nNextDirection;
|
||||||
int8 m_nCurrentLane;
|
int8 m_nCurrentLane;
|
||||||
int8 m_nNextLane;
|
int8 m_nNextLane;
|
||||||
eCarDrivingStyle m_nDrivingStyle;
|
uint8 m_nDrivingStyle;
|
||||||
eCarMission m_nCarMission;
|
uint8 m_nCarMission;
|
||||||
eCarTempAction m_nTempAction;
|
uint8 m_nTempAction;
|
||||||
uint32 m_nTimeTempAction;
|
uint32 m_nTimeTempAction;
|
||||||
float m_fMaxTrafficSpeed;
|
float m_fMaxTrafficSpeed;
|
||||||
uint8 m_nCruiseSpeed;
|
uint8 m_nCruiseSpeed;
|
||||||
|
|
|
@ -539,7 +539,7 @@ void CCarAI::TellCarToBlockOtherCar(CVehicle* pVehicle, CVehicle* pTarget)
|
||||||
pVehicle->AutoPilot.m_nCruiseSpeed = Max(6, pVehicle->AutoPilot.m_nCruiseSpeed);
|
pVehicle->AutoPilot.m_nCruiseSpeed = Max(6, pVehicle->AutoPilot.m_nCruiseSpeed);
|
||||||
}
|
}
|
||||||
|
|
||||||
eCarMission CCarAI::FindPoliceCarMissionForWantedLevel()
|
uint8 CCarAI::FindPoliceCarMissionForWantedLevel()
|
||||||
{
|
{
|
||||||
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel){
|
switch (CWorld::Players[CWorld::PlayerInFocus].m_pPed->m_pWanted->m_nWantedLevel){
|
||||||
case 0:
|
case 0:
|
||||||
|
|
|
@ -19,7 +19,7 @@ public:
|
||||||
static void TellOccupantsToLeaveCar(CVehicle*);
|
static void TellOccupantsToLeaveCar(CVehicle*);
|
||||||
static void TellCarToRamOtherCar(CVehicle*, CVehicle*);
|
static void TellCarToRamOtherCar(CVehicle*, CVehicle*);
|
||||||
static void TellCarToBlockOtherCar(CVehicle*, CVehicle*);
|
static void TellCarToBlockOtherCar(CVehicle*, CVehicle*);
|
||||||
static eCarMission FindPoliceCarMissionForWantedLevel();
|
static uint8 FindPoliceCarMissionForWantedLevel();
|
||||||
static int32 FindPoliceCarSpeedForWantedLevel(CVehicle*);
|
static int32 FindPoliceCarSpeedForWantedLevel(CVehicle*);
|
||||||
static void MellowOutChaseSpeed(CVehicle*);
|
static void MellowOutChaseSpeed(CVehicle*);
|
||||||
static void MakeWayForCarWithSiren(CVehicle *veh);
|
static void MakeWayForCarWithSiren(CVehicle *veh);
|
||||||
|
|
|
@ -535,7 +535,7 @@ CPickups::GenerateNewOne(CVector pos, uint32 modelIndex, uint8 type, uint32 quan
|
||||||
|
|
||||||
if (slot >= NUMPICKUPS) return -1;
|
if (slot >= NUMPICKUPS) return -1;
|
||||||
|
|
||||||
aPickUps[slot].m_eType = (ePickupType)type;
|
aPickUps[slot].m_eType = type;
|
||||||
aPickUps[slot].m_bRemoved = false;
|
aPickUps[slot].m_bRemoved = false;
|
||||||
aPickUps[slot].m_nQuantity = quantity;
|
aPickUps[slot].m_nQuantity = quantity;
|
||||||
if (type == PICKUP_ONCE_TIMEOUT)
|
if (type == PICKUP_ONCE_TIMEOUT)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "Weapon.h"
|
#include "Weapon.h"
|
||||||
|
|
||||||
enum ePickupType : uint8
|
enum ePickupType
|
||||||
{
|
{
|
||||||
PICKUP_NONE = 0,
|
PICKUP_NONE = 0,
|
||||||
PICKUP_IN_SHOP,
|
PICKUP_IN_SHOP,
|
||||||
|
@ -29,7 +29,7 @@ class CPlayerPed;
|
||||||
class CPickup
|
class CPickup
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ePickupType m_eType;
|
uint8 m_eType;
|
||||||
bool m_bRemoved;
|
bool m_bRemoved;
|
||||||
uint16 m_nQuantity;
|
uint16 m_nQuantity;
|
||||||
CObject *m_pObject;
|
CObject *m_pObject;
|
||||||
|
|
|
@ -3593,7 +3593,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
|
||||||
CollectParameters(&m_nIp, 2);
|
CollectParameters(&m_nIp, 2);
|
||||||
CVehicle* car = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
|
CVehicle* car = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
|
||||||
script_assert(car);
|
script_assert(car);
|
||||||
car->AutoPilot.m_nDrivingStyle = (eCarDrivingStyle)ScriptParams[1];
|
car->AutoPilot.m_nDrivingStyle = (uint8)ScriptParams[1];
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
case COMMAND_SET_CAR_MISSION:
|
case COMMAND_SET_CAR_MISSION:
|
||||||
|
@ -3601,7 +3601,7 @@ int8 CRunningScript::ProcessCommands100To199(int32 command)
|
||||||
CollectParameters(&m_nIp, 2);
|
CollectParameters(&m_nIp, 2);
|
||||||
CVehicle* car = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
|
CVehicle* car = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
|
||||||
script_assert(car);
|
script_assert(car);
|
||||||
car->AutoPilot.m_nCarMission = (eCarMission)ScriptParams[1];
|
car->AutoPilot.m_nCarMission = (uint8)ScriptParams[1];
|
||||||
car->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds();
|
car->AutoPilot.m_nAntiReverseTimer = CTimer::GetTimeInMilliseconds();
|
||||||
car->bEngineOn = true;
|
car->bEngineOn = true;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -1436,7 +1436,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
|
||||||
CollectParameters(&m_nIp, 2);
|
CollectParameters(&m_nIp, 2);
|
||||||
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
|
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
|
||||||
script_assert(pVehicle);
|
script_assert(pVehicle);
|
||||||
pVehicle->SetStatus((eEntityStatus)ScriptParams[1]);
|
pVehicle->SetStatus((uint8)ScriptParams[1]);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
case COMMAND_IS_CHAR_MALE:
|
case COMMAND_IS_CHAR_MALE:
|
||||||
|
|
|
@ -1537,7 +1537,7 @@ CWorld::CallOffChaseForAreaSectorListVehicles(CPtrList &list, float x1, float y1
|
||||||
if(pVehicle->m_scanCode != GetCurrentScanCode()) {
|
if(pVehicle->m_scanCode != GetCurrentScanCode()) {
|
||||||
pVehicle->m_scanCode = GetCurrentScanCode();
|
pVehicle->m_scanCode = GetCurrentScanCode();
|
||||||
const CVector &vehiclePos = pVehicle->GetPosition();
|
const CVector &vehiclePos = pVehicle->GetPosition();
|
||||||
eCarMission carMission = pVehicle->AutoPilot.m_nCarMission;
|
uint8 carMission = pVehicle->AutoPilot.m_nCarMission;
|
||||||
if(pVehicle != FindPlayerVehicle() && vehiclePos.x > fStartX && vehiclePos.x < fEndX &&
|
if(pVehicle != FindPlayerVehicle() && vehiclePos.x > fStartX && vehiclePos.x < fEndX &&
|
||||||
vehiclePos.y > fStartY && vehiclePos.y < fEndY && pVehicle->bIsLawEnforcer &&
|
vehiclePos.y > fStartY && vehiclePos.y < fEndY && pVehicle->bIsLawEnforcer &&
|
||||||
(carMission == MISSION_RAMPLAYER_FARAWAY || carMission == MISSION_RAMPLAYER_CLOSE ||
|
(carMission == MISSION_RAMPLAYER_FARAWAY || carMission == MISSION_RAMPLAYER_CLOSE ||
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
struct CReference;
|
struct CReference;
|
||||||
class CPtrList;
|
class CPtrList;
|
||||||
|
|
||||||
enum eEntityType : uint8
|
enum eEntityType
|
||||||
{
|
{
|
||||||
ENTITY_TYPE_NOTHING = 0,
|
ENTITY_TYPE_NOTHING = 0,
|
||||||
ENTITY_TYPE_BUILDING,
|
ENTITY_TYPE_BUILDING,
|
||||||
|
@ -16,7 +16,7 @@ enum eEntityType : uint8
|
||||||
ENTITY_TYPE_DUMMY,
|
ENTITY_TYPE_DUMMY,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum eEntityStatus : uint8
|
enum eEntityStatus
|
||||||
{
|
{
|
||||||
STATUS_PLAYER,
|
STATUS_PLAYER,
|
||||||
STATUS_PLAYER_PLAYBACKFROMBUFFER,
|
STATUS_PLAYER_PLAYBACKFROMBUFFER,
|
||||||
|
@ -92,10 +92,10 @@ public:
|
||||||
CReference *m_pFirstReference;
|
CReference *m_pFirstReference;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
eEntityType GetType() const { return (eEntityType)m_type; }
|
uint8 GetType() const { return m_type; }
|
||||||
void SetType(eEntityType type) { m_type = type; }
|
void SetType(uint8 type) { m_type = type; }
|
||||||
eEntityStatus GetStatus() const { return (eEntityStatus)m_status; }
|
uint8 GetStatus() const { return m_status; }
|
||||||
void SetStatus(eEntityStatus status) { m_status = status; }
|
void SetStatus(uint8 status) { m_status = status; }
|
||||||
CColModel *GetColModel(void) { return CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); }
|
CColModel *GetColModel(void) { return CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); }
|
||||||
bool GetIsStatic(void) const { return bIsStatic; }
|
bool GetIsStatic(void) const { return bIsStatic; }
|
||||||
void SetIsStatic(bool state) { bIsStatic = state; }
|
void SetIsStatic(bool state) { bIsStatic = state; }
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#define MAX_MODEL_NAME (24)
|
#define MAX_MODEL_NAME (24)
|
||||||
|
|
||||||
enum ModelInfoType : uint8
|
enum ModelInfoType
|
||||||
{
|
{
|
||||||
MITYPE_NA = 0,
|
MITYPE_NA = 0,
|
||||||
MITYPE_SIMPLE = 1,
|
MITYPE_SIMPLE = 1,
|
||||||
|
@ -15,7 +15,6 @@ enum ModelInfoType : uint8
|
||||||
MITYPE_PED = 6,
|
MITYPE_PED = 6,
|
||||||
MITYPE_XTRACOMPS = 7,
|
MITYPE_XTRACOMPS = 7,
|
||||||
};
|
};
|
||||||
VALIDATE_SIZE(ModelInfoType, 1);
|
|
||||||
|
|
||||||
class C2dEffect;
|
class C2dEffect;
|
||||||
|
|
||||||
|
@ -28,7 +27,7 @@ protected:
|
||||||
int16 m_objectId;
|
int16 m_objectId;
|
||||||
uint16 m_refCount;
|
uint16 m_refCount;
|
||||||
int16 m_txdSlot;
|
int16 m_txdSlot;
|
||||||
ModelInfoType m_type;
|
uint8 m_type;
|
||||||
uint8 m_num2dEffects;
|
uint8 m_num2dEffects;
|
||||||
bool m_bOwnsColModel;
|
bool m_bOwnsColModel;
|
||||||
#ifdef EXTRA_MODEL_FLAGS
|
#ifdef EXTRA_MODEL_FLAGS
|
||||||
|
@ -50,7 +49,7 @@ public:
|
||||||
virtual RwObject *GetRwObject(void) = 0;
|
virtual RwObject *GetRwObject(void) = 0;
|
||||||
|
|
||||||
// one day it becomes virtual
|
// one day it becomes virtual
|
||||||
ModelInfoType GetModelType() const { return m_type; }
|
uint8 GetModelType() const { return m_type; }
|
||||||
bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
|
bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
|
||||||
bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE ||
|
bool IsClump(void) { return m_type == MITYPE_CLUMP || m_type == MITYPE_PED || m_type == MITYPE_VEHICLE ||
|
||||||
m_type == MITYPE_MLO || m_type == MITYPE_XTRACOMPS; // unused but what the heck
|
m_type == MITYPE_MLO || m_type == MITYPE_XTRACOMPS; // unused but what the heck
|
||||||
|
|
|
@ -212,7 +212,7 @@ enum PedOnGroundState {
|
||||||
PED_DEAD_ON_THE_FLOOR
|
PED_DEAD_ON_THE_FLOOR
|
||||||
};
|
};
|
||||||
|
|
||||||
enum PointBlankNecessity : uint8 {
|
enum PointBlankNecessity {
|
||||||
NO_POINT_BLANK_PED,
|
NO_POINT_BLANK_PED,
|
||||||
POINT_BLANK_FOR_WANTED_PED,
|
POINT_BLANK_FOR_WANTED_PED,
|
||||||
POINT_BLANK_FOR_SOMEONE_ELSE
|
POINT_BLANK_FOR_SOMEONE_ELSE
|
||||||
|
@ -598,7 +598,7 @@ public:
|
||||||
#endif
|
#endif
|
||||||
bool CheckForExplosions(CVector2D &area);
|
bool CheckForExplosions(CVector2D &area);
|
||||||
CPed *CheckForGunShots(void);
|
CPed *CheckForGunShots(void);
|
||||||
PointBlankNecessity CheckForPointBlankPeds(CPed*);
|
uint8 CheckForPointBlankPeds(CPed*);
|
||||||
bool CheckIfInTheAir(void);
|
bool CheckIfInTheAir(void);
|
||||||
void ClearAll(void);
|
void ClearAll(void);
|
||||||
void SetPointGunAt(CEntity*);
|
void SetPointGunAt(CEntity*);
|
||||||
|
|
|
@ -329,7 +329,7 @@ CPed::SetAttack(CEntity *victim)
|
||||||
if (IsPlayer())
|
if (IsPlayer())
|
||||||
CPad::GetPad(0)->ResetAverageWeapon();
|
CPad::GetPad(0)->ResetAverageWeapon();
|
||||||
|
|
||||||
PointBlankNecessity pointBlankStatus;
|
uint8 pointBlankStatus;
|
||||||
if ((curWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT || GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER)
|
if ((curWeapon->m_eWeaponFire == WEAPON_FIRE_INSTANT_HIT || GetWeapon()->m_eWeaponType == WEAPONTYPE_FLAMETHROWER)
|
||||||
&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
|
&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON
|
||||||
&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON_RUNABOUT
|
&& TheCamera.PlayerWeaponMode.Mode != CCam::MODE_M16_1STPERSON_RUNABOUT
|
||||||
|
@ -475,7 +475,7 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
|
||||||
ped->ClearAttack();
|
ped->ClearAttack();
|
||||||
}
|
}
|
||||||
|
|
||||||
PointBlankNecessity
|
uint8
|
||||||
CPed::CheckForPointBlankPeds(CPed *pedToVerify)
|
CPed::CheckForPointBlankPeds(CPed *pedToVerify)
|
||||||
{
|
{
|
||||||
float pbDistance = 1.1f;
|
float pbDistance = 1.1f;
|
||||||
|
|
|
@ -11,7 +11,7 @@ class CBuilding;
|
||||||
class CCrane
|
class CCrane
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
enum CraneState : uint8 {
|
enum CraneState {
|
||||||
IDLE = 0,
|
IDLE = 0,
|
||||||
GOING_TOWARDS_TARGET = 1,
|
GOING_TOWARDS_TARGET = 1,
|
||||||
LIFTING_TARGET = 2,
|
LIFTING_TARGET = 2,
|
||||||
|
@ -19,7 +19,7 @@ public:
|
||||||
ROTATING_TARGET = 4,
|
ROTATING_TARGET = 4,
|
||||||
DROPPING_TARGET = 5
|
DROPPING_TARGET = 5
|
||||||
};
|
};
|
||||||
enum CraneStatus : uint8 {
|
enum CraneStatus {
|
||||||
NONE = 0,
|
NONE = 0,
|
||||||
ACTIVATED = 1,
|
ACTIVATED = 1,
|
||||||
DEACTIVATED = 2
|
DEACTIVATED = 2
|
||||||
|
@ -47,8 +47,8 @@ public:
|
||||||
CVector2D m_vecHookVelocity;
|
CVector2D m_vecHookVelocity;
|
||||||
CVehicle *m_pVehiclePickedUp;
|
CVehicle *m_pVehiclePickedUp;
|
||||||
uint32 m_nTimeForNextCheck;
|
uint32 m_nTimeForNextCheck;
|
||||||
CraneStatus m_nCraneStatus;
|
uint8 m_nCraneStatus;
|
||||||
CraneState m_nCraneState;
|
uint8 m_nCraneState;
|
||||||
uint8 m_nVehiclesCollected;
|
uint8 m_nVehiclesCollected;
|
||||||
bool m_bIsCrusher;
|
bool m_bIsCrusher;
|
||||||
bool m_bIsMilitaryCrane;
|
bool m_bIsMilitaryCrane;
|
||||||
|
|
Loading…
Reference in a new issue