[Scummvm-cvs-logs] CVS: scummvm/kyra kyra.cpp,1.113,1.114 seqplayer.cpp,1.12,1.13 staticres.cpp,1.34,1.35
Johannes Schickel
lordhoto at users.sourceforge.net
Sun Jan 8 05:51:02 CET 2006
Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16297
Modified Files:
kyra.cpp seqplayer.cpp staticres.cpp
Log Message:
Fixed bug with sequences playing and fixed a bug with an invaild write.
Index: kyra.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/kyra.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- kyra.cpp 7 Jan 2006 23:55:49 -0000 1.113
+++ kyra.cpp 8 Jan 2006 13:50:32 -0000 1.114
@@ -2703,7 +2703,7 @@
void KyraEngine::initSceneObjectList(int brandonAlive) {
debug(9, "KyraEngine::initSceneObjectList(%d)", brandonAlive);
- for (int i = 0; i < 31; ++i) {
+ for (int i = 0; i < 28; ++i) {
_animator->actors()[i].active = 0;
}
Index: seqplayer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/seqplayer.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- seqplayer.cpp 8 Jan 2006 02:25:05 -0000 1.12
+++ seqplayer.cpp 8 Jan 2006 13:50:35 -0000 1.13
@@ -417,7 +417,7 @@
if (_vm->features() & GF_DEMO) {
_seqQuitFlag = true;
} else {
- if (!_specialBuffer) {
+ if (!_specialBuffer && !_copyViewOffs) {
_specialBuffer = new uint8[40960];
assert(_specialBuffer);
int page = _screen->_curPage;
Index: staticres.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/staticres.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- staticres.cpp 7 Jan 2006 23:55:50 -0000 1.34
+++ staticres.cpp 8 Jan 2006 13:50:35 -0000 1.35
@@ -257,7 +257,7 @@
void KyraEngine::res_unloadResources(int type) {
debug(9, "res_unloadResources(%d)", type);
- if ((type & RES_INTRO) || (type & RES_OUTRO) || type == RES_ALL) {
+ if ((type & RES_INTRO) || (type & RES_OUTRO) || type & RES_ALL) {
res_freeLangTable(&_seq_WSATable, &_seq_WSATable_Size);
res_freeLangTable(&_seq_CPSTable, &_seq_CPSTable_Size);
res_freeLangTable(&_seq_COLTable, &_seq_COLTable_Size);
@@ -278,7 +278,7 @@
res_freeLangTable(&_homeString, &_homeString_Size);
}
- if ((type & RES_INGAME) || type == RES_ALL) {
+ if ((type & RES_INGAME) || type & RES_ALL) {
res_freeLangTable(&_roomFilenameTable, &_roomFilenameTableSize);
delete [] _roomTable; _roomTable = 0;
More information about the Scummvm-git-logs
mailing list