diff options
| -rw-r--r-- | engines/prince/prince.cpp | 3 | ||||
| -rw-r--r-- | engines/prince/script.cpp | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index 1fb323b448..8f1710593d 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -298,9 +298,6 @@ void PrinceEngine::init() { _secondHero = new Hero(this, _graph); _secondHero->_maxBoredom = 140; - _mainHero->loadAnimSet(1); - _secondHero->loadAnimSet(3); - _roomPathBitmap = (byte *)malloc(kPathBitmapLen); _roomPathBitmapTemp = (byte *)malloc(kPathBitmapLen); _coordsBuf = (byte *)malloc(kTracePts * 4); diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp index a0ee5bd3b4..a2f22427a7 100644 --- a/engines/prince/script.cpp +++ b/engines/prince/script.cpp @@ -1390,9 +1390,14 @@ void Interpreter::O_SWAPOBJECTS() { } void Interpreter::O_CHANGEHEROSET() { - uint16 hero = readScriptFlagValue(); + uint16 heroId = readScriptFlagValue(); uint16 heroSet = readScriptFlagValue(); - debugInterpreter("O_CHANGEHEROSET hero %d, heroSet %d", hero, heroSet); + if (!heroId) { + _vm->_mainHero->loadAnimSet(heroSet); + } else if (heroId == 1) { + _vm->_secondHero->loadAnimSet(heroSet); + } + debugInterpreter("O_CHANGEHEROSET hero %d, heroSet %d", heroId, heroSet); } void Interpreter::O_ADDSTRING() { |