[Scummvm-cvs-logs] scummvm master -> 1019c0148bf029316947362e83fca345ba935eb1

wjp wjp at usecode.org
Thu Nov 21 09:42:29 CET 2013


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:
3ea127e877 SCI: Fix warning
1019c0148b SCI: Fix warning


Commit: 3ea127e87774946bb3fb5e21afdb6dc2a4bb3de6
    https://github.com/scummvm/scummvm/commit/3ea127e87774946bb3fb5e21afdb6dc2a4bb3de6
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-11-21T00:39:19-08:00

Commit Message:
SCI: Fix warning

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index dc62d77..cbad3c6 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -947,6 +947,8 @@ void SciEngine::updateScummVMAudioOptions() {
 				if (subtitlesOn && speechOn)
 					return;
 				break;
+			default:
+				break;
 			}
 			ConfMan.setBool("subtitles", false);
 			ConfMan.setBool("speech_mute", false);


Commit: 1019c0148bf029316947362e83fca345ba935eb1
    https://github.com/scummvm/scummvm/commit/1019c0148bf029316947362e83fca345ba935eb1
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2013-11-21T00:41:44-08:00

Commit Message:
SCI: Fix warning

Changed paths:
    engines/sci/engine/script_patches.cpp



diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 948a967..7723238 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -114,7 +114,7 @@ struct SciScriptPatcherEntry {
 	const uint16 *patchData;
 };
 
-#define SCI_SIGNATUREENTRY_TERMINATOR { 0, NULL, 0, 0, 0, NULL, NULL }
+#define SCI_SIGNATUREENTRY_TERMINATOR { false, 0, NULL, 0, 0, 0, NULL, NULL }
 
 struct SciScriptPatcherSelector {
 	const char *name;






More information about the Scummvm-git-logs mailing list