diff options
author | erorcun <erayorcunus@gmail.com> | 2020-12-09 01:31:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-09 01:31:03 +0100 |
commit | ac3484b82e0bd286ddd1e56fb566303d7a3ca40d (patch) | |
tree | f6c95cfd85cb2261f010983f01fd6d62a6de5ef1 /src/vehicles | |
parent | fix CObject::DeleteAllTempObjectsInArea (diff) | |
parent | uint8 enums fixed (diff) | |
download | re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.gz re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.bz2 re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.lz re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.xz re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.tar.zst re3-ac3484b82e0bd286ddd1e56fb566303d7a3ca40d.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Cranes.h | 8 | ||||
-rw-r--r-- | src/vehicles/Vehicle.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/vehicles/Cranes.h b/src/vehicles/Cranes.h index 45ea7a8d..162f9af9 100644 --- a/src/vehicles/Cranes.h +++ b/src/vehicles/Cranes.h @@ -11,7 +11,7 @@ class CBuilding; class CCrane { public: - enum CraneState : uint8 { + enum CraneState { IDLE = 0, GOING_TOWARDS_TARGET = 1, LIFTING_TARGET = 2, @@ -19,7 +19,7 @@ public: ROTATING_TARGET = 4, DROPPING_TARGET = 5 }; - enum CraneStatus : uint8 { + enum CraneStatus { NONE = 0, ACTIVATED = 1, DEACTIVATED = 2 @@ -46,8 +46,8 @@ public: CVector2D m_vecHookVelocity; CVehicle *m_pVehiclePickedUp; uint32 m_nTimeForNextCheck; - CraneStatus m_nCraneStatus; - CraneState m_nCraneState; + uint8 m_nCraneStatus; + uint8 m_nCraneState; uint8 m_nVehiclesCollected; bool m_bIsCrusher; bool m_bIsMilitaryCrane; diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index 004f1fd9..8f2686e1 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -281,7 +281,7 @@ public: int8 m_comedyControlState; CStoredCollPoly m_aCollPolys[2]; // poly which is under front/rear part of car float m_fSteerInput; - eVehicleType m_vehType; + uint8 m_vehType; static void *operator new(size_t); static void *operator new(size_t sz, int slot); |