diff options
Diffstat (limited to 'engines/wintermute/base/scriptables')
7 files changed, 21 insertions, 21 deletions
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index 52490c0710..57e08135ed 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -360,13 +360,13 @@ bool ScScript::createMethodThread(ScScript *original, const char *methodName) { //////////////////////////////////////////////////////////////////////////
void ScScript::cleanup() {
- if (_buffer) delete [] _buffer;
+ if (_buffer) delete[] _buffer;
_buffer = NULL;
- if (_filename) delete [] _filename;
+ if (_filename) delete[] _filename;
_filename = NULL;
- if (_symbols) delete [] _symbols;
+ if (_symbols) delete[] _symbols;
_symbols = NULL;
_numSymbols = 0;
@@ -385,24 +385,24 @@ void ScScript::cleanup() { delete _stack;
_stack = NULL;
- if (_functions) delete [] _functions;
+ if (_functions) delete[] _functions;
_functions = NULL;
_numFunctions = 0;
- if (_methods) delete [] _methods;
+ if (_methods) delete[] _methods;
_methods = NULL;
_numMethods = 0;
- if (_events) delete [] _events;
+ if (_events) delete[] _events;
_events = NULL;
_numEvents = 0;
if (_externals) {
for (uint32 i = 0; i < _numExternals; i++) {
- if (_externals[i].nu_params > 0) delete [] _externals[i].params;
+ if (_externals[i].nu_params > 0) delete[] _externals[i].params;
}
- delete [] _externals;
+ delete[] _externals;
}
_externals = NULL;
_numExternals = 0;
@@ -586,7 +586,7 @@ bool ScScript::executeInstruction() { runtimeError("Cannot call method '%s'. Ignored.", MethodName);
_stack->pushNULL();
}
- delete [] MethodName;
+ delete[] MethodName;
break;
}
/*
@@ -621,7 +621,7 @@ bool ScScript::executeInstruction() { }
}
}
- delete [] MethodName;
+ delete[] MethodName;
}
break;
@@ -797,7 +797,7 @@ bool ScScript::executeInstruction() { strcpy(tempStr, op1->getString());
strcat(tempStr, op2->getString());
_operand->setString(tempStr);
- delete [] tempStr;
+ delete[] tempStr;
} else if (op1->getType() == VAL_INT && op2->getType() == VAL_INT)
_operand->setInt(op1->getInt() + op2->getInt());
else _operand->setFloat(op1->getFloat() + op2->getFloat());
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index 59ec113d1f..c33d844aa1 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -127,7 +127,7 @@ byte *ScEngine::loadFile(void *data, char *filename, uint32 *size) { //////////////////////////////////////////////////////////////////////////
void ScEngine::closeFile(void *data, byte *buffer) {
- delete [] buffer;
+ delete[] buffer;
}
@@ -201,7 +201,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig } else {
if (!_compilerAvailable) {
_gameRef->LOG(0, "ScEngine::GetCompiledScript - script '%s' needs to be compiled but compiler is not available", filename);
- delete [] buffer;
+ delete[] buffer;
return NULL;
}
// This code will never be called, since _compilerAvailable is const false.
@@ -235,7 +235,7 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig // cleanup
- delete [] buffer;
+ delete[] buffer;
return ret;
}
diff --git a/engines/wintermute/base/scriptables/script_engine.h b/engines/wintermute/base/scriptables/script_engine.h index 3d85192aa6..e443ec5832 100644 --- a/engines/wintermute/base/scriptables/script_engine.h +++ b/engines/wintermute/base/scriptables/script_engine.h @@ -54,7 +54,7 @@ public: };
~CScCachedScript() {
- if (_buffer) delete [] _buffer;
+ if (_buffer) delete[] _buffer;
};
uint32 _timestamp;
diff --git a/engines/wintermute/base/scriptables/script_ext_file.cpp b/engines/wintermute/base/scriptables/script_ext_file.cpp index 92943f7485..01179bb3ad 100644 --- a/engines/wintermute/base/scriptables/script_ext_file.cpp +++ b/engines/wintermute/base/scriptables/script_ext_file.cpp @@ -457,7 +457,7 @@ bool SXFile::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack, str[size] = '\0';
stack->pushString((char *)str);
}
- delete [] str;
+ delete[] str;
} else stack->pushNULL();
} else stack->pushNULL();
diff --git a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp index b625fad400..6b791871ad 100644 --- a/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp +++ b/engines/wintermute/base/scriptables/script_ext_mem_buffer.cpp @@ -249,7 +249,7 @@ bool SXMemBuffer::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt strncpy(str, (const char *)_buffer + start, length);
str[length] = '\0';
stack->pushString(str);
- delete [] str;
+ delete[] str;
}
return STATUS_OK;
}
diff --git a/engines/wintermute/base/scriptables/script_ext_string.cpp b/engines/wintermute/base/scriptables/script_ext_string.cpp index 5e01e5e29c..385d7ca746 100644 --- a/engines/wintermute/base/scriptables/script_ext_string.cpp +++ b/engines/wintermute/base/scriptables/script_ext_string.cpp @@ -67,7 +67,7 @@ SXString::SXString(BaseGame *inGame, ScStack *stack): BaseScriptable(inGame) { //////////////////////////////////////////////////////////////////////////
SXString::~SXString() {
- if (_string) delete [] _string;
+ if (_string) delete[] _string;
}
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp index 6d12c34914..59e0965f5e 100644 --- a/engines/wintermute/base/scriptables/script_value.cpp +++ b/engines/wintermute/base/scriptables/script_value.cpp @@ -122,7 +122,7 @@ ScValue::ScValue(BaseGame *inGame, const char *val): BaseClass(inGame) { void ScValue::cleanup(bool ignoreNatives) {
deleteProps();
- if (_valString) delete [] _valString;
+ if (_valString) delete[] _valString;
if (!ignoreNatives) {
if (_valNative && !_persistent) {
@@ -425,7 +425,7 @@ void ScValue::setString(const Common::String &val) { //////////////////////////////////////////////////////////////////////////
void ScValue::setStringVal(const char *val) {
if (_valString) {
- delete [] _valString;
+ delete[] _valString;
_valString = NULL;
}
@@ -767,7 +767,7 @@ bool ScValue::persist(BasePersistenceManager *persistMgr) { persistMgr->transfer("", &val);
_valObject[str] = val;
- delete [] str;
+ delete[] str;
}
}
|