diff options
| author | Willem Jan Palenstijn | 2009-10-11 08:07:59 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2009-10-11 08:07:59 +0000 |
| commit | 76ea099d234820a5e26efb8aad15305c670a9eac (patch) | |
| tree | 21109c63c018bf46ab32a50c47666bf7c2d22a82 | |
| parent | 4ca178e203cfe4e7dbda902093ebed801b72e3eb (diff) | |
| download | scummvm-rg350-76ea099d234820a5e26efb8aad15305c670a9eac.tar.gz scummvm-rg350-76ea099d234820a5e26efb8aad15305c670a9eac.tar.bz2 scummvm-rg350-76ea099d234820a5e26efb8aad15305c670a9eac.zip | |
SCI: Remove superfluous casts; fix warning.
svn-id: r44895
| -rw-r--r-- | engines/sci/gui/gui_gfx.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/engines/sci/gui/gui_gfx.cpp b/engines/sci/gui/gui_gfx.cpp index bedffac9e2..1c96f4471f 100644 --- a/engines/sci/gui/gui_gfx.cpp +++ b/engines/sci/gui/gui_gfx.cpp @@ -925,7 +925,7 @@ void SciGuiGfx::AnimateFill(byte &old_picNotValid) { listIterator = _animateList.begin(); while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; // Get the corresponding view @@ -988,7 +988,7 @@ void SciGuiGfx::AnimateUpdate() { // Remove all previous cels from screen listIterator = _animateList.reverse_begin(); while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; signal = listEntry->signal; @@ -1014,7 +1014,7 @@ void SciGuiGfx::AnimateUpdate() { listIterator = listBegin; while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; signal = listEntry->signal; @@ -1036,7 +1036,7 @@ void SciGuiGfx::AnimateUpdate() { listIterator = listBegin; while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; signal = listEntry->signal; @@ -1058,7 +1058,7 @@ void SciGuiGfx::AnimateUpdate() { listIterator = listBegin; while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; signal = listEntry->signal; @@ -1088,7 +1088,7 @@ void SciGuiGfx::AnimateDrawCels() { listIterator = _animateList.begin(); while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; signal = listEntry->signal; @@ -1131,7 +1131,7 @@ void SciGuiGfx::AnimateRestoreAndDelete(int argc, reg_t *argv) { listIterator = _animateList.reverse_begin(); while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; signal = listEntry->signal; @@ -1157,7 +1157,6 @@ void SciGuiGfx::AnimateRestoreAndDelete(int argc, reg_t *argv) { } void SciGuiGfx::AddToPicDrawCels(List *list) { - SegManager *segMan = _s->_segMan; reg_t curObject; GuiAnimateEntry *listEntry; SciGuiView *view = NULL; @@ -1166,7 +1165,7 @@ void SciGuiGfx::AddToPicDrawCels(List *list) { listIterator = _animateList.begin(); while (listIterator != listEnd) { - listEntry = (GuiAnimateEntry *)*listIterator; + listEntry = *listIterator; curObject = listEntry->object; if (listEntry->priority == -1) |