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

clone2727 clone2727 at gmail.com
Fri Sep 21 01:47:12 CEST 2012


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:
b0079f4fa6 PEGASUS: Prevent recalling from Prehistoric without the historical log


Commit: b0079f4fa67099cec2c58e7907bf3fe09d0755cf
    https://github.com/scummvm/scummvm/commit/b0079f4fa67099cec2c58e7907bf3fe09d0755cf
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-09-20T16:45:01-07:00

Commit Message:
PEGASUS: Prevent recalling from Prehistoric without the historical log

Fixes an original game bug

Changed paths:
    engines/pegasus/items/biochips/pegasuschip.cpp



diff --git a/engines/pegasus/items/biochips/pegasuschip.cpp b/engines/pegasus/items/biochips/pegasuschip.cpp
index c0c3f6b..8862271 100644
--- a/engines/pegasus/items/biochips/pegasuschip.cpp
+++ b/engines/pegasus/items/biochips/pegasuschip.cpp
@@ -113,6 +113,12 @@ void PegasusChip::setUpPegasusChipRude() {
 void PegasusChip::activatePegasusHotspots() {
 	switch (GameState.getCurrentNeighborhood()) {
 	case kPrehistoricID:
+		// WORKAROUND: Don't allow the player to recall if they don't have
+		// the historical log. Otherwise, gameplay is broken when returning
+		// to the TSA.
+		if (!((PegasusEngine *)g_engine)->playerHasItemID(kHistoricalLog))
+			return;
+		// fall through
 	case kMarsID:
 	case kWSCID:
 	case kNoradAlphaID:






More information about the Scummvm-git-logs mailing list