diff options
| author | Einar Johan Trøan Sømåen | 2012-07-09 04:09:15 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-09 04:09:15 +0200 |
| commit | 7c984d24a8cd2ebe5a7860e21cda392edada34b3 (patch) | |
| tree | 36d6cd53884107f29a451ffe1b06370e3fdc7f67 /engines/wintermute/Base/scriptables | |
| parent | 1eea9ad1a3ae577195363abe475cfbbee33d153b (diff) | |
| download | scummvm-rg350-7c984d24a8cd2ebe5a7860e21cda392edada34b3.tar.gz scummvm-rg350-7c984d24a8cd2ebe5a7860e21cda392edada34b3.tar.bz2 scummvm-rg350-7c984d24a8cd2ebe5a7860e21cda392edada34b3.zip | |
WINTERMUTE: Change RECT -> Common::Rect and POINT-> Common::Point, completing the removal of Windows-specifics in wintypes.h
Diffstat (limited to 'engines/wintermute/Base/scriptables')
| -rw-r--r-- | engines/wintermute/Base/scriptables/SXString.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Base/scriptables/ScScript.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/Base/scriptables/ScScript.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/wintermute/Base/scriptables/SXString.cpp b/engines/wintermute/Base/scriptables/SXString.cpp index f4bb610c64..1ddec89ee6 100644 --- a/engines/wintermute/Base/scriptables/SXString.cpp +++ b/engines/wintermute/Base/scriptables/SXString.cpp @@ -246,7 +246,7 @@ ERRORCODE CSXString::scCallMethod(CScScript *script, CScStack *stack, CScStack * else if (strcmp(name, "Split") == 0) {
stack->correctParams(1);
CScValue *val = stack->pop();
- char separators[MAX_PATH] = ",";
+ char separators[MAX_PATH_LENGTH] = ",";
if (!val->isNULL()) strcpy(separators, val->getString());
CSXArray *array = new CSXArray(Game);
diff --git a/engines/wintermute/Base/scriptables/ScScript.cpp b/engines/wintermute/Base/scriptables/ScScript.cpp index 19f1fb29a1..0abd9a1ff9 100644 --- a/engines/wintermute/Base/scriptables/ScScript.cpp +++ b/engines/wintermute/Base/scriptables/ScScript.cpp @@ -1178,7 +1178,7 @@ ERRORCODE CScScript::run() { //////////////////////////////////////////////////////////////////////
-void CScScript::runtimeError(LPCSTR fmt, ...) {
+void CScScript::runtimeError(const char *fmt, ...) {
char buff[256];
va_list va;
diff --git a/engines/wintermute/Base/scriptables/ScScript.h b/engines/wintermute/Base/scriptables/ScScript.h index 6bd1d26142..6635970dc5 100644 --- a/engines/wintermute/Base/scriptables/ScScript.h +++ b/engines/wintermute/Base/scriptables/ScScript.h @@ -75,7 +75,7 @@ public: CScScript *invokeEventHandler(const char *eventName, bool unbreakable = false);
uint32 _timeSlice;
DECLARE_PERSISTENT(CScScript, CBBase)
- void runtimeError(LPCSTR fmt, ...);
+ void runtimeError(const char *fmt, ...);
ERRORCODE run();
ERRORCODE finish(bool includingThreads = false);
ERRORCODE sleep(uint32 duration);
|