aboutsummaryrefslogtreecommitdiff
path: root/kyra/kyra.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2005-12-13 13:27:58 +0000
committerJohannes Schickel2005-12-13 13:27:58 +0000
commit55178803000823e5090aa0316abd92855eafc0f1 (patch)
treeb5da9594904808e647e2707e9ff62676ff4a7e02 /kyra/kyra.cpp
parent3e3df54a9c6ad237014c10b896ce81913df9314f (diff)
downloadscummvm-rg350-55178803000823e5090aa0316abd92855eafc0f1.tar.gz
scummvm-rg350-55178803000823e5090aa0316abd92855eafc0f1.tar.bz2
scummvm-rg350-55178803000823e5090aa0316abd92855eafc0f1.zip
Fixed a bug with transcendScenes in CD version there the old file
is still loaded then. Also implemented: cmd_changeCharactersXAndY cmd_setCharactersLocation cmd_setCharactersCurrentFrame svn-id: r19790
Diffstat (limited to 'kyra/kyra.cpp')
-rw-r--r--kyra/kyra.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/kyra/kyra.cpp b/kyra/kyra.cpp
index 36bfd55294..61a393d608 100644
--- a/kyra/kyra.cpp
+++ b/kyra/kyra.cpp
@@ -1327,6 +1327,15 @@ void KyraEngine::enterNewScene(int sceneId, int facing, int unk1, int unk2, int
void KyraEngine::transcendScenes(int roomIndex, int roomName) {
debug(9, "transcendScenes(%d, %d, %d, %d)", roomIndex, roomName);
assert(roomIndex < _roomTableSize);
+ if (_features & GF_TALKIE) {
+ char file[32];
+ assert(roomIndex < _roomTableSize);
+ int tableId = _roomTable[roomIndex].nameIndex;
+ assert(tableId < _roomFilenameTableSize);
+ strcpy(file, _roomFilenameTable[tableId]);
+ strcat(file, ".VRM");
+ _res->unloadPakFile(file);
+ }
_roomTable[roomIndex].nameIndex = roomName;
// _game_unkScreenVar2 = 1;
// _game_unkScreenVar3 = 1;