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

[fingolfin at users.sourceforge.net]

Revision: 44978
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44978&view=rev
Author:   fingolfin
Date:     2009-10-12 11:49:32 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
SCI: Fix warnings, cleanup

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/seg_manager.cpp
    scummvm/trunk/engines/sci/gui/gui_gfx.cpp
    scummvm/trunk/engines/sci/gui/gui_screen.cpp

Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-10-12 11:39:24 UTC (rev 44977)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp	2009-10-12 11:49:32 UTC (rev 44978)
@@ -855,7 +855,7 @@
 }
 
 Node *SegManager::lookupNode(reg_t addr) {
-	if (!addr.offset && !addr.segment)
+	if (addr.isNull())
 		return NULL; // Non-error null
 
 	if (getSegmentType(addr.segment) != SEG_TYPE_NODES) {

Modified: scummvm/trunk/engines/sci/gui/gui_gfx.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-12 11:39:24 UTC (rev 44977)
+++ scummvm/trunk/engines/sci/gui/gui_gfx.cpp	2009-10-12 11:49:32 UTC (rev 44978)
@@ -1284,7 +1284,6 @@
 }
 
 void SciGuiGfx::AnimateUpdateScreen(byte oldPicNotValid) {
-	SegManager *segMan = _s->_segMan;
 	GuiAnimateEntry *listEntry;
 	uint16 signal;
 	GuiAnimateList::iterator listIterator;

Modified: scummvm/trunk/engines/sci/gui/gui_screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-12 11:39:24 UTC (rev 44977)
+++ scummvm/trunk/engines/sci/gui/gui_screen.cpp	2009-10-12 11:49:32 UTC (rev 44978)
@@ -36,9 +36,6 @@
 SciGuiScreen::SciGuiScreen(int16 width, int16 height, int16 scaleFactor) : 
 	_width(width), _height(height) {
 
-	int i;
-	uint16 base = 0;
-
 	_pixels = _width * _height;
 
 	// if you want to do scaling, adjust putPixel() accordingly


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