aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2015-05-09 08:56:12 -0400
committerPaul Gilbert2015-05-09 08:56:12 -0400
commit1ef5b667925d5813bde6aba2392e3cb19cb08f22 (patch)
tree4a19c331d13533b6bebbf954d26e4017acfbd12a
parent13c06c100e6eac2538de3ec178e654147c38bb1f (diff)
downloadscummvm-rg350-1ef5b667925d5813bde6aba2392e3cb19cb08f22.tar.gz
scummvm-rg350-1ef5b667925d5813bde6aba2392e3cb19cb08f22.tar.bz2
scummvm-rg350-1ef5b667925d5813bde6aba2392e3cb19cb08f22.zip
SHERLOCK: Cleanup fixes for animation player
-rw-r--r--engines/sherlock/animation.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sherlock/animation.cpp b/engines/sherlock/animation.cpp
index 46568f8742..ced03e8a49 100644
--- a/engines/sherlock/animation.cpp
+++ b/engines/sherlock/animation.cpp
@@ -127,7 +127,8 @@ bool Animation::play(const Common::String &filename, int minDelay, int fade,
// since we don't want the offsets in the image file to be used, just the explicit position we specify
screen.transBlitFrom(images[imageFrame]._frame, pt);
} else {
- // No sprite to show for this animation frame
+ // At this point, either the sprites for the frame has been complete, or there weren't any sprites
+ // at all to draw for the frame
if (fade == 255) {
// Gradual fade in
if (screen.equalizePalette(images._palette) == 0)
@@ -178,14 +179,14 @@ const int *Animation::checkForSoundFrames(const Common::String &filename) {
if (_vm->_soundOverride.empty()) {
for (int idx = 0; idx < PROLOGUE_NAMES_COUNT; ++idx) {
- if (!scumm_stricmp(filename.c_str(), PROLOGUE_NAMES[idx])) {
+ if (!filename.equalsIgnoreCase(PROLOGUE_NAMES[idx])) {
frames = &PROLOGUE_FRAMES[idx][0];
break;
}
}
} else {
for (int idx = 0; idx < TITLE_NAMES_COUNT; ++idx) {
- if (!scumm_stricmp(filename.c_str(), TITLE_NAMES[idx])) {
+ if (!filename.equalsIgnoreCase(TITLE_NAMES[idx])) {
frames = &TITLE_FRAMES[idx][0];
break;
}