[Scummvm-cvs-logs] scummvm master -> 29456da42131aed116910d8b59eedae35752b870

[m-kiewitz]

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:
29456da421 AGI: Added comments about Black Cauldron+KQ2, removed warning


Commit: 29456da42131aed116910d8b59eedae35752b870
    https://github.com/scummvm/scummvm/commit/29456da42131aed116910d8b59eedae35752b870
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-20T13:17:16+01:00

Commit Message:
AGI: Added comments about Black Cauldron+KQ2, removed warning

Also removed old comments about testing needed for IIgs
Also removed warning when game speed is overwritten for IIgs,
b/c all games were tested and should run properly now.

Changed paths:
    engines/agi/appleIIgs_timedelay_overwrite.h
    engines/agi/cycle.cpp
    engines/agi/motion.cpp



diff --git a/engines/agi/appleIIgs_timedelay_overwrite.h b/engines/agi/appleIIgs_timedelay_overwrite.h
index 0502593..c24d7cb 100644
--- a/engines/agi/appleIIgs_timedelay_overwrite.h
+++ b/engines/agi/appleIIgs_timedelay_overwrite.h
@@ -71,14 +71,14 @@ static const AgiAppleIIgsDelayOverwriteRoomEntry appleIIgsDelayOverwriteSQ2[] =
 };
 
 static const AgiAppleIIgsDelayOverwriteGameEntry appleIIgsDelayOverwriteGameTable[] = {
-	{ GID_BC,         2, nullptr }, // NEEDS TESTING
-	{ GID_GOLDRUSH,   2, nullptr }, // NEEDS TESTING
+	{ GID_BC,         2, nullptr }, // sets the speed at the start and doesn't modify it
+	{ GID_GOLDRUSH,   2, nullptr },
 	{ GID_KQ1,        2, nullptr },
 	// KQ2 seems to work fine at speed given by scripts
 	{ GID_KQ3,        2, nullptr },
 	{ GID_KQ4,        2, appleIIgsDelayOverwriteKQ4 },
 	{ GID_LSL1,       2, nullptr }, // Switch Larry 1 to 10 cycles per second (that's around PC Larry 1's "normal" speed
-	{ GID_MH1,        2, appleIIgsDelayOverwriteMH1 }, // NEEDS TESTING
+	{ GID_MH1,        2, appleIIgsDelayOverwriteMH1 },
 	{ GID_MIXEDUP,    2, nullptr },
 	{ GID_PQ1,        2, nullptr },
 	{ GID_SQ1,        2, nullptr }, // completed, no issues using these settings
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index f253804..8ccf69a 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -403,7 +403,7 @@ int AgiEngine::playGame() {
 			if (timeDelayOverwrite >= 0) {
 				if (timeDelayOverwrite != timeDelay) {
 					// delayOverwrite is not the same as the delay taken from the scripts? overwrite it
-					warning("AppleIIgs: time delay overwrite from %d to %d", timeDelay, timeDelayOverwrite);
+					//warning("AppleIIgs: time delay overwrite from %d to %d", timeDelay, timeDelayOverwrite);
 
 					setVar(VM_VAR_TIME_DELAY, timeDelayOverwrite - 1); // adjust for Apple IIgs
 					timeDelay = timeDelayOverwrite;
diff --git a/engines/agi/motion.cpp b/engines/agi/motion.cpp
index 9de1b44..f408ba3 100644
--- a/engines/agi/motion.cpp
+++ b/engines/agi/motion.cpp
@@ -67,7 +67,10 @@ void AgiEngine::changePos(ScreenObjEntry *screenObj) {
 // If this is the case, it would result in some random flag getting overwritten in original AGI after the loop was
 // completed, because in original AGI loop_flag + wander_count/follow_stepSize/move_X shared the same memory location.
 // This is basically an implementation error in the original interpreter.
-// Happens in at least KQ1, when grabbing the eagle (room 22).
+// Happens in at least:
+// - BC: right at the end when the witches disappear at least on Apple IIgs (room 12, screen object 13, view 84)
+// - KQ1: when grabbing the eagle (room 22).
+// - KQ2: happened somewhere in the game, LordHoto couldn't remember exactly where
 void AgiEngine::motionActivated(ScreenObjEntry *screenObj) {
 	if (screenObj->flags & fCycling) {
 		// Cycling active too