diff options
| author | aap <aap@papnet.eu> | 2020-05-10 11:20:27 +0200 |
|---|---|---|
| committer | aap <aap@papnet.eu> | 2020-05-10 11:20:27 +0200 |
| commit | 1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7 (patch) | |
| tree | 42c2506c438da719dd82a007d7cd620c71ec1b4e /src/vehicles | |
| parent | Merge branch 'miami' of github.com:GTAmodding/re3 into miami (diff) | |
| download | re3-1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7.tar re3-1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7.tar.gz re3-1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7.tar.bz2 re3-1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7.tar.lz re3-1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7.tar.xz re3-1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7.tar.zst re3-1b936f6ffbe71e2c44ef1a5b5d5e7a24801434c7.zip | |
Diffstat (limited to 'src/vehicles')
| -rw-r--r-- | src/vehicles/Boat.cpp | 8 | ||||
| -rw-r--r-- | src/vehicles/Plane.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 5879717a..a86a6914 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -398,10 +398,10 @@ CBoat::ProcessControl(void) } // Slow down or push down boat as it approaches the world limits - m_vecMoveSpeed.x = Min(m_vecMoveSpeed.x, -(GetPosition().x - 1900.0f)*0.01f); // east - m_vecMoveSpeed.x = Max(m_vecMoveSpeed.x, -(GetPosition().x - -1515.0f)*0.01f); // west - m_vecMoveSpeed.y = Min(m_vecMoveSpeed.y, -(GetPosition().y - 600.0f)*0.01f); // north - m_vecMoveSpeed.y = Max(m_vecMoveSpeed.y, -(GetPosition().y - -1900.0f)*0.01f); // south + m_vecMoveSpeed.x = Min(m_vecMoveSpeed.x, -(GetPosition().x - (WORLD_MAX_X-50.0f))*0.01f); // east + m_vecMoveSpeed.x = Max(m_vecMoveSpeed.x, -(GetPosition().x - (WORLD_MIN_X+50.0f))*0.01f); // west + m_vecMoveSpeed.y = Min(m_vecMoveSpeed.y, -(GetPosition().y - (WORLD_MAX_Y-50.0f))*0.01f); // north + m_vecMoveSpeed.y = Max(m_vecMoveSpeed.y, -(GetPosition().y - (WORLD_MIN_Y+50.0f))*0.01f); // south if(!onLand && bBoatInWater) ApplyWaterResistance(); diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp index 71189d84..39069364 100644 --- a/src/vehicles/Plane.cpp +++ b/src/vehicles/Plane.cpp @@ -806,7 +806,7 @@ CPlane::LoadPath(char const *filename, int32 &numNodes, float &totalLength, bool for(i = 0; i < numNodes; i++){ *gString = '\0'; - for(lp = 0; work_buff[bp] != '\n'; bp++, lp++) + for(lp = 0; work_buff[bp] != '\n' && work_buff[bp] != '\0'; bp++, lp++) gString[lp] = work_buff[bp]; bp++; // BUG: game doesn't terminate string |