diff options
author | Einar Johan Trøan Sømåen | 2013-04-20 18:18:54 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2013-04-20 18:18:54 +0200 |
commit | d8eff7be22078376b377002789556d1828896aa1 (patch) | |
tree | 881de3d7ccf45aaf2c4ac750876f8b0c6867a72f /engines | |
parent | 51e17d9f86d9063dd98924046c78ad23946b4ae9 (diff) | |
download | scummvm-rg350-d8eff7be22078376b377002789556d1828896aa1.tar.gz scummvm-rg350-d8eff7be22078376b377002789556d1828896aa1.tar.bz2 scummvm-rg350-d8eff7be22078376b377002789556d1828896aa1.zip |
WINTERMUTE: Change ScriptValue to use int32.
Diffstat (limited to 'engines')
-rw-r--r-- | engines/wintermute/base/scriptables/script_value.cpp | 4 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/script_value.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp index e41808ec4a..5e2923e029 100644 --- a/engines/wintermute/base/scriptables/script_value.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -73,7 +73,7 @@ ScValue::ScValue(BaseGame *inGame, bool val) : BaseClass(inGame) { ////////////////////////////////////////////////////////////////////////// -ScValue::ScValue(BaseGame *inGame, int val) : BaseClass(inGame) { +ScValue::ScValue(BaseGame *inGame, int32 val) : BaseClass(inGame) { _type = VAL_INT; _valInt = val; @@ -951,7 +951,7 @@ int ScValue::compareStrict(ScValue *val1, ScValue *val2) { } ////////////////////////////////////////////////////////////////////////// -bool ScValue::setProperty(const char *propName, int value) { +bool ScValue::setProperty(const char *propName, int32 value) { ScValue *val = new ScValue(_gameRef, value); bool ret = DID_SUCCEED(setProp(propName, val)); delete val; diff --git a/engines/wintermute/base/scriptables/script_value.h b/engines/wintermute/base/scriptables/script_value.h index e8173474d6..a8e815023e 100644 --- a/engines/wintermute/base/scriptables/script_value.h +++ b/engines/wintermute/base/scriptables/script_value.h @@ -94,14 +94,14 @@ public: TValType _type; ScValue(BaseGame *inGame); ScValue(BaseGame *inGame, bool Val); - ScValue(BaseGame *inGame, int Val); + ScValue(BaseGame *inGame, int32 Val); ScValue(BaseGame *inGame, double Val); ScValue(BaseGame *inGame, const char *Val); virtual ~ScValue(); Common::HashMap<Common::String, ScValue *> _valObject; Common::HashMap<Common::String, ScValue *>::iterator _valIter; - bool setProperty(const char *propName, int value); + bool setProperty(const char *propName, int32 value); bool setProperty(const char *propName, const char *value); bool setProperty(const char *propName, double value); bool setProperty(const char *propName, bool value); |