[Scummvm-cvs-logs] CVS: scummvm/kyra saveload.cpp,1.3,1.4
Johannes Schickel
lordhoto at users.sourceforge.net
Tue Jan 10 08:12:02 CET 2006
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12736
Modified Files:
saveload.cpp
Log Message:
This should fix bug # 1401295.
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/saveload.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- saveload.cpp 8 Jan 2006 20:10:39 -0000 1.3
+++ saveload.cpp 10 Jan 2006 16:10:54 -0000 1.4
@@ -22,6 +22,7 @@
#include "kyra/kyra.h"
#include "kyra/animator.h"
#include "kyra/screen.h"
+#include "kyra/resource.h"
#include "common/savefile.h"
#include "common/system.h"
@@ -69,6 +70,17 @@
warning("Make sure your savefile was from this version! (too old savefile version to detect that)");
}
+ // unload the current voice file should fix some problems with voices
+ if (_currentRoom != 0xFFFF && (_features & GF_TALKIE)) {
+ char file[32];
+ assert(_currentRoom < _roomTableSize);
+ int tableId = _roomTable[_currentRoom].nameIndex;
+ assert(tableId < _roomFilenameTableSize);
+ strcpy(file, _roomFilenameTable[tableId]);
+ strcat(file, ".VRM");
+ _res->unloadPakFile(file);
+ }
+
int brandonX = 0, brandonY = 0;
for (int i = 0; i < 11; i++) {
_characterList[i].sceneId = in->readUint16BE();
More information about the Scummvm-git-logs
mailing list