[Scummvm-cvs-logs] scummvm master -> 0b57c1771ef54df5e740dac278c743a55eef9372
Strangerke
Strangerke at scummvm.org
Wed Feb 26 07:50:10 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
0b57c1771e VOYEUR: Fix pointer in BoltFile::initDefault()
Commit: 0b57c1771ef54df5e740dac278c743a55eef9372
https://github.com/scummvm/scummvm/commit/0b57c1771ef54df5e740dac278c743a55eef9372
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-25T22:48:32-08:00
Commit Message:
VOYEUR: Fix pointer in BoltFile::initDefault()
Changed paths:
engines/voyeur/files.cpp
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index e5f525a..e78b59b 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -421,7 +421,7 @@ byte *BoltFile::getBoltMember(uint32 id) {
}
void BoltFile::initDefault() {
- _state._curMemberPtr->_data = _state.decompress(0, _state._curMemberPtr->_size,
+ _state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size,
_state._curMemberPtr->_mode);
}
@@ -1094,7 +1094,7 @@ PictureResource::PictureResource(BoltFilesState &state, const byte *src):
Graphics::Surface &s = state._vm->_graphicsManager._screenSurface;
s.fillRect(Common::Rect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), 0);
} else {
- // Direct sceren loading picture. In this case, the raw data of the resource
+ // Direct screen loading picture. In this case, the raw data of the resource
// is directly decompressed into the screen surface. Again, bizarre.
byte *pDest = (byte *)state._vm->_graphicsManager._screenSurface.getPixels();
state.decompress(pDest, SCREEN_WIDTH * SCREEN_HEIGHT, state._curMemberPtr->_mode);
More information about the Scummvm-git-logs
mailing list