diff options
| author | Eugene Sandulenko | 2004-12-22 13:09:47 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-12-22 13:09:47 +0000 |
| commit | 2fb8a8e45369b000b9f36d2433425ca48f6d9d13 (patch) | |
| tree | 7b0c6ad4c4e004a2d58302e2cc57f226be7c13a8 /saga/scene.cpp | |
| parent | eaa0f3b9740b81fff59792de55f335c149344c69 (diff) | |
| download | scummvm-rg350-2fb8a8e45369b000b9f36d2433425ca48f6d9d13.tar.gz scummvm-rg350-2fb8a8e45369b000b9f36d2433425ca48f6d9d13.tar.bz2 scummvm-rg350-2fb8a8e45369b000b9f36d2433425ca48f6d9d13.zip | |
o Moved GAME_* to SagaEngine object
o Renamed GAME_ITE_* to GID_ITE_*
o Renamed GID_ITE and GID_IHNM to GType_ITE and GType_IHNM
svn-id: r16258
Diffstat (limited to 'saga/scene.cpp')
| -rw-r--r-- | saga/scene.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/saga/scene.cpp b/saga/scene.cpp index 8d3b39edfc..8d9e8cff51 100644 --- a/saga/scene.cpp +++ b/saga/scene.cpp @@ -25,7 +25,6 @@ #include "saga/saga.h" #include "saga/gfx.h" -#include "saga/game_mod.h" #include "saga/animation.h" #include "saga/console.h" #include "saga/interface.h" @@ -55,10 +54,10 @@ Scene::Scene(SagaEngine *vm) : _vm(vm), _initialized(false) { int i; // Load game-specific scene data - GAME_GetSceneInfo(&gs_desc); + _vm->getSceneInfo(&gs_desc); // Load scene module resource context - _sceneContext = GAME_GetFileContext(GAME_RESOURCEFILE, 0); + _sceneContext = _vm->getFileContext(GAME_RESOURCEFILE, 0); if (_sceneContext == NULL) { warning("Scene::Scene(): Couldn't load scene resource context"); return; @@ -173,11 +172,11 @@ int Scene::startScene() { event.op = EVENT_HIDE; _vm->_events->queue(&event); - switch (GAME_GetGameType()) { - case GID_ITE: + switch (_vm->_gameType) { + case GType_ITE: ITEStartProc(); break; - case GID_IHNM: + case GType_IHNM: IHNMStartProc(); break; default: @@ -334,7 +333,7 @@ int Scene::getBGInfo(SCENE_BGINFO *bginfo) { bginfo->bg_h = _bg.h; bginfo->bg_p = _bg.p; - GAME_GetDisplayInfo(&di); + _vm->getDisplayInfo(&di); x = 0; y = 0; @@ -784,7 +783,7 @@ int Scene::draw(SURFACE *dst_s) { assert(_initialized); _vm->_render->getBufferInfo(&buf_info); - GAME_GetDisplayInfo(&disp_info); + _vm->getDisplayInfo(&disp_info); bg_pt.x = 0; bg_pt.y = 0; |