fixed cargen

# Conflicts:
#	src/vehicles/CarGen.cpp
This commit is contained in:
Nikolay Korolev 2020-09-28 21:25:14 +03:00 committed by Sergeanur
parent f35fd97c76
commit 9cce324316

View file

@ -32,7 +32,7 @@ void CCarGenerator::SwitchOff()
void CCarGenerator::SwitchOn() void CCarGenerator::SwitchOn()
{ {
m_nUsesRemaining = 255; m_nUsesRemaining = UINT16_MAX;
m_nTimer = CalcNextGen(); m_nTimer = CalcNextGen();
++CTheCarGenerators::CurrentActiveCount; ++CTheCarGenerators::CurrentActiveCount;
} }
@ -143,10 +143,10 @@ void CCarGenerator::DoInternalProcessing()
m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pVehicle); m_nVehicleHandle = CPools::GetVehiclePool()->GetIndex(pVehicle);
/* I don't think this is a correct comparasion */ /* I don't think this is a correct comparasion */
#ifdef FIX_BUGS #ifdef FIX_BUGS
if (m_nUsesRemaining != 0) if (m_nUsesRemaining < UINT16_MAX)
--m_nUsesRemaining; --m_nUsesRemaining;
#else #else
if (m_nUsesRemaining < -1) if (m_nUsesRemaining < ~0)
--m_nUsesRemaining; --m_nUsesRemaining;
#endif #endif
m_nTimer = CalcNextGen(); m_nTimer = CalcNextGen();