[Scummvm-cvs-logs] scummvm master -> 9fecbe58a1f99edc0dc067564e4fd53730faa933

m-kiewitz m_kiewitz at users.sourceforge.net
Wed Feb 3 01:04:01 CET 2016


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:
9fecbe58a1 AGI: Remove Gold Rush workaround, no longer needed


Commit: 9fecbe58a1f99edc0dc067564e4fd53730faa933
    https://github.com/scummvm/scummvm/commit/9fecbe58a1f99edc0dc067564e4fd53730faa933
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-03T01:03:40+01:00

Commit Message:
AGI: Remove Gold Rush workaround, no longer needed

Changed paths:
    engines/agi/op_cmd.cpp



diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 46a27d3..cf1c19a 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -263,18 +263,6 @@ void cmdNewRoom(AgiGame *state, AgiEngine *vm, uint8 *parameter) {
 	uint16 newRoomNr = parameter[0];
 
 	state->_vm->newRoom(newRoomNr);
-
-	// WORKAROUND: Works around intro skipping bug (#1737343) in Gold Rush.
-	// Intro was skipped because the enter-keypress finalizing the entering
-	// of the copy protection string (Copy protection is in logic.128) was
-	// left over to the intro scene (Starts with room 73 i.e. logic.073).
-	// The intro scene checks for any keys pressed and if it finds any it
-	// jumps to the game's start (Room 1 i.e. logic.001). We clear the
-	// keyboard buffer when the intro sequence's first room (Room 73) is
-	// loaded so that no keys from the copy protection scene can be left
-	// over to cause the intro to skip to the game's start.
-	if (getGameID() == GID_GOLDRUSH && newRoomNr == 73)
-		state->keypress = 0;
 }
 
 void cmdNewRoomF(AgiGame *state, AgiEngine *vm, uint8 *parameter) {






More information about the Scummvm-git-logs mailing list