[Scummvm-cvs-logs] SF.net SVN: scummvm:[44695] scummvm/trunk/engines/sci/gui
thebluegr at users.sourceforge.net
thebluegr at users.sourceforge.net
Tue Oct 6 16:00:35 CEST 2009
Revision: 44695
http://scummvm.svn.sourceforge.net/scummvm/?rev=44695&view=rev
Author: thebluegr
Date: 2009-10-06 14:00:35 +0000 (Tue, 06 Oct 2009)
Log Message:
-----------
Removed duplicate private variables
Modified Paths:
--------------
scummvm/trunk/engines/sci/gui/gui_picture.cpp
scummvm/trunk/engines/sci/gui/gui_picture.h
scummvm/trunk/engines/sci/gui/gui_screen.h
Modified: scummvm/trunk/engines/sci/gui/gui_picture.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.cpp 2009-10-06 13:30:20 UTC (rev 44694)
+++ scummvm/trunk/engines/sci/gui/gui_picture.cpp 2009-10-06 14:00:35 UTC (rev 44695)
@@ -56,7 +56,6 @@
_style = style;
_addToFlag = addToFlag;
_EGApaletteNo = EGApaletteNo;
- _curPort = _gfx->GetPort();
_priority = 0;
if (READ_LE_UINT16(_resource->data) == 0x26) {
@@ -70,7 +69,7 @@
void SciGuiPicture::reset() {
int16 x, y;
- for (y = _curPort->top; y < _screen->_height; y++) {
+ for (y = _gfx->GetPort()->top; y < _screen->_height; y++) {
for (x = 0; x < _screen->_width; x++) {
_screen->putPixel(x, y, SCI_SCREEN_MASK_ALL, 255, 0, 0);
}
@@ -153,9 +152,9 @@
byte byte, runLength;
uint16 lasty;
- y += _curPort->top;
+ y += _gfx->GetPort()->top;
- lasty = MIN<int16>(height + y, _curPort->rect.bottom) + _curPort->top;
+ lasty = MIN<int16>(height + y, _gfx->GetPort()->rect.bottom) + _gfx->GetPort()->top;
switch (_s->resMan->getViewType()) {
case kViewVga:
Modified: scummvm/trunk/engines/sci/gui/gui_picture.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_picture.h 2009-10-06 13:30:20 UTC (rev 44694)
+++ scummvm/trunk/engines/sci/gui/gui_picture.h 2009-10-06 14:00:35 UTC (rev 44695)
@@ -58,7 +58,6 @@
int16 _resourceId;
Resource *_resource;
- GuiPort *_curPort;
uint16 _style;
bool _addToFlag;
int16 _EGApaletteNo;
Modified: scummvm/trunk/engines/sci/gui/gui_screen.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.h 2009-10-06 13:30:20 UTC (rev 44694)
+++ scummvm/trunk/engines/sci/gui/gui_screen.h 2009-10-06 14:00:35 UTC (rev 44695)
@@ -61,8 +61,6 @@
void dither();
- GuiPalette _sysPalette;
-
uint16 _width;
uint16 _height;
uint _pixels;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list