crt0mega/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2021-09-07 08:09:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #872 from withmorten/sized-enums-miami

Browse Source 
Get rid of sized enums 2: Electric Boogaloo
This commit is contained in:
erorcun 2020-12-09 03:31:03 +03:00 committed by GitHub
commit ac3484b82e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 74 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/audio/AudioLogic.cpp
View File

@ -47,8 +47,8 @@ const int channels = ARRAY_SIZE(cAudioManager::m_asActiveSamples);
const int policeChannel = channels + 1; const int policeChannel = channels + 1;
const int allChannels = channels + 2; const int allChannels = channels + 2;
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
@ -9020,7 +9020,7 @@ cAudioManager::ProcessGarages()
const float SOUND_INTENSITY = 80.0f; const float SOUND_INTENSITY = 80.0f;
CEntity *entity; CEntity *entity;
eGarageState state; uint8 state;
uint32 sampleIndex; uint32 sampleIndex;
uint8 j; uint8 j;
float distSquared; float distSquared;

2
src/audio/AudioManager.h
View File

@ -149,7 +149,7 @@ public:
class cVehicleParams class cVehicleParams
{ {
public: public:
eVehicleType m_VehicleType; uint8 m_VehicleType;
bool m_bDistanceCalculated; bool m_bDistanceCalculated;
float m_fDistance; float m_fDistance;
CVehicle *m_pVehicle; CVehicle *m_pVehicle;

2
src/audio/AudioSamples.h
View File

@ -2,7 +2,7 @@
#include "common.h" #include "common.h"
enum eSfxSample : uint32 { enum eSfxSample {
SFX_CAR_HORN_JEEP = 0, SFX_CAR_HORN_JEEP = 0,
SFX_CAR_HORN_BMW328, SFX_CAR_HORN_BMW328,
SFX_CAR_HORN_BUS, SFX_CAR_HORN_BUS,

2
src/audio/audio_enums.h
View File

@ -1274,7 +1274,7 @@ enum AudioEntityHandle {
AEHANDLE_ERROR_BADAUDIOTYPE = -1, AEHANDLE_ERROR_BADAUDIOTYPE = -1,
}; };
enum eAudioType : int32 enum eAudioType
{ {
AUDIOTYPE_PHYSICAL = 0, AUDIOTYPE_PHYSICAL = 0,
AUDIOTYPE_EXPLOSION, AUDIOTYPE_EXPLOSION,

4
src/audio/soundlist.h
View File

@ -1,6 +1,6 @@
#pragma once #pragma once
enum eSound : uint16 enum eSound
{ {
SOUND_CAR_DOOR_CLOSE_BONNET = 0, SOUND_CAR_DOOR_CLOSE_BONNET = 0,
SOUND_CAR_DOOR_CLOSE_BUMPER, SOUND_CAR_DOOR_CLOSE_BUMPER,
@ -208,7 +208,7 @@ enum eSound : uint16
}; };
enum eScriptSounds : uint16 { enum eScriptSounds {
SCRIPT_SOUND_BANK_ALARM_LOOP = 0, SCRIPT_SOUND_BANK_ALARM_LOOP = 0,
SCRIPT_SOUND_PART_MISSION_COMPLETE, SCRIPT_SOUND_PART_MISSION_COMPLETE,
SCRIPT_SOUND_POLICE_CELL_DOOR_SLIDING_LOOP, SCRIPT_SOUND_POLICE_CELL_DOOR_SLIDING_LOOP,

6
src/control/AutoPilot.cpp
View File

@ -109,9 +109,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);

12
src/control/AutoPilot.h
View File

@ -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,
@ -35,7 +35,7 @@ enum eCarMission : uint8
MISSION_BLOCKPLAYER_FORWARDANDBACK MISSION_BLOCKPLAYER_FORWARDANDBACK
}; };
enum eCarTempAction : uint8 enum eCarTempAction
{ {
TEMPACT_NONE, TEMPACT_NONE,
TEMPACT_WAIT, TEMPACT_WAIT,
@ -50,7 +50,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,
@ -76,9 +76,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;

4
src/control/CarAI.cpp
View File

@ -634,7 +634,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:
@ -648,7 +648,7 @@ eCarMission CCarAI::FindPoliceCarMissionForWantedLevel()
} }
} }
eCarMission CCarAI::FindPoliceBoatMissionForWantedLevel() uint8 CCarAI::FindPoliceBoatMissionForWantedLevel()
{ {
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:

4
src/control/CarAI.h
View File

@ -22,8 +22,8 @@ public:
static void TellOccupantsToFleeCar(CVehicle*); static void TellOccupantsToFleeCar(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 eCarMission FindPoliceBoatMissionForWantedLevel(); static uint8 FindPoliceBoatMissionForWantedLevel();
static int32 FindPoliceCarSpeedForWantedLevel(CVehicle*); static int32 FindPoliceCarSpeedForWantedLevel(CVehicle*);
static void MellowOutChaseSpeed(CVehicle*); static void MellowOutChaseSpeed(CVehicle*);
static void MellowOutChaseSpeedBoat(CVehicle*); static void MellowOutChaseSpeedBoat(CVehicle*);

6
src/control/Garages.cpp
View File

@ -190,7 +190,7 @@ void CGarages::Update(void)
aGarages[GarageToBeTidied].TidyUpGarage(); aGarages[GarageToBeTidied].TidyUpGarage();
} }
int16 CGarages::AddOne(float X1, float Y1, float Z1, float X2, float Y2, float X3, float Y3, float Z2, eGarageType type, int32 targetId) int16 CGarages::AddOne(float X1, float Y1, float Z1, float X2, float Y2, float X3, float Y3, float Z2, uint8 type, int32 targetId)
{ {
if (NumGarages >= NUM_GARAGES) { if (NumGarages >= NUM_GARAGES) {
assert(0); assert(0);
@ -291,7 +291,7 @@ int16 CGarages::AddOne(float X1, float Y1, float Z1, float X2, float Y2, float X
return NumGarages++; return NumGarages++;
} }
void CGarages::ChangeGarageType(int16 garage, eGarageType type, int32 mi) void CGarages::ChangeGarageType(int16 garage, uint8 type, int32 mi)
{ {
CGarage* pGarage = &aGarages[garage]; CGarage* pGarage = &aGarages[garage];
pGarage->m_eGarageType = type; pGarage->m_eGarageType = type;
@ -2072,7 +2072,7 @@ void CGarages::CloseHideOutGaragesBeforeSave()
} }
} }
int32 CGarages::CountCarsInHideoutGarage(eGarageType type) int32 CGarages::CountCarsInHideoutGarage(uint8 type)
{ {
int32 total = 0; int32 total = 0;
for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++) { for (int i = 0; i < NUM_GARAGE_STORED_CARS; i++) {

22
src/control/Garages.h
View File

@ -7,7 +7,7 @@
class CVehicle; class CVehicle;
class CCamera; class CCamera;
enum eGarageState : int8 enum eGarageState
{ {
GS_FULLYCLOSED, GS_FULLYCLOSED,
GS_OPENED, GS_OPENED,
@ -18,7 +18,7 @@ enum eGarageState : int8
GS_AFTERDROPOFF, GS_AFTERDROPOFF,
}; };
enum eGarageType : int8 enum eGarageType
{ {
GARAGE_NONE, GARAGE_NONE,
GARAGE_MISSION, GARAGE_MISSION,
@ -93,8 +93,8 @@ VALIDATE_SIZE(CStoredCar, 0x28);
class CGarage class CGarage
{ {
eGarageType m_eGarageType; uint8 m_eGarageType;
eGarageState m_eGarageState; uint8 m_eGarageState;
uint8 m_nMaxStoredCars; uint8 m_nMaxStoredCars;
bool field_2; // unused bool field_2; // unused
bool m_bClosingWithoutTargetCar; bool m_bClosingWithoutTargetCar;
@ -227,8 +227,8 @@ public:
#endif #endif
static void Update(void); static void Update(void);
static int16 AddOne(float X1, float Y1, float Z1, float X2, float Y2, float X3, float Y3, float Z2, eGarageType type, int32 targetId); static int16 AddOne(float X1, float Y1, float Z1, float X2, float Y2, float X3, float Y3, float Z2, uint8 type, int32 targetId);
static void ChangeGarageType(int16, eGarageType, int32); static void ChangeGarageType(int16, uint8, int32);
static void PrintMessages(void); static void PrintMessages(void);
static void TriggerMessage(const char* text, int16, uint16 time, int16); static void TriggerMessage(const char* text, int16, uint16 time, int16);
static void SetTargetCarForMissonGarage(int16, CVehicle*); static void SetTargetCarForMissonGarage(int16, CVehicle*);
@ -265,9 +265,9 @@ private:
static bool IsCarSprayable(CVehicle*); static bool IsCarSprayable(CVehicle*);
static float FindDoorHeightForMI(int32); static float FindDoorHeightForMI(int32);
static void CloseHideOutGaragesBeforeSave(void); static void CloseHideOutGaragesBeforeSave(void);
static int32 CountCarsInHideoutGarage(eGarageType); static int32 CountCarsInHideoutGarage(uint8);
static int32 GetBombTypeForGarageType(eGarageType type) { return type - GARAGE_BOMBSHOP1 + 1; } static int32 GetBombTypeForGarageType(uint8 type) { return type - GARAGE_BOMBSHOP1 + 1; }
static int32 GetCarsCollectedIndexForGarageType(eGarageType type) static int32 GetCarsCollectedIndexForGarageType(uint8 type)
{ {
switch (type) { switch (type) {
case GARAGE_COLLECTCARS_1: return 0; case GARAGE_COLLECTCARS_1: return 0;
@ -278,7 +278,7 @@ private:
} }
return 0; return 0;
} }
static int32 FindSafeHouseIndexForGarageType(eGarageType type) static int32 FindSafeHouseIndexForGarageType(uint8 type)
{ {
switch (type) { switch (type) {
case GARAGE_HIDEOUT_ONE: return 0; case GARAGE_HIDEOUT_ONE: return 0;
@ -296,7 +296,7 @@ private:
} }
return -1; return -1;
} }
static bool IsThisGarageTypeSafehouse(eGarageType type) { return FindSafeHouseIndexForGarageType(type) >= 0; } static bool IsThisGarageTypeSafehouse(uint8 type) { return FindSafeHouseIndexForGarageType(type) >= 0; }
friend class cAudioManager; friend class cAudioManager;
friend class CReplay; friend class CReplay;

2
src/control/Pickups.cpp
View File

@ -852,7 +852,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;
aPickUps[slot].m_nMoneySpeed = rate; aPickUps[slot].m_nMoneySpeed = rate;

4
src/control/Pickups.h
View File

@ -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,
@ -43,7 +43,7 @@ public:
int16 m_eModelIndex; int16 m_eModelIndex;
uint16 m_nIndex; uint16 m_nIndex;
char m_sTextKey[8]; char m_sTextKey[8];
ePickupType m_eType; uint8 m_eType;
bool m_bRemoved; bool m_bRemoved;
uint8 m_bWasAmmoCollected:1; uint8 m_bWasAmmoCollected:1;
uint8 m_bWasControlMessageShown:1; uint8 m_bWasControlMessageShown:1;

4
src/control/Script.cpp
View File

@ -4038,7 +4038,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:
@ -4046,7 +4046,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;

6
src/control/Script3.cpp
View File

@ -286,7 +286,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
float supX = *(float*)&ScriptParams[5]; float supX = *(float*)&ScriptParams[5];
float supY = *(float*)&ScriptParams[6]; float supY = *(float*)&ScriptParams[6];
float supZ = *(float*)&ScriptParams[7]; float supZ = *(float*)&ScriptParams[7];
ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, X2, Y2, supX, supY, supZ, (eGarageType)ScriptParams[8], 0); ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, X2, Y2, supX, supY, supZ, ScriptParams[8], 0);
StoreParameters(&m_nIp, 1); StoreParameters(&m_nIp, 1);
return 0; return 0;
} }
@ -302,7 +302,7 @@ int8 CRunningScript::ProcessCommands500To599(int32 command)
float supX = *(float*)&ScriptParams[5]; float supX = *(float*)&ScriptParams[5];
float supY = *(float*)&ScriptParams[6]; float supY = *(float*)&ScriptParams[6];
float supZ = *(float*)&ScriptParams[7]; float supZ = *(float*)&ScriptParams[7];
ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, X2, Y2, supX, supY, supZ, (eGarageType)ScriptParams[8], ScriptParams[9]); ScriptParams[0] = CGarages::AddOne(infX, infY, infZ, X2, Y2, supX, supY, supZ, ScriptParams[8], ScriptParams[9]);
StoreParameters(&m_nIp, 1); StoreParameters(&m_nIp, 1);
return 0; return 0;
} }
@ -1848,7 +1848,7 @@ int8 CRunningScript::ProcessCommands700To799(int32 command)
} }
case COMMAND_CHANGE_GARAGE_TYPE: case COMMAND_CHANGE_GARAGE_TYPE:
CollectParameters(&m_nIp, 2); CollectParameters(&m_nIp, 2);
CGarages::ChangeGarageType(ScriptParams[0], (eGarageType)ScriptParams[1], 0); CGarages::ChangeGarageType(ScriptParams[0], ScriptParams[1], 0);
return 0; return 0;
/* /*
case COMMAND_ACTIVATE_CRUSHER_CRANE: case COMMAND_ACTIVATE_CRUSHER_CRANE:

4
src/control/Script4.cpp
View File

@ -1513,7 +1513,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(ScriptParams[1]);
return 0; return 0;
} }
case COMMAND_IS_CHAR_MALE: case COMMAND_IS_CHAR_MALE:
@ -1537,7 +1537,7 @@ int8 CRunningScript::ProcessCommands900To999(int32 command)
case COMMAND_CHANGE_GARAGE_TYPE_WITH_CAR_MODEL: case COMMAND_CHANGE_GARAGE_TYPE_WITH_CAR_MODEL:
{ {
CollectParameters(&m_nIp, 3); CollectParameters(&m_nIp, 3);
CGarages::ChangeGarageType(ScriptParams[0], (eGarageType)ScriptParams[1], ScriptParams[2]); CGarages::ChangeGarageType(ScriptParams[0], ScriptParams[1], ScriptParams[2]);
return 0; return 0;
} }
case COMMAND_FIND_DRUG_PLANE_COORDINATES: case COMMAND_FIND_DRUG_PLANE_COORDINATES:

2
src/control/Script6.cpp
View File

@ -1409,7 +1409,7 @@ int8 CRunningScript::ProcessCommands1100To1199(int32 command)
CollectParameters(&m_nIp, 3); CollectParameters(&m_nIp, 3);
CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]); CVehicle* pVehicle = CPools::GetVehiclePool()->GetAt(ScriptParams[0]);
script_assert(pVehicle); script_assert(pVehicle);
pVehicle->AutoPilot.m_nTempAction = (eCarTempAction)ScriptParams[1]; pVehicle->AutoPilot.m_nTempAction = (uint8)ScriptParams[1];
pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[2]; pVehicle->AutoPilot.m_nTimeTempAction = CTimer::GetTimeInMilliseconds() + ScriptParams[2];
return 0; return 0;
} }

2
src/control/SetPieces.cpp
View File

@ -29,7 +29,7 @@ void CSetPieces::AddOne(uint8 type, CVector2D vTriggerInf, CVector2D vTriggerSup
{ {
if (NumSetPieces >= NUM_SETPIECES) if (NumSetPieces >= NUM_SETPIECES)
return; return;
aSetPieces[NumSetPieces].m_nType = (eSetPieceType)type; aSetPieces[NumSetPieces].m_nType = type;
aSetPieces[NumSetPieces].m_vTriggerInf.x = Min(vTriggerInf.x, vTriggerSup.x); aSetPieces[NumSetPieces].m_vTriggerInf.x = Min(vTriggerInf.x, vTriggerSup.x);
aSetPieces[NumSetPieces].m_vTriggerInf.y = Min(vTriggerInf.y, vTriggerSup.y); aSetPieces[NumSetPieces].m_vTriggerInf.y = Min(vTriggerInf.y, vTriggerSup.y);
aSetPieces[NumSetPieces].m_vTriggerSup.x = Max(vTriggerInf.x, vTriggerSup.x); aSetPieces[NumSetPieces].m_vTriggerSup.x = Max(vTriggerInf.x, vTriggerSup.x);

4
src/control/SetPieces.h
View File

@ -5,7 +5,7 @@
class CVehicle; class CVehicle;
class CCopPed; class CCopPed;
enum eSetPieceType : uint8 enum eSetPieceType
{ {
SETPIECE_NONE = 0, SETPIECE_NONE = 0,
SETPIECE_TWOCOPCARSINALLEY, SETPIECE_TWOCOPCARSINALLEY,
@ -20,7 +20,7 @@ enum eSetPieceType : uint8
class CSetPiece class CSetPiece
{ {
public: public:
eSetPieceType m_nType; uint8 m_nType;
uint32 m_nLastTimeCreated; uint32 m_nLastTimeCreated;
CVector2D m_vTriggerInf; CVector2D m_vTriggerInf;
CVector2D m_vTriggerSup; CVector2D m_vTriggerSup;

4
src/core/PlayerInfo.h
View File

@ -10,7 +10,7 @@ enum eWastedBustedState
WBSTATE_FAILED_CRITICAL_MISSION, WBSTATE_FAILED_CRITICAL_MISSION,
}; };
enum eBustedAudioState : uint8 enum eBustedAudioState
{ {
BUSTEDAUDIO_NONE, BUSTEDAUDIO_NONE,
BUSTEDAUDIO_LOADING, BUSTEDAUDIO_LOADING,
@ -82,7 +82,7 @@ public:
bool m_bGetOutOfJailFree; bool m_bGetOutOfJailFree;
bool m_bGetOutOfHospitalFree; bool m_bGetOutOfHospitalFree;
bool m_bDriveByAllowed; bool m_bDriveByAllowed;
eBustedAudioState m_nBustedAudioStatus; uint8 m_nBustedAudioStatus;
int16 m_nCurrentBustedAudio; int16 m_nCurrentBustedAudio;
char m_aSkinName[32]; char m_aSkinName[32];
RwTexture *m_pSkinTexture; RwTexture *m_pSkinTexture;

2
src/core/World.cpp
View File

@ -1580,7 +1580,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 ||

12
src/entities/Entity.h
View File

@ -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,
@ -99,10 +99,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 || bIsStaticWaitingForCollision; } bool GetIsStatic(void) const { return bIsStatic || bIsStaticWaitingForCollision; }
void SetIsStatic(bool state) { bIsStatic = state; } void SetIsStatic(bool state) { bIsStatic = state; }

7
src/modelinfo/BaseModelInfo.h
View File

@ -4,7 +4,7 @@
#define MAX_MODEL_NAME (21) #define MAX_MODEL_NAME (21)
enum ModelInfoType : uint8 enum ModelInfoType
{ {
MITYPE_NA, MITYPE_NA,
MITYPE_SIMPLE, MITYPE_SIMPLE,
@ -17,7 +17,6 @@ enum ModelInfoType : uint8
MITYPE_XTRACOMPS, // unused but still in enum MITYPE_XTRACOMPS, // unused but still in enum
MITYPE_HAND // xbox and mobile MITYPE_HAND // xbox and mobile
}; };
VALIDATE_SIZE(ModelInfoType, 1);
class C2dEffect; class C2dEffect;
@ -25,7 +24,7 @@ class CBaseModelInfo
{ {
protected: protected:
char m_name[MAX_MODEL_NAME]; char m_name[MAX_MODEL_NAME];
ModelInfoType m_type; uint8 m_type;
uint8 m_num2dEffects; uint8 m_num2dEffects;
bool m_bOwnsColModel; bool m_bOwnsColModel;
CColModel *m_colModel; CColModel *m_colModel;
@ -47,7 +46,7 @@ public:
virtual int GetAnimFileIndex(void) { return -1; } virtual int GetAnimFileIndex(void) { return -1; }
// one day it becomes virtual // one day it becomes virtual
ModelInfoType GetModelType() const { return m_type; } uint8 GetModelType() const { return m_type; }
bool IsBuilding(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; } bool IsBuilding(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME; }
bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME || m_type == MITYPE_WEAPON; } bool IsSimple(void) { return m_type == MITYPE_SIMPLE || m_type == MITYPE_TIME || m_type == MITYPE_WEAPON; }
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; }

2
src/modelinfo/VehicleModelInfo.h
View File

@ -24,7 +24,7 @@ enum {
ATOMIC_FLAG_NOCULL = 0x800, ATOMIC_FLAG_NOCULL = 0x800,
}; };
enum eVehicleType : uint8{ enum eVehicleType {
VEHICLE_TYPE_CAR, VEHICLE_TYPE_CAR,
VEHICLE_TYPE_BOAT, VEHICLE_TYPE_BOAT,
VEHICLE_TYPE_TRAIN, VEHICLE_TYPE_TRAIN,

10
src/peds/Ped.h
View File

@ -52,7 +52,7 @@ enum eFormation
FORMATION_FRONT FORMATION_FRONT
}; };
enum FightState : int8 { enum FightState {
FIGHTSTATE_MOVE_FINISHED = -2, FIGHTSTATE_MOVE_FINISHED = -2,
FIGHTSTATE_JUST_ATTACKED, FIGHTSTATE_JUST_ATTACKED,
FIGHTSTATE_NO_MOVE, FIGHTSTATE_NO_MOVE,
@ -187,7 +187,7 @@ enum eWaitState {
WAITSTATE_PLAYANIM_HANDSUP_SIMPLE, WAITSTATE_PLAYANIM_HANDSUP_SIMPLE,
}; };
enum eObjective : uint32 { enum eObjective {
OBJECTIVE_NONE, OBJECTIVE_NONE,
OBJECTIVE_WAIT_ON_FOOT, OBJECTIVE_WAIT_ON_FOOT,
OBJECTIVE_WAIT_ON_FOOT_FOR_COP, OBJECTIVE_WAIT_ON_FOOT_FOR_COP,
@ -271,7 +271,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:
uint32 m_curFightMove; uint32 m_curFightMove;
uint32 m_lastFightMove; uint32 m_lastFightMove;
uint8 m_fightButtonPressure; uint8 m_fightButtonPressure;
FightState m_fightState; int8 m_fightState;
bool m_takeAStepAfterAttack; bool m_takeAStepAfterAttack;
uint8 m_bleedCounter; uint8 m_bleedCounter;
CFire *m_pFire; CFire *m_pFire;
@ -729,7 +729,7 @@ public:
CPed *CheckForDeadPeds(void); CPed *CheckForDeadPeds(void);
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*);

4
src/peds/PedFight.cpp
View File

@ -367,7 +367,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
@ -611,7 +611,7 @@ CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
} }
// --MIAMI: Done // --MIAMI: Done
PointBlankNecessity uint8
CPed::CheckForPointBlankPeds(CPed *pedToVerify) CPed::CheckForPointBlankPeds(CPed *pedToVerify)
{ {
float pbDistance = 1.1f; float pbDistance = 1.1f;

8
src/vehicles/Cranes.h
View File

@ -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
@ -46,8 +46,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;

2
src/vehicles/Vehicle.h
View File

@ -281,7 +281,7 @@ public:
int8 m_comedyControlState; int8 m_comedyControlState;
CStoredCollPoly m_aCollPolys[2]; // poly which is under front/rear part of car CStoredCollPoly m_aCollPolys[2]; // poly which is under front/rear part of car
float m_fSteerInput; float m_fSteerInput;
eVehicleType m_vehType; uint8 m_vehType;
static void *operator new(size_t); static void *operator new(size_t);
static void *operator new(size_t sz, int slot); static void *operator new(size_t sz, int slot);