aboutsummaryrefslogtreecommitdiff
path: root/scummvm.cpp
diff options
context:
space:
mode:
authorVincent Hamm2002-02-22 16:59:24 +0000
committerVincent Hamm2002-02-22 16:59:24 +0000
commited72e7dc80770bb39a7c06926aecadf8c352396b (patch)
tree7b058e90eef7213c6e253418be8baa1dff342f37 /scummvm.cpp
parentf5f66b2bfda74360be16fc15dc54792a1575a041 (diff)
downloadscummvm-rg350-ed72e7dc80770bb39a7c06926aecadf8c352396b.tar.gz
scummvm-rg350-ed72e7dc80770bb39a7c06926aecadf8c352396b.tar.bz2
scummvm-rg350-ed72e7dc80770bb39a7c06926aecadf8c352396b.zip
Fixed the indy3 logo
svn-id: r3622
Diffstat (limited to 'scummvm.cpp')
-rw-r--r--scummvm.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/scummvm.cpp b/scummvm.cpp
index ab32fb9482..81a38edbe5 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -279,6 +279,9 @@ int Scumm::scummLoop(int delta) {
if (_features & GF_AUDIOTRACKS)
_vars[VAR_MI1_TIMER]+=5;
+ else
+ if(_features & GF_OLD256)
+ _vars[VAR_MUSIC_FLAG]++;
if (_saveLoadFlag) {
if (_saveLoadFlag==1) {
@@ -691,8 +694,11 @@ void Scumm::initRoomSubBlocks() {
memcpy(getResourceAddress(rtMatrix, 2), ptr, size);
ptr += size;
size = getResourceDataSize(ptr-size-6) - size;
- createResource(rtMatrix, 1, size);
- memcpy(getResourceAddress(rtMatrix, 1), ptr, size);
+ if(size>=0)
+ {
+ createResource(rtMatrix, 1, size);
+ memcpy(getResourceAddress(rtMatrix, 1), ptr, size);
+ }
}
} else {
ptr = findResourceData(MKID('BOXD'), roomptr);