diff options
| author | Max Horn | 2009-10-12 11:49:32 +0000 |
|---|---|---|
| committer | Max Horn | 2009-10-12 11:49:32 +0000 |
| commit | ab1f2dac77448b848f1e736e6b8cc4162f6a5ec1 (patch) | |
| tree | d0fc140ff7436a18b5fc58e5f40189c858f7f50b | |
| parent | 250402f21bf95d36e543013112455c6e00eb1e23 (diff) | |
| download | scummvm-rg350-ab1f2dac77448b848f1e736e6b8cc4162f6a5ec1.tar.gz scummvm-rg350-ab1f2dac77448b848f1e736e6b8cc4162f6a5ec1.tar.bz2 scummvm-rg350-ab1f2dac77448b848f1e736e6b8cc4162f6a5ec1.zip | |
SCI: Fix warnings, cleanup
svn-id: r44978
| -rw-r--r-- | engines/sci/engine/seg_manager.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/gui/gui_gfx.cpp | 1 | ||||
| -rw-r--r-- | engines/sci/gui/gui_screen.cpp | 3 |
3 files changed, 1 insertions, 5 deletions
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp index 5c9eb9141c..c318be21c9 100644 --- a/engines/sci/engine/seg_manager.cpp +++ b/engines/sci/engine/seg_manager.cpp @@ -855,7 +855,7 @@ List *SegManager::lookupList(reg_t addr) { } 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) { diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp index 2c1bfee9bc..e26ac8bf9d 100644 --- a/engines/sci/gui/gui_gfx.cpp +++ b/engines/sci/gui/gui_gfx.cpp @@ -1284,7 +1284,6 @@ void SciGuiGfx::AnimateDrawCels() { } void SciGuiGfx::AnimateUpdateScreen(byte oldPicNotValid) { - SegManager *segMan = _s->_segMan; GuiAnimateEntry *listEntry; uint16 signal; GuiAnimateList::iterator listIterator; diff --git a/engines/sci/gui/gui_screen.cpp b/engines/sci/gui/gui_screen.cpp index 1cbaf01da5..30eea9cbbf 100644 --- a/engines/sci/gui/gui_screen.cpp +++ b/engines/sci/gui/gui_screen.cpp @@ -36,9 +36,6 @@ namespace Sci { 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 |