[Scummvm-cvs-logs] scummvm master -> 54a4b2fa863b5fd9469e360ecd7c4b0717b373fe
lukaslw
lukaslw at gmail.com
Sun Nov 9 22:33:40 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
54a4b2fa86 PRINCE: Double animation of bird after 'throw a rock' mini-game fix
Commit: 54a4b2fa863b5fd9469e360ecd7c4b0717b373fe
https://github.com/scummvm/scummvm/commit/54a4b2fa863b5fd9469e360ecd7c4b0717b373fe
Author: lukaslw (lukaslw at gmail.com)
Date: 2014-11-09T22:20:36+01:00
Commit Message:
PRINCE: Double animation of bird after 'throw a rock' mini-game fix
Changed paths:
engines/prince/script.cpp
engines/prince/script.h
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index 1e50fe5..4ed3cee 100644
--- a/engines/prince/script.cpp
+++ b/engines/prince/script.cpp
@@ -722,6 +722,17 @@ void Interpreter::O_PUTBACKANIM() {
_vm->_script->installSingleBackAnim(_vm->_backAnimList, slot, room->_backAnim);
}
delete room;
+
+ // WALKAROUND: fix for turning on 'walking bird' background animation too soon,
+ // after completing 'throw a rock' mini-game in Silmaniona location.
+ // Second bird shouldn't appear when normal animation is still in use
+ // in script lines 13814 and 13848
+ if (_currentInstruction == kSecondBirdAnimationScriptFix) {
+ if (_vm->_normAnimList[1]._state == 0) {
+ _vm->_backAnimList[0].backAnims[0]._state = 1;
+ }
+ }
+
debugInterpreter("O_PUTBACKANIM roomId %d, slot %d, animId %d", roomId, slot, animId);
}
diff --git a/engines/prince/script.h b/engines/prince/script.h
index 23c0468..fe79cf5 100644
--- a/engines/prince/script.h
+++ b/engines/prince/script.h
@@ -242,6 +242,7 @@ private:
static OpcodeFunc _opcodes[];
static const uint kGiveLetterScriptFix = 79002;
+ static const uint kSecondBirdAnimationScriptFix = 45658;
// Keep opcode handlers names as they are in original code
// making it easier to switch back and forth
More information about the Scummvm-git-logs
mailing list