diff options
| author | Kamil Zbróg | 2014-01-07 00:13:05 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-07 00:13:05 +0000 |
| commit | e94fabc37407a7d300af04493b0f5cbced42a092 (patch) | |
| tree | 998bfaa03109a49d2bb9ec5b17e817ef7cc32a4c /engines/fullpipe/gameloader.cpp | |
| parent | 165b8be77f4621ff5de8a483c6cd9ac497492a0a (diff) | |
| parent | 4f6c3efa15c68dfa49bf5e6fe75dec034abe903b (diff) | |
| download | scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.gz scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.bz2 scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/fullpipe/gameloader.cpp')
| -rw-r--r-- | engines/fullpipe/gameloader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp index 57c1b23f66..64e6b93fb2 100644 --- a/engines/fullpipe/gameloader.cpp +++ b/engines/fullpipe/gameloader.cpp @@ -510,7 +510,7 @@ InputController *FullpipeEngine::getGameLoaderInputController() { return 0; } -MotionController *getCurrSceneSc2MotionController() { +MctlCompound *getCurrSceneSc2MotionController() { return getSc2MctlCompoundBySceneId(g_fp->_currentScene->_sceneId); } |