diff options
| author | Matthew Hoops | 2010-01-29 21:34:59 +0000 |
|---|---|---|
| committer | Matthew Hoops | 2010-01-29 21:34:59 +0000 |
| commit | 1bc1ff1705dd446538fb45744d3134ee35486e04 (patch) | |
| tree | f9ab595b5b866db75813ef8e8d76900d81b96807 | |
| parent | a800855bf4799de2025f6f1220dc363e66aab475 (diff) | |
| download | scummvm-rg350-1bc1ff1705dd446538fb45744d3134ee35486e04.tar.gz scummvm-rg350-1bc1ff1705dd446538fb45744d3134ee35486e04.tar.bz2 scummvm-rg350-1bc1ff1705dd446538fb45744d3134ee35486e04.zip | |
Silence gcc warnings, have gui32.cpp only build when ENABLE_SCI32 is defined.
svn-id: r47680
| -rw-r--r-- | engines/sci/graphics/gui32.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/graphics/gui32.h | 4 | ||||
| -rw-r--r-- | engines/sci/module.mk | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/graphics/gui32.cpp b/engines/sci/graphics/gui32.cpp index 7caab09ae6..9220e83a2b 100644 --- a/engines/sci/graphics/gui32.cpp +++ b/engines/sci/graphics/gui32.cpp @@ -294,11 +294,11 @@ void SciGui32::frameOut() { // 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; } diff --git a/engines/sci/graphics/gui32.h b/engines/sci/graphics/gui32.h index 9194d9e81e..6098606a35 100644 --- a/engines/sci/graphics/gui32.h +++ b/engines/sci/graphics/gui32.h @@ -57,9 +57,9 @@ public: 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); diff --git a/engines/sci/module.mk b/engines/sci/module.mk index 8df97d7775..2631e75eaf 100644 --- a/engines/sci/module.mk +++ b/engines/sci/module.mk @@ -34,7 +34,6 @@ MODULE_OBJS := \ 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 @@ MODULE_OBJS := \ ifdef ENABLE_SCI32 MODULE_OBJS += \ - engine/kernel32.o + engine/kernel32.o \ + graphics/gui32.o endif # This module can be built as a plugin |