aboutsummaryrefslogtreecommitdiff
path: root/kyra/staticres.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2006-01-08 13:50:35 +0000
committerJohannes Schickel2006-01-08 13:50:35 +0000
commit5713d00eab77e3b9911114986c0ce75b9c30f938 (patch)
tree3107aab0dabdee44cbf7e96807ad649c9e03b88e /kyra/staticres.cpp
parentd34acdb4627c39f274e43ba8813bacc6204e110c (diff)
downloadscummvm-rg350-5713d00eab77e3b9911114986c0ce75b9c30f938.tar.gz
scummvm-rg350-5713d00eab77e3b9911114986c0ce75b9c30f938.tar.bz2
scummvm-rg350-5713d00eab77e3b9911114986c0ce75b9c30f938.zip
Fixed bug with sequences playing and fixed a bug with an invaild write.
svn-id: r19945
Diffstat (limited to 'kyra/staticres.cpp')
-rw-r--r--kyra/staticres.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kyra/staticres.cpp b/kyra/staticres.cpp
index 2b846dcf3b..8a12825b0a 100644
--- a/kyra/staticres.cpp
+++ b/kyra/staticres.cpp
@@ -257,7 +257,7 @@ void KyraEngine::res_loadResources(int type) {
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 @@ void KyraEngine::res_unloadResources(int type) {
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;