[Scummvm-cvs-logs] scummvm master -> 82c3bdc142f316ddb7c025265571022cba0fa6e6

[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:
82c3bdc142 AGI: Apple IIgs time delay override SQ2 data added


Commit: 82c3bdc142f316ddb7c025265571022cba0fa6e6
    https://github.com/scummvm/scummvm/commit/82c3bdc142f316ddb7c025265571022cba0fa6e6
Author: Martin Kiewitz (m_kiewitz at users.sourceforge.net)
Date: 2016-02-13T04:07:17+01:00

Commit Message:
AGI: Apple IIgs time delay override SQ2 data added

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



diff --git a/engines/agi/appleIIgs_timedelay_overwrite.h b/engines/agi/appleIIgs_timedelay_overwrite.h
index 2045841..1f418d1 100644
--- a/engines/agi/appleIIgs_timedelay_overwrite.h
+++ b/engines/agi/appleIIgs_timedelay_overwrite.h
@@ -38,13 +38,18 @@ struct AgiAppleIIgsDelayOverwriteGameEntry {
 };
 
 static const AgiAppleIIgsDelayOverwriteRoomEntry appleIIgsDelayOverwriteMH1[] = {
-	{ 153, 153, 2  }, // Intro w/ credits
-	{ 104, 104, 2  }, // Intro cutscene
-	{ 117, 117, 2  }, // Intro cutscene (ego waking up)
+	{ 153, 153,  2 }, // Intro w/ credits
+	{ 104, 104,  2 }, // Intro cutscene
+	{ 117, 117,  2 }, // Intro cutscene (ego waking up)
 	// Room 124+125 are MAD rooms, those seem to work at a proper speed
 	{  -1,  -1, -1 }
 };
 
+static const AgiAppleIIgsDelayOverwriteRoomEntry appleIIgsDelayOverwriteSQ2[] = {
+	{   1,   1, -1 }, // Intro: space ship entering space port, don't touch speed
+	{  -1,  -1, -1 }
+};
+
 static const AgiAppleIIgsDelayOverwriteGameEntry appleIIgsDelayOverwriteGameTable[] = {
 	{ GID_BC,         2, nullptr }, // NEEDS TESTING
 	{ GID_GOLDRUSH,   2, nullptr }, // NEEDS TESTING
@@ -57,7 +62,7 @@ static const AgiAppleIIgsDelayOverwriteGameEntry appleIIgsDelayOverwriteGameTabl
 	{ GID_MIXEDUP,    2, nullptr }, // NEEDS TESTING
 	{ GID_PQ1,        2, nullptr }, // NEEDS TESTING
 	{ GID_SQ1,        2, nullptr }, // NEEDS TESTING
-	{ GID_SQ2,        2, nullptr }, // NEEDS TESTING
+	{ GID_SQ2,        2, appleIIgsDelayOverwriteSQ2 }, // NEEDS TESTING
 	{ GID_AGIDEMO,   -1, nullptr }
 };
 
diff --git a/engines/agi/cycle.cpp b/engines/agi/cycle.cpp
index 7f56341..a3873a0 100644
--- a/engines/agi/cycle.cpp
+++ b/engines/agi/cycle.cpp
@@ -367,7 +367,7 @@ int AgiEngine::playGame() {
 			// Maybe a script patch for this game would make sense.
 			// TODO: needs further investigation
 
-			int16 timeDelayOverwrite = -1;
+			int16 timeDelayOverwrite = -99;
 
 			// Now check, if we got a time delay overwrite entry for current room
 			if (appleIIgsDelayOverwrite->roomTable) {
@@ -382,7 +382,7 @@ int AgiEngine::playGame() {
 					appleIIgsDelayRoomOverwrite++;
 				}
 
-				if (timeDelayOverwrite < 0) {
+				if (timeDelayOverwrite == -99) {
 					// use default time delay in case no room specific one was found
 					timeDelayOverwrite = appleIIgsDelayOverwrite->defaultTimeDelayOverwrite;
 				}