diff options
| author | Nikolay <nickvnuk@gmail.com> | 2021-07-25 10:57:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-25 10:57:21 +0200 |
| commit | d86637daeaa3f0dc962edc3658688eebe27c7343 (patch) | |
| tree | d8682cbb8d3a05410f9530f016ab712a4d37e3d5 /src/core | |
| parent | Merge branch 'miami' into lcs (diff) | |
| parent | Merge remote-tracking branch 'upstream/lcs' into lcs (diff) | |
| download | re3-d86637daeaa3f0dc962edc3658688eebe27c7343.tar re3-d86637daeaa3f0dc962edc3658688eebe27c7343.tar.gz re3-d86637daeaa3f0dc962edc3658688eebe27c7343.tar.bz2 re3-d86637daeaa3f0dc962edc3658688eebe27c7343.tar.lz re3-d86637daeaa3f0dc962edc3658688eebe27c7343.tar.xz re3-d86637daeaa3f0dc962edc3658688eebe27c7343.tar.zst re3-d86637daeaa3f0dc962edc3658688eebe27c7343.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 49e9c0da..a370c9d4 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" @@ -547,6 +548,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(); @@ -721,6 +723,7 @@ void CGame::ReInitGameObjectVariables(void) CTheScripts::StartTestScript(); CTheScripts::Process(); TheCamera.Process(); + CFerry::InitFerrys(); CTrain::InitTrains(); CPlane::InitPlanes(); } @@ -806,6 +809,7 @@ void CGame::InitialiseWhenRestarting(void) if ( GenericLoad() == true ) { DMAudio.ResetTimers(CTimer::GetTimeInMilliseconds()); + CFerry::InitFerrys(); CTrain::InitTrains(); CPlane::InitPlanes(); } @@ -889,6 +893,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 e491c317..d8d62782 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -147,7 +147,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 |