diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-15 22:31:52 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-15 22:31:52 +0200 |
| commit | 1795f3d47993e7a9833e6f265bb91fb6ce400f1c (patch) | |
| tree | 766dd0f14ba4df90cbac836c03cdfc501c9cd009 /src/control/Garages.cpp | |
| parent | fix (diff) | |
| parent | Merge pull request #440 from Fire-Head/master (diff) | |
| download | re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.gz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.bz2 re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.lz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.xz re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.tar.zst re3-1795f3d47993e7a9833e6f265bb91fb6ce400f1c.zip | |
Diffstat (limited to 'src/control/Garages.cpp')
| -rw-r--r-- | src/control/Garages.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index d971d453..d187f666 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -307,13 +307,13 @@ void CGarage::Update() CGarages::bCamShouldBeOutisde = true; } if (pVehicle) { - if (IsEntityEntirelyOutside(pVehicle, 0.0f)) + if (!IsEntityEntirelyOutside(pVehicle, 0.0f)) TheCamera.pToGarageWeAreInForHackAvoidFirstPerson = this; if (pVehicle->GetModelIndex() == MI_MRWHOOP) { if (pVehicle->IsWithinArea( m_fX1 - DISTANCE_FOR_MRWHOOP_HACK, - m_fX2 + DISTANCE_FOR_MRWHOOP_HACK, - m_fY1 - DISTANCE_FOR_MRWHOOP_HACK, + m_fY1 + DISTANCE_FOR_MRWHOOP_HACK, + m_fX2 - DISTANCE_FOR_MRWHOOP_HACK, m_fY2 + DISTANCE_FOR_MRWHOOP_HACK)) { TheCamera.pToGarageWeAreIn = this; CGarages::bCamShouldBeOutisde = true; @@ -1082,7 +1082,7 @@ void CGarage::Update() #ifdef FIX_BUGS bool bCreatedAllCars = false; #else - bool bCraetedAllCars; + bool bCreatedAllCars; #endif switch (m_eGarageType) { case GARAGE_HIDEOUT_ONE: bCreatedAllCars = RestoreCarsForThisHideout(CGarages::aCarsInSafeHouse1); break; @@ -2313,6 +2313,10 @@ void CGarages::Load(uint8* buf, uint32 size) #ifdef FIX_GARAGE_SIZE VALIDATESAVEBUF(size); #endif + + MessageEndTime = 0; + bCamShouldBeOutisde = false; + MessageStartTime = 0; } bool |