summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-05 17:23:23 +0200
committerGitHub <noreply@github.com>2020-05-05 17:23:23 +0200
commit2c0b82ec1a0bcb1f3b0d0215a97e964059617a39 (patch)
tree655dc6cff470ac28d19678c392a0aebb49cea937 /src/vehicles
parentRevert "Remove ColStore" (diff)
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar
re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.gz
re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.bz2
re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.lz
re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.xz
re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.tar.zst
re3-2c0b82ec1a0bcb1f3b0d0215a97e964059617a39.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Vehicle.cpp2
-rw-r--r--src/vehicles/Vehicle.h6
2 files changed, 0 insertions, 8 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index 67024782..efbc56c0 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -1354,7 +1354,6 @@ CVehicle::Load(uint8*& buf)
}
#endif
-#ifdef MIAMI
eVehicleAppearance
//--MIAMI: TODO, implement VC version, appearance != type
// This would work for cars, boats and bikes but not for planes and helis
@@ -1372,4 +1371,3 @@ CVehicle::GetVehicleAppearance(void)
return VEHICLE_HELI;
return VEHICLE_NONE;
}
-#endif
diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h
index bff5d578..a818456d 100644
--- a/src/vehicles/Vehicle.h
+++ b/src/vehicles/Vehicle.h
@@ -109,7 +109,6 @@ enum eFlightModel
FLIGHT_MODEL_SEAPLANE
};
-#ifdef MIAMI
enum eVehicleAppearance
{
VEHICLE_NONE,
@@ -119,7 +118,6 @@ enum eVehicleAppearance
VEHICLE_BOAT,
VEHICLE_PLANE,
};
-#endif
// Or Weapon.h?
void FireOneInstantHitRound(CVector *shotSource, CVector *shotTarget, int32 damage);
@@ -184,9 +182,7 @@ public:
uint8 bIsCarParkVehicle : 1; // Car has been created using the special CAR_PARK script command
uint8 bHasAlreadyBeenRecorded : 1; // Used for replays
-#ifdef MIAMI
uint8 bParking : 1;
-#endif;
int8 m_numPedsUseItAsCover;
uint8 m_nAmmoInClip; // Used to make the guns on boat do a reload (20 by default)
@@ -252,9 +248,7 @@ public:
virtual void Load(uint8*& buf);
#endif
-#ifdef MIAMI
eVehicleAppearance GetVehicleAppearance(void);
-#endif
bool IsCar(void) { return m_vehType == VEHICLE_TYPE_CAR; }
bool IsBoat(void) { return m_vehType == VEHICLE_TYPE_BOAT; }
bool IsTrain(void) { return m_vehType == VEHICLE_TYPE_TRAIN; }