[Scummvm-cvs-logs] scummvm master -> 2ff628a24a31b592cba4169260ac1973f2cc16c7
lordhoto
lordhoto at gmail.com
Sat Jul 5 13:49:17 CEST 2014
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bead2e0770 SCUMM: Remove empty line before license header.
4ba6f07a6c SCUMM: Use spaces instead of tabs in comments.
032baa8cd8 SCUMM: Remove unused variable.
2ff628a24a SCUMM: Slight formatting fixes.
Commit: bead2e07701e88896ff9d0bb8172097d2a8d5896
https://github.com/scummvm/scummvm/commit/bead2e07701e88896ff9d0bb8172097d2a8d5896
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-07-05T13:36:29+02:00
Commit Message:
SCUMM: Remove empty line before license header.
Changed paths:
engines/scumm/cdda.h
diff --git a/engines/scumm/cdda.h b/engines/scumm/cdda.h
index 2146777..4e5c3c4 100644
--- a/engines/scumm/cdda.h
+++ b/engines/scumm/cdda.h
@@ -1,4 +1,3 @@
-
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
Commit: 4ba6f07a6c03c51eaec35853cacaf2165f752795
https://github.com/scummvm/scummvm/commit/4ba6f07a6c03c51eaec35853cacaf2165f752795
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-07-05T13:38:29+02:00
Commit Message:
SCUMM: Use spaces instead of tabs in comments.
Changed paths:
engines/scumm/cdda.h
diff --git a/engines/scumm/cdda.h b/engines/scumm/cdda.h
index 4e5c3c4..c1e6e82 100644
--- a/engines/scumm/cdda.h
+++ b/engines/scumm/cdda.h
@@ -44,9 +44,9 @@ namespace Scumm {
* Create a new SeekableAudioStream from the CDDA data in the given stream.
* Allows for seeking (which is why we require a SeekableReadStream).
*
- * @param stream the SeekableReadStream from which to read the CDDA data
- * @param disposeAfterUse whether to delete the stream after use
- * @return a new SeekableAudioStream, or NULL, if an error occurred
+ * @param stream The SeekableReadStream from which to read the CDDA data
+ * @param disposeAfterUse Whether to delete the stream after use
+ * @return a new SeekableAudioStream, or NULL, if an error occurred
*/
Audio::SeekableAudioStream *makeCDDAStream(
Common::SeekableReadStream *stream,
Commit: 032baa8cd8edb34c8aa11cb3ec9a1f1fb1a0c8b7
https://github.com/scummvm/scummvm/commit/032baa8cd8edb34c8aa11cb3ec9a1f1fb1a0c8b7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-07-05T13:39:59+02:00
Commit Message:
SCUMM: Remove unused variable.
Changed paths:
engines/scumm/detection.cpp
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 55df592..e77047d 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -223,7 +223,6 @@ static const char *getSteamExeNameFromPattern(Common::String pattern, Common::Pl
static Common::String generateFilenameForDetection(const char *pattern, FilenameGenMethod genMethod, Common::Platform platform) {
Common::String result;
- Common::String patternStr = pattern;
switch (genMethod) {
case kGenDiskNum:
Commit: 2ff628a24a31b592cba4169260ac1973f2cc16c7
https://github.com/scummvm/scummvm/commit/2ff628a24a31b592cba4169260ac1973f2cc16c7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-07-05T13:40:29+02:00
Commit Message:
SCUMM: Slight formatting fixes.
Changed paths:
engines/scumm/file.cpp
diff --git a/engines/scumm/file.cpp b/engines/scumm/file.cpp
index 21b0e59..8f6fdbe 100644
--- a/engines/scumm/file.cpp
+++ b/engines/scumm/file.cpp
@@ -203,6 +203,7 @@ uint32 ScummFile::read(void *dataPtr, uint32 dataSize) {
#pragma mark -
#pragma mark --- ScummSteamFile ---
#pragma mark -
+
bool ScummSteamFile::open(const Common::String &filename) {
for (const SteamIndexFile *indexFile = steamIndexFiles; indexFile->len; ++indexFile) {
if (indexFile->id == _steamGame.id && indexFile->platform == _steamGame.platform && filename.equalsIgnoreCase(indexFile->indexFileName))
@@ -219,8 +220,9 @@ bool ScummSteamFile::openWithSubRange(const Common::String &filename, int32 subF
_subFileLen = subFileLen;
seek(0, SEEK_SET);
return true;
- } else
+ } else {
return false;
+ }
}
#pragma mark -
More information about the Scummvm-git-logs
mailing list