thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI/newgui: cleanup

Browse source 
svn-id: r44584
This commit is contained in:
Martin Kiewitz 2009-10-04 05:20:56 +00:00
parent b6d7da6927
commit 10d70ec742
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/sci/gui/gui_screen.cpp
View file

@ -163,12 +163,11 @@ void SciGUIscreen::BitsSave(Common::Rect rect, byte mask, byte *memoryPtr) {
void SciGUIscreen::BitsSaveScreen(Common::Rect rect, byte *screen, byte *&memoryPtr) { void SciGUIscreen::BitsSaveScreen(Common::Rect rect, byte *screen, byte *&memoryPtr) {
int width = rect.width(); int width = rect.width();
int height = rect.height();
int y; int y;
screen += (rect.top * _width) + rect.left; screen += (rect.top * _width) + rect.left;
for (y=rect.top; y<rect.bottom; y++) { for (y = rect.top; y < rect.bottom; y++) {
memcpy(memoryPtr, (void*)screen, width); memoryPtr += width; memcpy(memoryPtr, (void*)screen, width); memoryPtr += width;
screen += _width; screen += _width;
} }
@ -195,12 +194,11 @@ void SciGUIscreen::BitsRestore(byte *memoryPtr) {
void SciGUIscreen::BitsRestoreScreen(Common::Rect rect, byte *&memoryPtr, byte *screen) { void SciGUIscreen::BitsRestoreScreen(Common::Rect rect, byte *&memoryPtr, byte *screen) {
int width = rect.width(); int width = rect.width();
int height = rect.height();
int y; int y;
screen += (rect.top * _width) + rect.left; screen += (rect.top * _width) + rect.left;
for (y=rect.top; y<rect.bottom; y++) { for (y = rect.top; y < rect.bottom; y++) {
memcpy((void*) screen, memoryPtr, width); memoryPtr += width; memcpy((void*) screen, memoryPtr, width); memoryPtr += width;
screen += _width; screen += _width;
} }

4
engines/sci/gui/gui_view.cpp
View file

@ -74,7 +74,7 @@ void SciGUIview::initData(sciResourceId resourceId) {
palOffset = READ_LE_UINT16(_resourceData + 6); palOffset = READ_LE_UINT16(_resourceData + 6);
if (palOffset && palOffset != 0x100) { if (palOffset && palOffset != 0x100) {
_gfx->CreatePaletteFromData(_resourceData + palOffset, &_palette); _gfx->CreatePaletteFromData(&_resourceData[palOffset], &_palette);
_embeddedPal = true; _embeddedPal = true;
} }
@ -121,7 +121,7 @@ void SciGUIview::initData(sciResourceId resourceId) {
cellSize = _resourceData[13]; cellSize = _resourceData[13];
if (palOffset) { if (palOffset) {
_gfx->CreatePaletteFromData(_resourceData + palOffset, &_palette); _gfx->CreatePaletteFromData(&_resourceData[palOffset], &_palette);
_embeddedPal = true; _embeddedPal = true;
} }