aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2012-09-04 20:10:30 +0300
committerFilippos Karapetis2012-09-04 20:10:30 +0300
commit00ad58c29b7ead1f9d18b99d374b3e8e1e62f3d3 (patch)
tree5c9722e4028c0801f9481b8a260efc3fd3dc359d
parent0fea0c956d504a96293bbec771497bd25b1ee902 (diff)
downloadscummvm-rg350-00ad58c29b7ead1f9d18b99d374b3e8e1e62f3d3.tar.gz
scummvm-rg350-00ad58c29b7ead1f9d18b99d374b3e8e1e62f3d3.tar.bz2
scummvm-rg350-00ad58c29b7ead1f9d18b99d374b3e8e1e62f3d3.zip
WINTERMUTE: Fix a warning with MSVC
-rw-r--r--engines/wintermute/base/scriptables/script.cpp4
-rw-r--r--engines/wintermute/base/scriptables/script.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp
index beef4ee9d2..269ea1ea03 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 132f1ce6c5..4daeacd026 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;