aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bevilacqua2011-11-16 05:35:40 -0500
committerWillem Jan Palenstijn2011-11-20 22:43:12 +0100
commitb592d73e6226c5c5375d4b40123b15e37b064b9e (patch)
treecb9a57e5ad2fb81d988c99b7704795477719807d
parent4c6038260484d7f7b63f435a3124bb99e9a44733 (diff)
downloadscummvm-rg350-b592d73e6226c5c5375d4b40123b15e37b064b9e.tar.gz
scummvm-rg350-b592d73e6226c5c5375d4b40123b15e37b064b9e.tar.bz2
scummvm-rg350-b592d73e6226c5c5375d4b40123b15e37b064b9e.zip
TOLTECS: silence a couple gcc warnings
-rw-r--r--engines/toltecs/screen.h1
-rw-r--r--engines/toltecs/sprite.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/toltecs/screen.h b/engines/toltecs/screen.h
index bf49569782..988f59c840 100644
--- a/engines/toltecs/screen.h
+++ b/engines/toltecs/screen.h
@@ -117,6 +117,7 @@ class SpriteFilter {
public:
SpriteFilter(const SpriteDrawItem &sprite) : _sprite(&sprite) {
}
+ virtual ~SpriteFilter() {}
virtual SpriteReaderStatus readPacket(PixelPacket &packet) = 0;
protected:
const SpriteDrawItem *_sprite;
diff --git a/engines/toltecs/sprite.cpp b/engines/toltecs/sprite.cpp
index 08c7ef47cb..7a02663793 100644
--- a/engines/toltecs/sprite.cpp
+++ b/engines/toltecs/sprite.cpp
@@ -467,7 +467,7 @@ void Screen::drawSpriteCore(byte *dest, SpriteFilter &reader, const SpriteDrawIt
if (((sprite.flags & 0x40) && (packet.pixel != 0)) ||
((sprite.flags & 0x10) && (packet.pixel != 0xFF)) ||
- !(sprite.flags & 0x10) && (packet.pixel != 0))
+ (!(sprite.flags & 0x10) && (packet.pixel != 0)))
{
if (sprite.flags & 0x40) {
while (packet.count--) {