[Scummvm-cvs-logs] SF.net SVN: scummvm:[44584] scummvm/trunk/engines/sci/gui

[m_kiewitz at users.sourceforge.net]

Revision: 44584
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44584&view=rev
Author:   m_kiewitz
Date:     2009-10-04 05:20:56 +0000 (Sun, 04 Oct 2009)

Log Message:
-----------
SCI/newgui: cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gui/gui_screen.cpp
    scummvm/trunk/engines/sci/gui/gui_view.cpp

Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-04 03:50:10 UTC (rev 44583)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-04 05:20:56 UTC (rev 44584)
@@ -163,12 +163,11 @@
 
 void SciGUIscreen::BitsSaveScreen(Common::Rect rect, byte *screen, byte *&memoryPtr) {
 	int width = rect.width();
-	int height = rect.height();
 	int y;
 
 	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;
 		screen += _width;
 	}
@@ -195,12 +194,11 @@
 
 void SciGUIscreen::BitsRestoreScreen(Common::Rect rect, byte *&memoryPtr, byte *screen) {
 	int width = rect.width();
-	int height = rect.height();
 	int y;
 
 	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;
 		screen += _width;
 	}

Modified: scummvm/trunk/engines/sci/gui/gui_view.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-04 03:50:10 UTC (rev 44583)
+++ scummvm/trunk/engines/sci/gui/gui_view.cpp	2009-10-04 05:20:56 UTC (rev 44584)
@@ -74,7 +74,7 @@
 		palOffset = READ_LE_UINT16(_resourceData + 6);
 
 		if (palOffset && palOffset != 0x100) {
-			_gfx->CreatePaletteFromData(_resourceData + palOffset, &_palette);
+			_gfx->CreatePaletteFromData(&_resourceData[palOffset], &_palette);
 			_embeddedPal = true;
 		}
 
@@ -121,7 +121,7 @@
 		cellSize = _resourceData[13];
 
 		if (palOffset) {
-			_gfx->CreatePaletteFromData(_resourceData + palOffset, &_palette);
+			_gfx->CreatePaletteFromData(&_resourceData[palOffset], &_palette);
 			_embeddedPal = true;
 		}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.