summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-06-07 03:15:10 +0200
committerSergeanur <s.anureev@yandex.ua>2020-06-07 03:15:10 +0200
commit1c0189979965cb237aa5fb300a5522e1408123ac (patch)
tree791f188c7d4f87111bf3235b87f4b74e2fbebf9e /src/vehicles
parentCBike done (diff)
parentFONT_BANK renamed to FONT_STANDARD (diff)
downloadre3-1c0189979965cb237aa5fb300a5522e1408123ac.tar
re3-1c0189979965cb237aa5fb300a5522e1408123ac.tar.gz
re3-1c0189979965cb237aa5fb300a5522e1408123ac.tar.bz2
re3-1c0189979965cb237aa5fb300a5522e1408123ac.tar.lz
re3-1c0189979965cb237aa5fb300a5522e1408123ac.tar.xz
re3-1c0189979965cb237aa5fb300a5522e1408123ac.tar.zst
re3-1c0189979965cb237aa5fb300a5522e1408123ac.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/CarGen.cpp2
-rw-r--r--src/vehicles/Plane.cpp4
-rw-r--r--src/vehicles/Train.cpp4
-rw-r--r--src/vehicles/Vehicle.cpp5
4 files changed, 13 insertions, 2 deletions
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index e6c3bbf3..574f2854 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -264,7 +264,7 @@ INITSAVEBUF
WriteSaveBuf(buffer, ProcessCounter);
WriteSaveBuf(buffer, GenerateEvenIfPlayerIsCloseCounter);
WriteSaveBuf(buffer, (int16)0); // alignment
- WriteSaveBuf(buffer, sizeof(CarGeneratorArray));
+ WriteSaveBuf(buffer, (uint32)sizeof(CarGeneratorArray));
for (int i = 0; i < NUM_CARGENS; i++)
WriteSaveBuf(buffer, CarGeneratorArray[i]);
VALIDATESAVEBUF(*size)
diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp
index 8f32f12a..bc27ca32 100644
--- a/src/vehicles/Plane.cpp
+++ b/src/vehicles/Plane.cpp
@@ -84,6 +84,10 @@ CPlane::CPlane(int32 id, uint8 CreatedBy)
SetStatus(STATUS_PLANE);
bIsBIGBuilding = true;
m_level = LEVEL_NONE;
+
+#ifdef FIX_BUGS
+ m_isFarAway = true;
+#endif
}
CPlane::~CPlane()
diff --git a/src/vehicles/Train.cpp b/src/vehicles/Train.cpp
index e3bc8a9f..50f7cb1d 100644
--- a/src/vehicles/Train.cpp
+++ b/src/vehicles/Train.cpp
@@ -64,6 +64,10 @@ CTrain::CTrain(int32 id, uint8 CreatedBy)
bUsesCollision = true;
SetStatus(STATUS_TRAIN_MOVING);
+
+#ifdef FIX_BUGS
+ m_isFarAway = true;
+#endif
#else
assert(0 && "No trains in this game");
#endif
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index a30429bf..824aeac1 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -80,6 +80,9 @@ CVehicle::CVehicle(uint8 CreatedBy)
bIsLawEnforcer = false;
bIsAmbulanceOnDuty = false;
bIsFireTruckOnDuty = false;
+#ifdef FIX_BUGS
+ bIsHandbrakeOn = false;
+#endif
CCarCtrl::UpdateCarCount(this, false);
m_fHealth = 1000.0f;
bEngineOn = true;
@@ -117,7 +120,7 @@ CVehicle::CVehicle(uint8 CreatedBy)
m_numPedsUseItAsCover = 0;
bIsCarParkVehicle = false;
bHasAlreadyBeenRecorded = false;
- m_bSirenOrAlarm = 0;
+ m_bSirenOrAlarm = false;
m_nCarHornTimer = 0;
m_nCarHornPattern = 0;
m_nCarHornDelay = 0;