[Scummvm-cvs-logs] scummvm master -> 00ad58c29b7ead1f9d18b99d374b3e8e1e62f3d3

[bluegr]

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:
00ad58c29b WINTERMUTE: Fix a warning with MSVC


Commit: 00ad58c29b7ead1f9d18b99d374b3e8e1e62f3d3
    https://github.com/scummvm/scummvm/commit/00ad58c29b7ead1f9d18b99d374b3e8e1e62f3d3
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-04T10:10:30-07:00

Commit Message:
WINTERMUTE: Fix a warning with MSVC

Changed paths:
    engines/wintermute/base/scriptables/script.cpp
    engines/wintermute/base/scriptables/script.h



diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index beef4ee..269ea1e 100644
--- a/engines/wintermute/base/scriptables/script.cpp
+++ b/engines/wintermute/base/scriptables/script.cpp
@@ -38,7 +38,7 @@ namespace Wintermute {
 IMPLEMENT_PERSISTENT(ScScript, false)

 

 //////////////////////////////////////////////////////////////////////////

-ScScript::ScScript(BaseGame *inGame, ScEngine *Engine) : BaseClass(inGame) {

+ScScript::ScScript(BaseGame *inGame, ScEngine *engine) : BaseClass(inGame) {

 	_buffer = NULL;

 	_bufferSize = _iP = 0;

 	_scriptStream = NULL;

@@ -48,7 +48,7 @@ ScScript::ScScript(BaseGame *inGame, ScEngine *Engine) : BaseClass(inGame) {
 	_symbols = NULL;

 	_numSymbols = 0;

 

-	_engine = Engine;

+	_engine = engine;

 

 	_globals = NULL;

 

diff --git a/engines/wintermute/base/scriptables/script.h b/engines/wintermute/base/scriptables/script.h
index 132f1ce..4daeacd 100644
--- a/engines/wintermute/base/scriptables/script.h
+++ b/engines/wintermute/base/scriptables/script.h
@@ -138,7 +138,7 @@ private:
 	byte *_buffer;

 public:

 	Common::SeekableReadStream *_scriptStream;

-	ScScript(BaseGame *inGame, ScEngine *Engine);

+	ScScript(BaseGame *inGame, ScEngine *engine);

 	virtual ~ScScript();

 	char *_filename;

 	bool _thread;