PEGASUS: Fix incorrect displaying of the synthesizer shutdown video

scummvm · Oct 7, 2013 · 06c4c11 · 06c4c11
1 parent 3ca434d
commit 06c4c11
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -2653,7 +2653,6 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
 				GameState.setWSCAnalyzerOn(false);
 				GameState.setWSCDartInAnalyzer(false);
 				GameState.setWSCAnalyzedDart(false);
-				GameState.setWSCPickedUpAntidote(false);
 				GameState.setWSCSawMorph(false);
 				GameState.setWSCDesignedAntidote(false);
 				GameState.setWSCOfficeMessagesOpen(false);

diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -337,7 +337,6 @@ void TinyTSA::receiveNotification(Notification *notification, const Notification
 				GameState.setWSCRemovedDart(false);
 				GameState.setWSCAnalyzerOn(false);
 				GameState.setWSCAnalyzedDart(false);
-				GameState.setWSCPickedUpAntidote(false);
 				GameState.setWSCSawMorph(false);
 				GameState.setWSCDesignedAntidote(false);
 				GameState.setWSCOfficeMessagesOpen(false);

diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -2336,13 +2336,16 @@ Hotspot *WSC::getItemScreenSpot(Item *item, DisplayElement *element) {
 void WSC::pickedUpItem(Item *item) {
 	switch (item->getObjectID()) {
 	case kAntidote:
+		// WORKAROUND: Make sure the poison is cleared separately from deactivating
+		// the synthesizer video.
+		GameState.setWSCPoisoned(false);
+		GameState.setWSCRemovedDart(false);
+		_privateFlags.setFlag(kWSCDraggingAntidoteFlag, false);
+		playSpotSoundSync(kDrinkAntidoteIn, kDrinkAntidoteOut);
+		setUpPoison();
+
 		if (!GameState.getWSCPickedUpAntidote()) {
-			GameState.setWSCPoisoned(false);
-			GameState.setWSCRemovedDart(false);
 			GameState.setWSCPickedUpAntidote(true);
-			_privateFlags.setFlag(kWSCDraggingAntidoteFlag, false);
-			playSpotSoundSync(kDrinkAntidoteIn, kDrinkAntidoteOut);
-			setUpPoison();
 			startExtraSequence(kW03SouthDeactivate, kExtraCompletedFlag, kFilterNoInput);
 		}
 		break;