[Scummvm-cvs-logs] scummvm master -> 4aec92e5e9d00d7a9b38d893682823777e088256

[Kirben]

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:
4aec92e5e9 SCUMM: Backyard Baseball 2003 uses a unique variable for the subtitle setting, fixes changing subtitles via ScummVM.


Commit: 4aec92e5e9d00d7a9b38d893682823777e088256
    https://github.com/scummvm/scummvm/commit/4aec92e5e9d00d7a9b38d893682823777e088256
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2012-05-30T18:40:21-07:00

Commit Message:
SCUMM: Backyard Baseball 2003 uses a unique variable for the subtitle setting, fixes changing subtitles via ScummVM.

Changed paths:
    engines/scumm/detection_tables.h
    engines/scumm/scumm.cpp
    engines/scumm/scumm.h



diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 34ec6b6..452a6f0 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -382,7 +382,7 @@ static const GameSettings gameVariantsTable[] = {
 	{"pjgames", 0, 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_HE_LOCALIZED | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 
 	// Added the use of bink videos
-	{"Baseball2003", 0, 0, GID_HEGAME, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
+	{"Baseball2003", 0, 0, GID_BASEBALL2003, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 	{"basketball", 0, 0, GID_BASKETBALL, 6, 100, MDT_NONE, GF_USE_KEY| GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 	{"football2002", 0, 0, GID_FOOTBALL, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
 	{"Soccer2004", 0, 0, GID_SOCCER2004, 6, 100, MDT_NONE, GF_USE_KEY | GF_16BIT_COLOR, UNK, GUIO3(GUIO_NOLAUNCHLOAD, GUIO_NOMIDI, GUIO_NOASPECT)},
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index fc46f88..d0f46f3 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1917,6 +1917,13 @@ void ScummEngine::syncSoundSettings() {
 		if (VAR_CHARINC != 0xFF)
 			VAR(VAR_CHARINC) = _defaultTalkDelay;
 	}
+
+	// Backyard Baseball 2003 uses a unique subtitle variable,
+	// rather than VAR_SUBTITLES
+	if (_game.id == GID_BASEBALL2003) {
+		_scummVars[632] = ConfMan.getBool("subtitles");
+	}
+
 }
 
 void ScummEngine::setTalkSpeed(int talkspeed) {
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index cacf8c2..8c0070b 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -245,6 +245,7 @@ enum ScummGameId {
 	GID_SOCCERMLS,
 	GID_SOCCER2004,
 	GID_BASEBALL2001,
+	GID_BASEBALL2003,
 	GID_BASKETBALL,
 	GID_MOONBASE,
 	GID_HECUP		// CUP demos