Merge branch 'avalanche' of https://github.com/urukgit/scummvm into avalanche

Conflicts:
	engines/avalanche/lucerna.cpp
	engines/avalanche/timer.cpp

1 files changed, 15 insertions, 15 deletions

diff --git a/engines/avalanche/timer.cpp b/engines/avalanche/timer.cpp
index 8cc21fd86a..161944050e 100644
--- a/engines/avalanche/timer.cpp
+++ b/engines/avalanche/timer.cpp
@@ -273,7 +273,7 @@ void Timer::bang2() {
 
 void Timer::stairs() {
 	_vm->_gyro->blip();
-	_vm->_animation->_sprites[0].walkTo(4);
+	_vm->_animation->_sprites[0].walkTo(3);
 	_vm->_celer->drawBackgroundSprite(-1, -1, 2);
 	_vm->_gyro->_brummieStairs = 2;
 	_vm->_gyro->_magics[10]._operation = Gyro::kMagicSpecial;
@@ -316,8 +316,8 @@ void Timer::getTiedUp() {
 }
 
 void Timer::getTiedUp2() {
-	_vm->_animation->_sprites[0].walkTo(4);
-	_vm->_animation->_sprites[1].walkTo(5);
+	_vm->_animation->_sprites[0].walkTo(3);
+	_vm->_animation->_sprites[1].walkTo(4);
 	_vm->_gyro->_magics[3]._operation = Gyro::kMagicNothing; // No effect when you touch the boundaries.
 	_vm->_gyro->_friarWillTieYouUp = true;
 }
@@ -328,9 +328,9 @@ void Timer::hangAround() {
 	AnimationType *avvy = &_vm->_animation->_sprites[0];
 	avvy->init(7, true, _vm->_animation); // Robin Hood
 	_vm->_gyro->_whereIs[Gyro::kPeopleRobinHood - 150] = kRoomRobins;
-	_vm->_animation->appearPed(1, 2);
+	_vm->_animation->appearPed(1, 1);
 	_vm->_scrolls->displayScrollChain('q', 39);
-	avvy->walkTo(7);
+	avvy->walkTo(6);
 	addTimer(55, kProcHangAround2, kReasonHangingAround);
 }
 
@@ -338,7 +338,7 @@ void Timer::hangAround2() {
 	_vm->_scrolls->displayScrollChain('q', 40);
 	AnimationType *spr = &_vm->_animation->_sprites[1];
 	spr->_vanishIfStill = false;
-	spr->walkTo(4);
+	spr->walkTo(3);
 	_vm->_gyro->_whereIs[Gyro::kPeopleFriarTuck - 150] = kRoomRobins;
 	_vm->_scrolls->displayScrollChain('q', 41);
 	_vm->_animation->_sprites[0].remove();
@@ -358,7 +358,7 @@ void Timer::afterTheShootemup() {
 	// Only placed this here to replace the minigame. TODO: Remove it when the shoot em' up is implemented!
 
 	_vm->_animation->_sprites[0].init(0, true, _vm->_animation); // Avalot.
-	_vm->_animation->appearPed(1, 2);
+	_vm->_animation->appearPed(1, 1);
 	_vm->_gyro->_userMovesAvvy = true;
 	_vm->_gyro->_objects[Gyro::kObjectCrossbow - 1] = true;
 	_vm->_lucerna->refreshObjectList();
@@ -429,8 +429,8 @@ void Timer::jacquesWakesUp() {
 void Timer::naughtyDuke() { // This is when the Duke comes in and takes your money.
 	AnimationType *spr = &_vm->_animation->_sprites[1];
 	spr->init(9, false, _vm->_animation); // Here comes the Duke.
-	_vm->_animation->appearPed(2, 1); // He starts at the door...
-	spr->walkTo(3); // He walks over to you.
+	_vm->_animation->appearPed(2, 0); // He starts at the door...
+	spr->walkTo(2); // He walks over to you.
 
 	// Let's get the door opening.
 	_vm->_celer->drawBackgroundSprite(-1, -1, 1);
@@ -443,7 +443,7 @@ void Timer::naughtyDuke() { // This is when the Duke comes in and takes your mon
 void Timer::naughtyDuke2() {
 	AnimationType *spr = &_vm->_animation->_sprites[1];
 	_vm->_scrolls->displayScrollChain('q', 48); // "Ha ha, it worked again!"
-	spr->walkTo(1); // Walk to the door.
+	spr->walkTo(0); // Walk to the door.
 	spr->_vanishIfStill = true; // Then go away!
 	addTimer(32, kProcNaughtyDuke3, kReasonNaughtyDuke);
 }
@@ -586,8 +586,8 @@ void Timer::riseUpOubliette() {
 void Timer::robinHoodAndGeida() {
 	AnimationType *avvy = &_vm->_animation->_sprites[0];
 	avvy->init(7, true, _vm->_animation);
-	_vm->_animation->appearPed(1, 7);
-	avvy->walkTo(6);
+	_vm->_animation->appearPed(1, 6);
+	avvy->walkTo(5);
 
 	AnimationType *spr = &_vm->_animation->_sprites[1];
 	spr->stopWalk();
@@ -601,8 +601,8 @@ void Timer::robinHoodAndGeidaTalk() {
 
 	AnimationType *avvy = &_vm->_animation->_sprites[0];
 	AnimationType *spr = &_vm->_animation->_sprites[1];
-	avvy->walkTo(2);
-	spr->walkTo(2);
+	avvy->walkTo(1);
+	spr->walkTo(1);
 	avvy->_vanishIfStill = true;
 	spr->_vanishIfStill = true;
 
@@ -615,7 +615,7 @@ void Timer::avalotReturns() {
 	avvy->remove();
 	spr->remove();
 	avvy->init(0, true, _vm->_animation);
-	_vm->_animation->appearPed(1, 1);
+	_vm->_animation->appearPed(1, 0);
 	_vm->_scrolls->displayScrollChain('q', 67);
 	_vm->_gyro->_userMovesAvvy = true;
 }