[Scummvm-cvs-logs] scummvm master -> 92b907e8560c689e6c61ccda9a08ae8306655db9

[clone2727]

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:
a07840931a SCI: Properly alphabetize the SCI32 objects
92b907e856 SCI: Silence unused variable warnings


Commit: a07840931a638bffd9fc0e7325f87b745fc4af24
    https://github.com/scummvm/scummvm/commit/a07840931a638bffd9fc0e7325f87b745fc4af24
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-05-20T21:06:42-07:00

Commit Message:
SCI: Properly alphabetize the SCI32 objects

Changed paths:
    engines/sci/module.mk



diff --git a/engines/sci/module.mk b/engines/sci/module.mk
index 2842e47..b6d5837 100644
--- a/engines/sci/module.mk
+++ b/engines/sci/module.mk
@@ -79,9 +79,9 @@ MODULE_OBJS := \
 	
 ifdef ENABLE_SCI32
 MODULE_OBJS += \
+	engine/kgraphics32.o \
 	graphics/controls32.o \
 	graphics/frameout.o \
-	engine/kgraphics32.o \
 	graphics/paint32.o \
 	graphics/text32.o \
 	video/robot_decoder.o


Commit: 92b907e8560c689e6c61ccda9a08ae8306655db9
    https://github.com/scummvm/scummvm/commit/92b907e8560c689e6c61ccda9a08ae8306655db9
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-05-20T21:07:28-07:00

Commit Message:
SCI: Silence unused variable warnings

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



diff --git a/engines/sci/engine/kgraphics32.cpp b/engines/sci/engine/kgraphics32.cpp
index 786a58a..2bb8288 100644
--- a/engines/sci/engine/kgraphics32.cpp
+++ b/engines/sci/engine/kgraphics32.cpp
@@ -236,11 +236,11 @@ reg_t kSetShowStyle(EngineState *s, int argc, reg_t *argv) {
 	// tables inside graphics/transitions.cpp
 	uint16 showStyle = argv[0].toUint16();	// 0 - 15
 	reg_t planeObj = argv[1];	// the affected plane
-	uint16 seconds = argv[2].toUint16();	// seconds that the transition lasts
-	uint16 backColor =  argv[3].toUint16();	// target back color(?). When fading out, it's 0x0000. When fading in, it's 0xffff
-	int16 priority = argv[4].toSint16();	// always 0xc8 (200) when fading in/out
-	uint16 animate = argv[5].toUint16();	// boolean, animate or not while the transition lasts
-	uint16 refFrame = argv[6].toUint16();	// refFrame, always 0 when fading in/out
+	//uint16 seconds = argv[2].toUint16();	// seconds that the transition lasts
+	//uint16 backColor =  argv[3].toUint16();	// target back color(?). When fading out, it's 0x0000. When fading in, it's 0xffff
+	//int16 priority = argv[4].toSint16();	// always 0xc8 (200) when fading in/out
+	//uint16 animate = argv[5].toUint16();	// boolean, animate or not while the transition lasts
+	//uint16 refFrame = argv[6].toUint16();	// refFrame, always 0 when fading in/out
 	int16 divisions;
 
 	// If the game has the pFadeArray selector, another parameter is used here,