diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-02-07 21:29:49 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-02-07 21:29:49 +0100 |
| commit | 9b9ffc4b13a47beff6ee2d400466d764360a0edf (patch) | |
| tree | 65be11894442598aec278cd364d4e17f447be4c8 /src/core | |
| parent | Merge pull request #1013 from Nick007J/lcs (diff) | |
| download | re3-9b9ffc4b13a47beff6ee2d400466d764360a0edf.tar re3-9b9ffc4b13a47beff6ee2d400466d764360a0edf.tar.gz re3-9b9ffc4b13a47beff6ee2d400466d764360a0edf.tar.bz2 re3-9b9ffc4b13a47beff6ee2d400466d764360a0edf.tar.lz re3-9b9ffc4b13a47beff6ee2d400466d764360a0edf.tar.xz re3-9b9ffc4b13a47beff6ee2d400466d764360a0edf.tar.zst re3-9b9ffc4b13a47beff6ee2d400466d764360a0edf.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Game.cpp | 5 | ||||
| -rw-r--r-- | src/core/config.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index b5b4b90d..c97a63a7 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -22,6 +22,7 @@ #include "Darkel.h" #include "Debug.h" #include "EventList.h" +#include "Ferry.h" #include "FileLoader.h" #include "FileMgr.h" #include "Fire.h" @@ -539,6 +540,7 @@ bool CGame::Initialise(const char* datFile) LoadingScreen("Loading the Game", "Position dynamic objects", nil); LoadingScreen("Loading the Game", "Initialise vehicle paths", nil); + CFerry::InitFerrys(); CTrain::InitTrains(); CPlane::InitPlanes(); CCredits::Init(); @@ -713,6 +715,7 @@ void CGame::ReInitGameObjectVariables(void) CTheScripts::StartTestScript(); CTheScripts::Process(); TheCamera.Process(); + CFerry::InitFerrys(); CTrain::InitTrains(); CPlane::InitPlanes(); } @@ -798,6 +801,7 @@ void CGame::InitialiseWhenRestarting(void) if ( GenericLoad() == true ) { DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds()); + CFerry::InitFerrys(); CTrain::InitTrains(); CPlane::InitPlanes(); } @@ -881,6 +885,7 @@ void CGame::Process(void) CCollision::Update(); CScriptPaths::Update(); + CFerry::UpdateFerrys(); CTrain::UpdateTrains(); CPlane::UpdatePlanes(); CHeli::UpdateHelis(); diff --git a/src/core/config.h b/src/core/config.h index 94b2eb60..ac90c9bd 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -146,7 +146,9 @@ enum Config { NUM_EXPLOSIONS = 48, NUM_SETPIECES = 96, - NUM_SHORTCUT_START_POINTS = 16 + NUM_SHORTCUT_START_POINTS = 16, + + NUM_FERRY_PATHS = 1 }; // We don't expect to compile for PS2 or Xbox |