aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/Base/scriptables
diff options
context:
space:
mode:
Diffstat (limited to 'engines/wintermute/Base/scriptables')
-rw-r--r--engines/wintermute/Base/scriptables/SXStore.cpp40
-rw-r--r--engines/wintermute/Base/scriptables/ScEngine.cpp76
-rw-r--r--engines/wintermute/Base/scriptables/ScEngine.h2
-rw-r--r--engines/wintermute/Base/scriptables/ScScript.cpp10
-rw-r--r--engines/wintermute/Base/scriptables/ScStack.cpp28
5 files changed, 78 insertions, 78 deletions
diff --git a/engines/wintermute/Base/scriptables/SXStore.cpp b/engines/wintermute/Base/scriptables/SXStore.cpp
index 4658f48216..065fac5255 100644
--- a/engines/wintermute/Base/scriptables/SXStore.cpp
+++ b/engines/wintermute/Base/scriptables/SXStore.cpp
@@ -68,16 +68,16 @@ CSXStore::~CSXStore() {
void CSXStore::cleanup() {
setEventsEnabled(NULL, false);
- for (int i = 0; i < _validProducts.GetSize(); i++) {
+ for (int i = 0; i < _validProducts.getSize(); i++) {
delete _validProducts[i];
}
- _validProducts.RemoveAll();
+ _validProducts.removeAll();
- for (int i = 0; i < _transactions.GetSize(); i++) {
+ for (int i = 0; i < _transactions.getSize(); i++) {
delete _transactions[i];
}
- _transactions.RemoveAll();
+ _transactions.removeAll();
_lastProductRequestOwner = _lastPurchaseOwner = _lastRestoreOwner = NULL;
@@ -120,7 +120,7 @@ ERRORCODE CSXStore::scCallMethod(CScScript *script, CScStack *stack, CScStack *t
else if (strcmp(name, "GetValidProduct") == 0) {
stack->correctParams(1);
int index = stack->pop()->getInt();
- if (index >= 0 && index < _validProducts.GetSize()) {
+ if (index >= 0 && index < _validProducts.getSize()) {
CScValue *prod = stack->getPushValue();
if (prod) {
prod->setProperty("Id", _validProducts[index]->getId());
@@ -152,7 +152,7 @@ ERRORCODE CSXStore::scCallMethod(CScScript *script, CScStack *stack, CScStack *t
else if (strcmp(name, "GetTransaction") == 0) {
stack->correctParams(1);
int index = stack->pop()->getInt();
- if (index >= 0 && index < _transactions.GetSize()) {
+ if (index >= 0 && index < _transactions.getSize()) {
CScValue *trans = stack->getPushValue();
if (trans) {
trans->setProperty("Id", _transactions[index]->getId());
@@ -255,7 +255,7 @@ CScValue *CSXStore::scGetProperty(const char *name) {
// NumValidProducts (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumValidProducts") == 0) {
- _scValue->setInt(_validProducts.GetSize());
+ _scValue->setInt(_validProducts.getSize());
return _scValue;
}
//////////////////////////////////////////////////////////////////////////
@@ -269,7 +269,7 @@ CScValue *CSXStore::scGetProperty(const char *name) {
// NumTransactions (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumTransactions") == 0) {
- _scValue->setInt(_transactions.GetSize());
+ _scValue->setInt(_transactions.getSize());
return _scValue;
}
@@ -293,16 +293,16 @@ ERRORCODE CSXStore::persist(CBPersistMgr *persistMgr) {
// persist valid products
int numProducts;
if (persistMgr->_saving) {
- numProducts = _validProducts.GetSize();
+ numProducts = _validProducts.getSize();
persistMgr->transfer(TMEMBER(numProducts));
for (int i = 0; i < numProducts; i++) _validProducts[i]->persist(persistMgr);
} else {
- numProducts = _validProducts.GetSize();
+ numProducts = _validProducts.getSize();
persistMgr->transfer(TMEMBER(numProducts));
for (int i = 0; i < numProducts; i++) {
CBStoreProduct *prod = new CBStoreProduct;
prod->persist(persistMgr);
- _validProducts.Add(prod);
+ _validProducts.add(prod);
}
}
@@ -362,10 +362,10 @@ bool CSXStore::isAvailable() {
//////////////////////////////////////////////////////////////////////////
void CSXStore::receiveProductsStart() {
- for (int i = 0; i < _validProducts.GetSize(); i++) {
+ for (int i = 0; i < _validProducts.getSize(); i++) {
delete _validProducts[i];
}
- _validProducts.RemoveAll();
+ _validProducts.removeAll();
_invalidProducts.clear();
}
@@ -378,7 +378,7 @@ void CSXStore::receiveProductsEnd() {
//////////////////////////////////////////////////////////////////////////
void CSXStore::addValidProduct(const char *id, const char *name, const char *desc, const char *price) {
CBStoreProduct *prod = new CBStoreProduct(id, name, desc, price);
- _validProducts.Add(prod);
+ _validProducts.add(prod);
}
//////////////////////////////////////////////////////////////////////////
@@ -388,10 +388,10 @@ void CSXStore::addInvalidProduct(const char *id) {
//////////////////////////////////////////////////////////////////////////
void CSXStore::receiveTransactionsStart() {
- for (int i = 0; i < _transactions.GetSize(); i++) {
+ for (int i = 0; i < _transactions.getSize(); i++) {
delete _transactions[i];
}
- _transactions.RemoveAll();
+ _transactions.removeAll();
}
//////////////////////////////////////////////////////////////////////////
@@ -405,7 +405,7 @@ void CSXStore::receiveTransactionsEnd() {
//////////////////////////////////////////////////////////////////////////
void CSXStore::addTransaction(const char *id, const char *productId, const char *state) {
CBStoreTransaction *trans = new CBStoreTransaction(id, productId, state);
- _transactions.Add(trans);
+ _transactions.add(trans);
}
//////////////////////////////////////////////////////////////////////////
@@ -413,7 +413,7 @@ bool CSXStore::purchase(CScScript *script, const char *productId) {
if (!productId) return false;
#ifdef __IPHONEOS__
- for (int i = 0; i < _validProducts.GetSize(); i++) {
+ for (int i = 0; i < _validProducts.getSize(); i++) {
if (strcmp(productId, _validProducts[i]->GetId()) == 0) {
_lastPurchaseOwner = script->_owner;
@@ -430,11 +430,11 @@ bool CSXStore::purchase(CScScript *script, const char *productId) {
bool CSXStore::finishTransaction(CScScript *script, const char *transId) {
if (!transId) return false;
#ifdef __IPHONEOS__
- for (int i = 0; i < _transactions.GetSize(); i++) {
+ for (int i = 0; i < _transactions.getSize(); i++) {
if (strcmp(transId, _transactions[i]->GetId()) == 0) {
if (StoreKit_FinishTransaction(transId) > 0) {
SAFE_DELETE(_transactions[i]);
- _transactions.RemoveAt(i);
+ _transactions.removeAt(i);
return true;
} else return false;
}
diff --git a/engines/wintermute/Base/scriptables/ScEngine.cpp b/engines/wintermute/Base/scriptables/ScEngine.cpp
index 089978ece3..ea651e69bf 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.cpp
+++ b/engines/wintermute/Base/scriptables/ScEngine.cpp
@@ -89,24 +89,24 @@ CScEngine::~CScEngine() {
cleanup();
- for (int i = 0; i < _breakpoints.GetSize(); i++) {
+ for (int i = 0; i < _breakpoints.getSize(); i++) {
delete _breakpoints[i];
_breakpoints[i] = NULL;
}
- _breakpoints.RemoveAll();
+ _breakpoints.removeAll();
}
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::cleanup() {
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (!_scripts[i]->_thread && _scripts[i]->_owner) _scripts[i]->_owner->removeScript(_scripts[i]);
delete _scripts[i];
- _scripts.RemoveAt(i);
+ _scripts.removeAt(i);
i--;
}
- _scripts.RemoveAll();
+ _scripts.removeAll();
delete _globals;
_globals = NULL;
@@ -162,7 +162,7 @@ CScScript *CScEngine::runScript(const char *filename, CBScriptHolder *owner) {
script->_globals->setProp("self", &val);
script->_globals->setProp("this", &val);
- _scripts.Add(script);
+ _scripts.add(script);
Game->getDebugMgr()->onScriptInit(script);
return script;
@@ -245,18 +245,18 @@ byte *CScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool i
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::tick() {
- if (_scripts.GetSize() == 0)
+ if (_scripts.getSize() == 0)
return STATUS_OK;
// resolve waiting scripts
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
switch (_scripts[i]->_state) {
case SCRIPT_WAITING: {
/*
bool obj_found=false;
- for(int j=0; j<Game->_regObjects.GetSize(); j++)
+ for(int j=0; j<Game->_regObjects.getSize(); j++)
{
if(Game->_regObjects[j] == _scripts[i]->_waitObject)
{
@@ -307,7 +307,7 @@ ERRORCODE CScEngine::tick() {
// execute scripts
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
// skip paused scripts
if (_scripts[i]->_state == SCRIPT_PAUSED) continue;
@@ -346,7 +346,7 @@ ERRORCODE CScEngine::tick() {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::tickUnbreakable() {
// execute unbreakable scripts
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (!_scripts[i]->_unbreakable) continue;
while (_scripts[i]->_state == SCRIPT_RUNNING) {
@@ -365,12 +365,12 @@ ERRORCODE CScEngine::tickUnbreakable() {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::removeFinishedScripts() {
// remove finished scripts
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR) {
if (!_scripts[i]->_thread && _scripts[i]->_owner) _scripts[i]->_owner->removeScript(_scripts[i]);
Game->getDebugMgr()->onScriptShutdown(_scripts[i]);
delete _scripts[i];
- _scripts.RemoveAt(i);
+ _scripts.removeAt(i);
i--;
}
}
@@ -382,7 +382,7 @@ ERRORCODE CScEngine::removeFinishedScripts() {
int CScEngine::getNumScripts(int *running, int *waiting, int *persistent) {
int numRunning = 0, numWaiting = 0, numPersistent = 0, numTotal = 0;
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i]->_state == SCRIPT_FINISHED) continue;
switch (_scripts[i]->_state) {
case SCRIPT_RUNNING:
@@ -425,7 +425,7 @@ ERRORCODE CScEngine::emptyScriptCache() {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::resetObject(CBObject *Object) {
// terminate all scripts waiting for this object
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i]->_state == SCRIPT_WAITING && _scripts[i]->_waitObject == Object) {
if (!Game->_compatKillMethodThreads) resetScript(_scripts[i]);
@@ -439,7 +439,7 @@ ERRORCODE CScEngine::resetObject(CBObject *Object) {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::resetScript(CScScript *script) {
// terminate all scripts waiting for this script
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i]->_state == SCRIPT_WAITING_SCRIPT && _scripts[i]->_waitScript == script) {
_scripts[i]->finish();
}
@@ -462,10 +462,10 @@ ERRORCODE CScEngine::persist(CBPersistMgr *persistMgr) {
//////////////////////////////////////////////////////////////////////////
void CScEngine::editorCleanup() {
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i]->_owner == NULL && (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR)) {
delete _scripts[i];
- _scripts.RemoveAt(i);
+ _scripts.removeAt(i);
i--;
}
}
@@ -474,7 +474,7 @@ void CScEngine::editorCleanup() {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::pauseAll() {
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i] != _currentScript) _scripts[i]->pause();
}
@@ -484,7 +484,7 @@ ERRORCODE CScEngine::pauseAll() {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScEngine::resumeAll() {
- for (int i = 0; i < _scripts.GetSize(); i++)
+ for (int i = 0; i < _scripts.getSize(); i++)
_scripts[i]->resume();
return STATUS_OK;
@@ -493,7 +493,7 @@ ERRORCODE CScEngine::resumeAll() {
//////////////////////////////////////////////////////////////////////////
bool CScEngine::isValidScript(CScScript *script) {
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i] == script) return true;
}
return false;
@@ -511,13 +511,13 @@ ERRORCODE CScEngine::dbgSendScripts(IWmeDebugClient *client) {
_globals->dbgSendVariables(client, WME_DBGVAR_GLOBAL, NULL, 0);
// process normal scripts first
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i]->_thread || _scripts[i]->_methodThread) continue;
_scripts[i]->dbgSendScript(client);
}
// and threads later
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
if (_scripts[i]->_thread || _scripts[i]->_methodThread)
_scripts[i]->dbgSendScript(client);
}
@@ -530,7 +530,7 @@ ERRORCODE CScEngine::addBreakpoint(const char *scriptFilename, int line) {
if (!Game->getDebugMgr()->_enabled) return STATUS_OK;
CScBreakpoint *bp = NULL;
- for (int i = 0; i < _breakpoints.GetSize(); i++) {
+ for (int i = 0; i < _breakpoints.getSize(); i++) {
if (scumm_stricmp(_breakpoints[i]->_filename.c_str(), scriptFilename) == 0) {
bp = _breakpoints[i];
break;
@@ -538,13 +538,13 @@ ERRORCODE CScEngine::addBreakpoint(const char *scriptFilename, int line) {
}
if (bp == NULL) {
bp = new CScBreakpoint(scriptFilename);
- _breakpoints.Add(bp);
+ _breakpoints.add(bp);
}
- for (int i = 0; i < bp->_lines.GetSize(); i++) {
+ for (int i = 0; i < bp->_lines.getSize(); i++) {
if (bp->_lines[i] == line) return STATUS_OK;
}
- bp->_lines.Add(line);
+ bp->_lines.add(line);
// refresh changes
refreshScriptBreakpoints();
@@ -556,14 +556,14 @@ ERRORCODE CScEngine::addBreakpoint(const char *scriptFilename, int line) {
ERRORCODE CScEngine::removeBreakpoint(const char *scriptFilename, int line) {
if (!Game->getDebugMgr()->_enabled) return STATUS_OK;
- for (int i = 0; i < _breakpoints.GetSize(); i++) {
+ for (int i = 0; i < _breakpoints.getSize(); i++) {
if (scumm_stricmp(_breakpoints[i]->_filename.c_str(), scriptFilename) == 0) {
- for (int j = 0; j < _breakpoints[i]->_lines.GetSize(); j++) {
+ for (int j = 0; j < _breakpoints[i]->_lines.getSize(); j++) {
if (_breakpoints[i]->_lines[j] == line) {
- _breakpoints[i]->_lines.RemoveAt(j);
- if (_breakpoints[i]->_lines.GetSize() == 0) {
+ _breakpoints[i]->_lines.removeAt(j);
+ if (_breakpoints[i]->_lines.getSize() == 0) {
delete _breakpoints[i];
- _breakpoints.RemoveAt(i);
+ _breakpoints.removeAt(i);
}
// refresh changes
refreshScriptBreakpoints();
@@ -581,7 +581,7 @@ ERRORCODE CScEngine::removeBreakpoint(const char *scriptFilename, int line) {
ERRORCODE CScEngine::refreshScriptBreakpoints() {
if (!Game->getDebugMgr()->_enabled) return STATUS_OK;
- for (int i = 0; i < _scripts.GetSize(); i++) {
+ for (int i = 0; i < _scripts.getSize(); i++) {
refreshScriptBreakpoints(_scripts[i]);
}
return STATUS_OK;
@@ -593,13 +593,13 @@ ERRORCODE CScEngine::refreshScriptBreakpoints(CScScript *script) {
if (!script || !script->_filename) return STATUS_FAILED;
- for (int i = 0; i < _breakpoints.GetSize(); i++) {
+ for (int i = 0; i < _breakpoints.getSize(); i++) {
if (scumm_stricmp(_breakpoints[i]->_filename.c_str(), script->_filename) == 0) {
- script->_breakpoints.Copy(_breakpoints[i]->_lines);
+ script->_breakpoints.copy(_breakpoints[i]->_lines);
return STATUS_OK;
}
}
- if (script->_breakpoints.GetSize() > 0) script->_breakpoints.RemoveAll();
+ if (script->_breakpoints.getSize() > 0) script->_breakpoints.removeAll();
return STATUS_OK;
}
@@ -613,8 +613,8 @@ ERRORCODE CScEngine::saveBreakpoints() {
char key[100];
int count = 0;
- for (int i = 0; i < _breakpoints.GetSize(); i++) {
- for (int j = 0; j < _breakpoints[i]->_lines.GetSize(); j++) {
+ for (int i = 0; i < _breakpoints.getSize(); i++) {
+ for (int j = 0; j < _breakpoints[i]->_lines.getSize(); j++) {
count++;
sprintf(key, "Breakpoint%d", count);
sprintf(text, "%s:%d", _breakpoints[i]->_filename.c_str(), _breakpoints[i]->_lines[j]);
diff --git a/engines/wintermute/Base/scriptables/ScEngine.h b/engines/wintermute/Base/scriptables/ScEngine.h
index d4112be47b..d439ab8eab 100644
--- a/engines/wintermute/Base/scriptables/ScEngine.h
+++ b/engines/wintermute/Base/scriptables/ScEngine.h
@@ -72,7 +72,7 @@ public:
}
~CScBreakpoint() {
- _lines.RemoveAll();
+ _lines.removeAll();
}
Common::String _filename;
diff --git a/engines/wintermute/Base/scriptables/ScScript.cpp b/engines/wintermute/Base/scriptables/ScScript.cpp
index ebb68654fd..40803cded6 100644
--- a/engines/wintermute/Base/scriptables/ScScript.cpp
+++ b/engines/wintermute/Base/scriptables/ScScript.cpp
@@ -1029,7 +1029,7 @@ ERRORCODE CScScript::executeInstruction() {
_currentLine = newLine;
if (Game->getDebugMgr()->_enabled) {
Game->getDebugMgr()->onScriptChangeLine(this, _currentLine);
- for (int i = 0; i < _breakpoints.GetSize(); i++) {
+ for (int i = 0; i < _breakpoints.getSize(); i++) {
if (_breakpoints[i] == _currentLine) {
Game->getDebugMgr()->onScriptHitBreakpoint(this);
sleep(0);
@@ -1268,7 +1268,7 @@ CScScript *CScScript::invokeEventHandler(const char *eventName, bool unbreakable
ERRORCODE ret = thread->createThread(this, pos, eventName);
if (DID_SUCCEED(ret)) {
thread->_unbreakable = unbreakable;
- _engine->_scripts.Add(thread);
+ _engine->_scripts.add(thread);
Game->getDebugMgr()->onScriptEventThreadInit(thread, this, eventName);
return thread;
} else {
@@ -1363,7 +1363,7 @@ ERRORCODE CScScript::copyParameters(CScStack *stack) {
//////////////////////////////////////////////////////////////////////////
ERRORCODE CScScript::finishThreads() {
- for (int i = 0; i < _engine->_scripts.GetSize(); i++) {
+ for (int i = 0; i < _engine->_scripts.getSize(); i++) {
CScScript *scr = _engine->_scripts[i];
if (scr->_thread && scr->_state != SCRIPT_FINISHED && scr->_owner == _owner && scumm_stricmp(scr->_filename, _filename) == 0)
scr->finish(true);
@@ -1417,12 +1417,12 @@ TScriptState CScScript::dbgGetState() {
//////////////////////////////////////////////////////////////////////////
int CScScript::dbgGetNumBreakpoints() {
- return _breakpoints.GetSize();
+ return _breakpoints.getSize();
}
//////////////////////////////////////////////////////////////////////////
int CScScript::dbgGetBreakpoint(int index) {
- if (index >= 0 && index < _breakpoints.GetSize()) return _breakpoints[index];
+ if (index >= 0 && index < _breakpoints.getSize()) return _breakpoints[index];
else return -1;
}
diff --git a/engines/wintermute/Base/scriptables/ScStack.cpp b/engines/wintermute/Base/scriptables/ScStack.cpp
index 7bc44838f3..33fe9f44e8 100644
--- a/engines/wintermute/Base/scriptables/ScStack.cpp
+++ b/engines/wintermute/Base/scriptables/ScStack.cpp
@@ -44,13 +44,13 @@ CScStack::CScStack(CBGame *inGame): CBBase(inGame) {
CScStack::~CScStack() {
#if _DEBUG
- //Game->LOG(0, "STAT: Stack size: %d, SP=%d", _values.GetSize(), _sP);
+ //Game->LOG(0, "STAT: Stack size: %d, SP=%d", _values.getSize(), _sP);
#endif
- for (int i = 0; i < _values.GetSize(); i++) {
+ for (int i = 0; i < _values.getSize(); i++) {
delete _values[i];
}
- _values.RemoveAll();
+ _values.removeAll();
}
@@ -69,13 +69,13 @@ CScValue *CScStack::pop() {
void CScStack::push(CScValue *val) {
_sP++;
- if (_sP < _values.GetSize()) {
+ if (_sP < _values.getSize()) {
_values[_sP]->cleanup();
_values[_sP]->copy(val);
} else {
CScValue *copyVal = new CScValue(Game);
copyVal->copy(val);
- _values.Add(copyVal);
+ _values.add(copyVal);
}
}
@@ -84,9 +84,9 @@ void CScStack::push(CScValue *val) {
CScValue *CScStack::getPushValue() {
_sP++;
- if (_sP >= _values.GetSize()) {
+ if (_sP >= _values.getSize()) {
CScValue *val = new CScValue(Game);
- _values.Add(val);
+ _values.add(val);
}
_values[_sP]->cleanup();
return _values[_sP];
@@ -96,7 +96,7 @@ CScValue *CScStack::getPushValue() {
//////////////////////////////////////////////////////////////////////////
CScValue *CScStack::getTop() {
- if (_sP < 0 || _sP >= _values.GetSize()) return NULL;
+ if (_sP < 0 || _sP >= _values.getSize()) return NULL;
else return _values[_sP];
}
@@ -104,7 +104,7 @@ CScValue *CScStack::getTop() {
//////////////////////////////////////////////////////////////////////////
CScValue *CScStack::getAt(int index) {
index = _sP - index;
- if (index < 0 || index >= _values.GetSize()) return NULL;
+ if (index < 0 || index >= _values.getSize()) return NULL;
else return _values[index];
}
@@ -117,7 +117,7 @@ void CScStack::correctParams(uint32 expectedParams) {
while (expectedParams < nuParams) {
//Pop();
delete _values[_sP - expectedParams];
- _values.RemoveAt(_sP - expectedParams);
+ _values.removeAt(_sP - expectedParams);
nuParams--;
_sP--;
}
@@ -126,13 +126,13 @@ void CScStack::correctParams(uint32 expectedParams) {
//Push(null_val);
CScValue *nullVal = new CScValue(Game);
nullVal->setNULL();
- _values.InsertAt(_sP - nuParams + 1, nullVal);
+ _values.insertAt(_sP - nuParams + 1, nullVal);
nuParams++;
_sP++;
- if (_values.GetSize() > _sP + 1) {
- delete _values[_values.GetSize() - 1];
- _values.RemoveAt(_values.GetSize() - 1);
+ if (_values.getSize() > _sP + 1) {
+ delete _values[_values.getSize() - 1];
+ _values.removeAt(_values.getSize() - 1);
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 04:09:54 +0000