[Scummvm-cvs-logs] scummvm master -> ed68aea5ba2b7d68fa22b82536e36527cdfe36c2

[Strangerke]

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:
ed68aea5ba AVALANCHE: Fix bug when Tuck tries to grab Avvy


Commit: ed68aea5ba2b7d68fa22b82536e36527cdfe36c2
    https://github.com/scummvm/scummvm/commit/ed68aea5ba2b7d68fa22b82536e36527cdfe36c2
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-14T08:52:44-08:00

Commit Message:
AVALANCHE: Fix bug when Tuck tries to grab Avvy

Changed paths:
    engines/avalanche/animation.cpp



diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 6bce59d..927de07 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -826,7 +826,6 @@ void Animation::callSpecial(uint16 which) {
 			_vm->_magics[4]._operation = kMagicBounce; // Boundary effect is now working again.
 			_vm->_dialogs->displayScrollChain('q', 35);
 			_sprites[0]->remove();
-			//tr[1].vanishifstill:=true;
 
 			AnimationType *spr1 = _sprites[1];
 			_vm->_background->draw(-1, -1, 1);
@@ -1069,7 +1068,7 @@ void Animation::arrowProcs(byte tripnum) {
 
 void Animation::grabAvvy(byte tripnum) {     // For Friar Tuck, in Nottingham.
 	AnimationType *tripSpr = _sprites[tripnum];
-	AnimationType *avvy = _sprites[tripnum];
+	AnimationType *avvy = _sprites[0];
 
 	int16 tox = avvy->_x + 17;
 	int16 toy = avvy->_y - 1;