[Scummvm-git-logs] scummvm master -> c64a631520fb743251fd1df689b0786cc97b7e16

[phcoder]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
30e9bd2f1d HADESCH: Fix wrongly displayed straw cart
dc8debc4d2 HADESCH: Fix wrong quest scroll for medusa quest
11d2722379 HADESCH: fix eye of fates position before it's given back
c64a631520 HADESCH: Fix Charon teleportation


Commit: 30e9bd2f1d7c391445ef7271989e568de273ca71
    https://github.com/scummvm/scummvm/commit/30e9bd2f1d7c391445ef7271989e568de273ca71
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-29T11:25:59+01:00

Commit Message:
HADESCH: Fix wrongly displayed straw cart

Changed paths:
    engines/hadesch/rooms/seriphos.cpp


diff --git a/engines/hadesch/rooms/seriphos.cpp b/engines/hadesch/rooms/seriphos.cpp
index bb116c216e..42d65978bf 100644
--- a/engines/hadesch/rooms/seriphos.cpp
+++ b/engines/hadesch/rooms/seriphos.cpp
@@ -123,7 +123,7 @@ public:
 
 		if (name == kStrawCartHotzone) {
 			room->selectFrame(kStrawCartEmpty, kCartZ, 0);
-			room->stopAnim(kStrawCartFull);
+			_seIdles.hide(kStrawCartFull);
 			room->playSound("c7380mb0");
 			g_vm->getHeroBelt()->placeToInventory(kStraw, kStrawTaken);
 			room->disableHotzone(kStrawCartHotzone);
@@ -238,14 +238,6 @@ public:
 		Quest quest = persistent->_quest;
 		room->loadHotZones("Seriphos.HOT", true);
 		room->addStaticLayer("c7010pa0", kBackgroundZ);
-		if (quest == kCreteQuest && !persistent->_seriphosStrawCartTaken) {
-			room->selectFrame(kStrawCartFull, kCartZ, 0);
-			room->stopAnim(kStrawCartEmpty);
-		} else {
-			room->selectFrame(kStrawCartEmpty, kCartZ, 0);
-			room->stopAnim(kStrawCartFull);
-			room->disableHotzone(kStrawCartHotzone);
-		}
 
 		Common::String seAmbFn = quest > kMedusaQuest ? "SeAmb2.txt" : "SeAmb.txt";
 		TextTable seAmb = TextTable(
@@ -275,6 +267,15 @@ public:
 		_seIdles.readTableFile(seIdles, AmbientAnim::PAN_ANY);
 		_seIdles.firstFrame();
 
+		if (quest == kCreteQuest && !persistent->_seriphosStrawCartTaken) {
+			_seIdles.unpauseAndFirstFrame(kStrawCartFull);
+			room->stopAnim(kStrawCartEmpty);
+		} else {
+			room->selectFrame(kStrawCartEmpty, kCartZ, 0);
+			_seIdles.hide(kStrawCartFull);
+			room->disableHotzone(kStrawCartHotzone);
+		}
+
 		room->playAnimLoop("c7110bb0", 2101);
 		room->playAnimLoop("c7110bc0", 2101);
 		room->playAnimLoop("c7180ba0", 3101);


Commit: dc8debc4d29cb4dcf13ae1c373eecad3b7fb907c
    https://github.com/scummvm/scummvm/commit/dc8debc4d29cb4dcf13ae1c373eecad3b7fb907c
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-29T11:25:59+01:00

Commit Message:
HADESCH: Fix wrong quest scroll for medusa quest

Changed paths:
    engines/hadesch/herobelt.cpp


diff --git a/engines/hadesch/herobelt.cpp b/engines/hadesch/herobelt.cpp
index 00abab15af..6fa041c2be 100644
--- a/engines/hadesch/herobelt.cpp
+++ b/engines/hadesch/herobelt.cpp
@@ -340,7 +340,7 @@ void HeroBelt::render(Common::SharedPtr<GfxContext> context, int time, Common::P
 				text = _scrollTextTroyFemale;
 			break;
 		case kMedusaQuest:
-			text = _scrollTextCrete;
+			text = _scrollTextMedusa;
 			break;
 		case kRescuePhilQuest:
 			text = _scrollTextHades;


Commit: 11d27223795ca38b23ecf3b93da5359c5261e423
    https://github.com/scummvm/scummvm/commit/11d27223795ca38b23ecf3b93da5359c5261e423
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-29T11:25:59+01:00

Commit Message:
HADESCH: fix eye of fates position before it's given back

Changed paths:
    engines/hadesch/rooms/medisle.cpp


diff --git a/engines/hadesch/rooms/medisle.cpp b/engines/hadesch/rooms/medisle.cpp
index 699d775fa8..5c63a7920e 100644
--- a/engines/hadesch/rooms/medisle.cpp
+++ b/engines/hadesch/rooms/medisle.cpp
@@ -260,6 +260,7 @@ public:
 			room->disableMouse();
 			room->playSound("m2130ea0", 11027);
 			_eyeIsPickedUp = true;
+			persistent->_medisleEyePosition = kNumFates;
 			return;
 		}
 
@@ -1011,6 +1012,9 @@ private:
 	void enforceEyeConsistency() {
 		Persistent *persistent = g_vm->getPersistent();
 
+		if (persistent->_medisleEyePosition == kNumFates)
+			return;
+
 		if (showFate(persistent->_medisleEyePosition))
 			return;
 


Commit: c64a631520fb743251fd1df689b0786cc97b7e16
    https://github.com/scummvm/scummvm/commit/c64a631520fb743251fd1df689b0786cc97b7e16
Author: Vladimir Serbinenko (phcoder at google.com)
Date: 2020-10-29T11:25:59+01:00

Commit Message:
HADESCH: Fix Charon teleportation

Changed paths:
    engines/hadesch/rooms/riverstyx.cpp


diff --git a/engines/hadesch/rooms/riverstyx.cpp b/engines/hadesch/rooms/riverstyx.cpp
index f0469139ee..0e44d07978 100644
--- a/engines/hadesch/rooms/riverstyx.cpp
+++ b/engines/hadesch/rooms/riverstyx.cpp
@@ -190,7 +190,7 @@ public:
 			room->disableMouse();
 			g_vm->getHeroBelt()->removeFromInventory(item);
 			_charon.hide();
-			room->playVideo("charon glow", 549, 28005, Common::Point(516, 143));
+			room->playVideo("charon glow", 549, 28005, Common::Point(516, 93));
 			g_vm->addTimer(28006, 2000, 1);
 			persistent->_styxCharonUsedPotion = true;
 			return true;
@@ -200,7 +200,7 @@ public:
 			room->disableMouse();
 			g_vm->getHeroBelt()->removeFromInventory(item);
 			_charon.hide();
-			room->playVideo("change purse", 549, 28010, Common::Point(524, 150));
+			room->playVideo("change purse", 549, 28010, Common::Point(524, 100));
 			g_vm->addTimer(28008, 1000, 1);
 			persistent->_styxCharonUsedCoin = true;
 			return true;
@@ -217,7 +217,7 @@ public:
 			stopCharonTalk();
 			if (persistent->_styxCharonUsedPotion && persistent->_styxCharonUsedCoin) {
 				_charon.hide();
-				room->playVideo("charon asks for help", 549, 28011, Common::Point(452, 146));
+				room->playVideo("charon asks for help", 549, 28011, Common::Point(452, 96));
 			} else {
 				room->enableMouse();
 			}