diff options
| author | Johannes Schickel | 2008-05-02 15:21:51 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-02 15:21:51 +0000 |
| commit | c6830b4138be54e056a7cf18b6b900c3e46ab4ff (patch) | |
| tree | 58539ee1e4abf7ef87c8f76404025af9b7043639 /engines/kyra/script_mr.cpp | |
| parent | 2da2fb7f4d183ca6e64c9ada4c92986685185c40 (diff) | |
| download | scummvm-rg350-c6830b4138be54e056a7cf18b6b900c3e46ab4ff.tar.gz scummvm-rg350-c6830b4138be54e056a7cf18b6b900c3e46ab4ff.tar.bz2 scummvm-rg350-c6830b4138be54e056a7cf18b6b900c3e46ab4ff.zip | |
- Renamed TextDisplayer_v2 to TextDisplayer_HoF
- Moved some character shape code to KyraEngine_v2
svn-id: r31821
Diffstat (limited to 'engines/kyra/script_mr.cpp')
| -rw-r--r-- | engines/kyra/script_mr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp index de535148d1..c43743179d 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -37,7 +37,7 @@ namespace Kyra { int KyraEngine_MR::o3_getMalcolmShapes(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_getMaloclmShapes(%p) ()", (const void *)script); - return _malcolmShapes; + return _characterShapeFile; } int KyraEngine_MR::o3_setCharacterPos(EMCState *script) { @@ -478,7 +478,7 @@ int KyraEngine_MR::o3_removeItemsFromScene(EMCState *script) { int KyraEngine_MR::o3_disguiseMalcolm(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v2::o3_disguiseMalcolm(%p) (%d)", (const void *)script, stackPos(0)); - loadMalcolmShapes(stackPos(0)); + loadCharacterShapes(stackPos(0)); updateDlgIndex(); return 0; } |