[Scummvm-cvs-logs] scummvm master -> 55fee6d97b3739eeac70429b1083420f875025b9

bluegr bluegr at gmail.com
Tue Dec 18 01:25:35 CET 2012


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:
55fee6d97b TINSEL: Enhanced music is not supported in the Mac version of DW1


Commit: 55fee6d97b3739eeac70429b1083420f875025b9
    https://github.com/scummvm/scummvm/commit/55fee6d97b3739eeac70429b1083420f875025b9
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2012-12-17T16:24:46-08:00

Commit Message:
TINSEL: Enhanced music is not supported in the Mac version of DW1

Also, did some minor whitespace formatting

Changed paths:
    engines/tinsel/detection_tables.h
    engines/tinsel/graphics.cpp



diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index 4762acf..f6b1487 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -490,7 +490,7 @@ static const TinselGameDescription gameDescriptions[] = {
 		},
 		GID_DW1,
 		0,
-		GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT,
+		GF_SCNFILES,
 		TINSEL_V1,
 	},
 
diff --git a/engines/tinsel/graphics.cpp b/engines/tinsel/graphics.cpp
index 91dfd76..b917775 100644
--- a/engines/tinsel/graphics.cpp
+++ b/engines/tinsel/graphics.cpp
@@ -248,7 +248,6 @@ static void MacDrawTiles(DRAWOBJECT *pObj, uint8 *srcP, uint8 *destP, bool apply
 				// Repeat of a given color
 				byte color = *srcP++;
 				int runLength = repeatBytes - clipAmount;
-
 				int rptLength = MAX(MIN(runLength, pObj->width - rightClip - x), 0);
 				if (yClip == 0) {
 					if (color != 0)
@@ -264,7 +263,6 @@ static void MacDrawTiles(DRAWOBJECT *pObj, uint8 *srcP, uint8 *destP, bool apply
 				uint clipAmount = MIN<int>(copyBytes, leftClip);
 				leftClip -= clipAmount;
 				x += clipAmount;
-
 				srcP += clipAmount;
 
 				int runLength = copyBytes - clipAmount;






More information about the Scummvm-git-logs mailing list