[Scummvm-cvs-logs] SF.net SVN: scummvm:[47680] scummvm/trunk/engines/sci
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Fri Jan 29 22:35:01 CET 2010
Revision: 47680
http://scummvm.svn.sourceforge.net/scummvm/?rev=47680&view=rev
Author: mthreepwood
Date: 2010-01-29 21:34:59 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Silence gcc warnings, have gui32.cpp only build when ENABLE_SCI32 is defined.
Modified Paths:
--------------
scummvm/trunk/engines/sci/graphics/gui32.cpp
scummvm/trunk/engines/sci/graphics/gui32.h
scummvm/trunk/engines/sci/module.mk
Modified: scummvm/trunk/engines/sci/graphics/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.cpp 2010-01-29 21:30:46 UTC (rev 47679)
+++ scummvm/trunk/engines/sci/graphics/gui32.cpp 2010-01-29 21:34:59 UTC (rev 47680)
@@ -294,11 +294,11 @@
// Theoretically, leftPos and topPos should be sane
// Apparently, sometimes they're not, therefore I'm adding some sanity checks here so that
// the hack underneath does not try and draw cels outside the screen coordinates
- if (y < 0 || x >= _screen->getWidth()) {
+ if (x >= _screen->getWidth()) {
continue;
}
- if (y < 0 || y >= _screen->getHeight()) {
+ if (y >= _screen->getHeight()) {
continue;
}
Modified: scummvm/trunk/engines/sci/graphics/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui32.h 2010-01-29 21:30:46 UTC (rev 47679)
+++ scummvm/trunk/engines/sci/graphics/gui32.h 2010-01-29 21:34:59 UTC (rev 47680)
@@ -57,9 +57,9 @@
bool isCursorVisible();
void setCursorShape(GuiResourceId cursorId);
void setCursorView(GuiResourceId viewNum, int loopNum, int cellNum, Common::Point *hotspot);
- virtual void setCursorPos(Common::Point pos);
+ void setCursorPos(Common::Point pos);
Common::Point getCursorPos();
- virtual void moveCursor(Common::Point pos);
+ void moveCursor(Common::Point pos);
void setCursorZone(Common::Rect zone);
int16 getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo);
Modified: scummvm/trunk/engines/sci/module.mk
===================================================================
--- scummvm/trunk/engines/sci/module.mk 2010-01-29 21:30:46 UTC (rev 47679)
+++ scummvm/trunk/engines/sci/module.mk 2010-01-29 21:34:59 UTC (rev 47680)
@@ -34,7 +34,6 @@
engine/state.o \
engine/vm.o \
graphics/gui.o \
- graphics/gui32.o \
graphics/animate.o \
graphics/controls.o \
graphics/cursor.o \
@@ -70,7 +69,8 @@
ifdef ENABLE_SCI32
MODULE_OBJS += \
- engine/kernel32.o
+ engine/kernel32.o \
+ graphics/gui32.o
endif
# This module can be built as a plugin
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