[Scummvm-cvs-logs] scummvm master -> 1c0c540fa78bc6eef49c3d42a6a7512820fe3622

csnover csnover at users.noreply.github.com
Sun Jul 10 18:50:30 CEST 2016


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
46804fda15 SCI32: Re-enable KQ7 subtitles, but with a warning on game start
1c0c540fa7 MACOS: Use 'unsigned int' instead of NSUInteger


Commit: 46804fda15f97825ac67f46e5ded36ec5be01e42
    https://github.com/scummvm/scummvm/commit/46804fda15f97825ac67f46e5ded36ec5be01e42
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-07-10T11:46:19-05:00

Commit Message:
SCI32: Re-enable KQ7 subtitles, but with a warning on game start

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



diff --git a/engines/sci/detection_tables.h b/engines/sci/detection_tables.h
index a48ed3f..6ee666a 100644
--- a/engines/sci/detection_tables.h
+++ b/engines/sci/detection_tables.h
@@ -1736,8 +1736,7 @@ static const struct ADGameDescription SciGameDescriptions[] = {
                             GAMEOPTION_PREFER_DIGITAL_SFX, \
                             GAMEOPTION_ORIGINAL_SAVELOAD, \
                             GAMEOPTION_FB01_MIDI)
-#define GUIO_KQ7      GUIO5(GUIO_NOSUBTITLES, \
-                            GUIO_NOASPECT, \
+#define GUIO_KQ7      GUIO4(GUIO_NOASPECT, \
                             GAMEOPTION_PREFER_DIGITAL_SFX, \
                             GAMEOPTION_ORIGINAL_SAVELOAD, \
                             GAMEOPTION_FB01_MIDI)
diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 07db32a..cf03c50 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -366,6 +366,17 @@ Common::Error SciEngine::run() {
 		}
 	}
 
+	if (getGameId() == GID_KQ7 && ConfMan.getBool("subtitles")) {
+		showScummVMDialog("Subtitles are enabled, but subtitling in King's"
+						  " Quest 7 was unfinished and disabled in the release"
+						  " version of the game. ScummVM allows the subtitles"
+						  " to be re-enabled, but because they were removed from"
+						  " the original game, they do not always render"
+						  " properly or reflect the actual game speech."
+						  " This is not a ScummVM bug -- it is a problem with"
+						  " the game's assets.");
+	}
+
 	// Show a warning if the user has selected a General MIDI device, no GM patch exists
 	// (i.e. patch 4) and the game is one of the known 8 SCI1 games that Sierra has provided
 	// after market patches for in their "General MIDI Utility".
@@ -1063,7 +1074,7 @@ void SciEngine::syncIngameAudioOptions() {
 				case GID_KQ6:
 #ifdef ENABLE_SCI32
 				// Unsure about Gabriel Knight 2
-				// KQ7 has broken subtitles
+				case GID_KQ7: // SCI2.1
 				case GID_GK1: // SCI2
 				case GID_SQ6: // SCI2.1, SQ6 seems to always use subtitles anyway
 				case GID_TORIN: // SCI2.1


Commit: 1c0c540fa78bc6eef49c3d42a6a7512820fe3622
    https://github.com/scummvm/scummvm/commit/1c0c540fa78bc6eef49c3d42a6a7512820fe3622
Author: Colin Snover (github.com at zetafleet.com)
Date: 2016-07-10T11:46:32-05:00

Commit Message:
MACOS: Use 'unsigned int' instead of NSUInteger

NSUInteger apparently does not exist until macOS 10.5, but
buildbot targets 10.4.

Changed paths:
    backends/taskbar/macosx/macosx-taskbar.mm



diff --git a/backends/taskbar/macosx/macosx-taskbar.mm b/backends/taskbar/macosx/macosx-taskbar.mm
index 4e6124e..c842eb8 100644
--- a/backends/taskbar/macosx/macosx-taskbar.mm
+++ b/backends/taskbar/macosx/macosx-taskbar.mm
@@ -269,7 +269,7 @@ void MacOSXTaskbarManager::addRecent(const Common::String &name, const Common::S
 		// Insert the new game at the start
 		[newArray insertObject:dict atIndex:0];
 		// If the game was already present in the array, remove it
-		for (NSUInteger i = 1 ; i < [newArray count] ; ++i) {
+		for (unsigned int i = 1 ; i < [newArray count] ; ++i) {
 			NSDictionary *oldDict = [newArray objectAtIndex:i];
 			if (oldDict == nil)
 				continue;






More information about the Scummvm-git-logs mailing list