[Scummvm-cvs-logs] scummvm master -> ecdd2e5fdc3d4f693def6fa9e3bf780ac6002ee8

[lordhoto]

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:
ecdd2e5fdc COMPOSER: Fix clang warnings.


Commit: ecdd2e5fdc3d4f693def6fa9e3bf780ac6002ee8
    https://github.com/scummvm/scummvm/commit/ecdd2e5fdc3d4f693def6fa9e3bf780ac6002ee8
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-07-27T06:34:55-07:00

Commit Message:
COMPOSER: Fix clang warnings.

Changed paths:
    engines/composer/resource.h
    engines/composer/scripting.cpp



diff --git a/engines/composer/resource.h b/engines/composer/resource.h
index f97a628..9408cdf 100644
--- a/engines/composer/resource.h
+++ b/engines/composer/resource.h
@@ -31,7 +31,7 @@
 
 namespace Composer {
 
-class Animation;
+struct Animation;
 
 #define ID_LBRC MKTAG('L','B','R','C') // Main FourCC
 
diff --git a/engines/composer/scripting.cpp b/engines/composer/scripting.cpp
index 4707805..d85bd52 100644
--- a/engines/composer/scripting.cpp
+++ b/engines/composer/scripting.cpp
@@ -629,8 +629,6 @@ int16 ComposerEngine::scriptFuncCall(uint16 id, int16 param1, int16 param2, int1
 		}
 		if (param3 == 0)
 			param3 = 1000;
-		else
-			param3 = param3;
 		if (param2 < 0 || param3 < 0 || param2 + param3 > 1000)
 			error("can't read %d entries into %d from file '%s' for vars id '%d'", param3, param2, filename.c_str(), param1);
 		stream->skip(param2 * 2);
@@ -696,8 +694,6 @@ int16 ComposerEngine::scriptFuncCall(uint16 id, int16 param1, int16 param2, int1
 			error("couldn't open '%s' to get data id '%d'", filename.c_str(), param1);
 		if (param3 == 0)
 			param3 = 1000;
-		else
-			param3 = param3;
 		if (param2 < 0 || param3 < 0 || param2 + param3 > 1000)
 			error("can't read %d entries into %d from file '%s' for data id '%d'", param3, param2, filename.c_str(), param1);
 		for (uint i = 0; i < (uint)param3; i++) {