diff options
Diffstat (limited to 'engines/wintermute/base')
| -rw-r--r-- | engines/wintermute/base/base_frame.cpp | 40 | ||||
| -rw-r--r-- | engines/wintermute/base/base_game.cpp | 40 | ||||
| -rw-r--r-- | engines/wintermute/base/base_region.cpp | 38 | ||||
| -rw-r--r-- | engines/wintermute/base/base_script_holder.cpp | 22 | ||||
| -rw-r--r-- | engines/wintermute/base/base_sprite.cpp | 45 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_bitmap.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_storage.cpp | 8 | ||||
| -rw-r--r-- | engines/wintermute/base/font/base_font_truetype.cpp | 10 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_emitter.cpp | 50 | ||||
| -rw-r--r-- | engines/wintermute/base/particles/part_particle.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_engine.cpp | 28 | ||||
| -rw-r--r-- | engines/wintermute/base/scriptables/script_stack.cpp | 18 |
13 files changed, 151 insertions, 160 deletions
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp index 1462f1430d..eb66661c62 100644 --- a/engines/wintermute/base/base_frame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -61,12 +61,12 @@ BaseFrame::~BaseFrame() { delete _sound;
_sound = NULL;
- for (int i = 0; i < _subframes.getSize(); i++) {
+ for (uint32 i = 0; i < _subframes.size(); i++) {
delete _subframes[i];
}
_subframes.clear();
- for (int i = 0; i < _applyEvent.getSize(); i++) {
+ for (uint32 i = 0; i < _applyEvent.size(); i++) {
delete[] _applyEvent[i];
_applyEvent[i] = NULL;
}
@@ -78,7 +78,7 @@ BaseFrame::~BaseFrame() { bool BaseFrame::draw(int x, int y, BaseObject *registerOwner, float zoomX, float zoomY, bool precise, uint32 alpha, bool allFrames, float rotate, TSpriteBlendMode blendMode) {
bool res;
- for (int i = 0; i < _subframes.getSize(); i++) {
+ for (uint32 i = 0; i < _subframes.size(); i++) {
res = _subframes[i]->draw(x, y, registerOwner, zoomX, zoomY, precise, alpha, rotate, blendMode);
if (DID_FAIL(res)) {
return res;
@@ -102,7 +102,7 @@ bool BaseFrame::oneTimeDisplay(BaseObject *owner, bool muted) { */
}
if (owner) {
- for (int i = 0; i < _applyEvent.getSize(); i++) {
+ for (uint32 i = 0; i < _applyEvent.size(); i++) {
owner->applyEvent(_applyEvent[i]);
}
}
@@ -349,7 +349,7 @@ bool BaseFrame::getBoundingRect(Rect32 *rect, int x, int y, float scaleX, float Rect32 subRect;
- for (int i = 0; i < _subframes.getSize(); i++) {
+ for (int i = 0; i < _subframes.size(); i++) {
_subframes[i]->getBoundingRect(&subRect, x, y, scaleX, scaleY);
BasePlatform::unionRect(rect, rect, &subRect);
}
@@ -381,15 +381,15 @@ bool BaseFrame::saveAsText(BaseDynamicBuffer *buffer, int indent) { buffer->putTextIndent(indent + 2, "EDITOR_EXPANDED=%s\n", _editorExpanded ? "TRUE" : "FALSE");
}
- if (_subframes.getSize() > 0) {
+ if (_subframes.size() > 0) {
_subframes[0]->saveAsText(buffer, indent, false);
}
- for (int i = 1; i < _subframes.getSize(); i++) {
+ for (uint32 i = 1; i < _subframes.size(); i++) {
_subframes[i]->saveAsText(buffer, indent + 2);
}
- for (int i = 0; i < _applyEvent.getSize(); i++) {
+ for (uint32 i = 0; i < _applyEvent.size(); i++) {
buffer->putTextIndent(indent + 2, "APPLY_EVENT=\"%s\"\n", _applyEvent[i]);
}
@@ -469,7 +469,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac if (strcmp(name, "GetSubframe") == 0) {
stack->correctParams(1);
int index = stack->pop()->getInt(-1);
- if (index < 0 || index >= _subframes.getSize()) {
+ if (index < 0 || index >= _subframes.size()) {
script->runtimeError("Frame.GetSubframe: Subframe index %d is out of range.", index);
stack->pushNULL();
} else {
@@ -487,12 +487,12 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac ScValue *val = stack->pop();
if (val->isInt()) {
int index = val->getInt(-1);
- if (index < 0 || index >= _subframes.getSize()) {
+ if (index < 0 || index >= _subframes.size()) {
script->runtimeError("Frame.DeleteSubframe: Subframe index %d is out of range.", index);
}
} else {
BaseSubFrame *sub = (BaseSubFrame *)val->getNative();
- for (int i = 0; i < _subframes.getSize(); i++) {
+ for (uint32 i = 0; i < _subframes.size(); i++) {
if (_subframes[i] == sub) {
delete _subframes[i];
_subframes.remove_at(i);
@@ -547,7 +547,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac sub->setSurface(filename);
}
- if (index >= _subframes.getSize()) {
+ if (index >= (int32)_subframes.size()) {
_subframes.add(sub);
} else {
_subframes.insert_at(index, sub);
@@ -563,7 +563,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac else if (strcmp(name, "GetSubframe") == 0) {
stack->correctParams(1);
int index = stack->pop()->getInt(-1);
- if (index < 0 || index >= _applyEvent.getSize()) {
+ if (index < 0 || index >= _applyEvent.size()) {
script->runtimeError("Frame.GetEvent: Event index %d is out of range.", index);
stack->pushNULL();
} else {
@@ -578,7 +578,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac else if (strcmp(name, "AddEvent") == 0) {
stack->correctParams(1);
const char *event = stack->pop()->getString();
- for (int i = 0; i < _applyEvent.getSize(); i++) {
+ for (uint32 i = 0; i < _applyEvent.size(); i++) {
if (scumm_stricmp(_applyEvent[i], event) == 0) {
stack->pushNULL();
return STATUS_OK;
@@ -595,7 +595,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac else if (strcmp(name, "DeleteEvent") == 0) {
stack->correctParams(1);
const char *event = stack->pop()->getString();
- for (int i = 0; i < _applyEvent.getSize(); i++) {
+ for (uint32 i = 0; i < _applyEvent.size(); i++) {
if (scumm_stricmp(_applyEvent[i], event) == 0) {
delete[] _applyEvent[i];
_applyEvent.remove_at(i);
@@ -608,7 +608,7 @@ bool BaseFrame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStac //////////////////////////////////////////////////////////////////////////
else {
- if (_subframes.getSize() == 1) {
+ if (_subframes.size() == 1) {
return _subframes[0]->scCallMethod(script, stack, thisStack, name);
} else {
return BaseScriptable::scCallMethod(script, stack, thisStack, name);
@@ -676,7 +676,7 @@ ScValue *BaseFrame::scGetProperty(const char *name) { // NumSubframes (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumSubframes") == 0) {
- _scValue->setInt(_subframes.getSize());
+ _scValue->setInt(_subframes.size());
return _scValue;
}
@@ -684,13 +684,13 @@ ScValue *BaseFrame::scGetProperty(const char *name) { // NumEvents (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumEvents") == 0) {
- _scValue->setInt(_applyEvent.getSize());
+ _scValue->setInt(_applyEvent.size());
return _scValue;
}
//////////////////////////////////////////////////////////////////////////
else {
- if (_subframes.getSize() == 1) {
+ if (_subframes.size() == 1) {
return _subframes[0]->scGetProperty(name);
} else {
return BaseScriptable::scGetProperty(name);
@@ -743,7 +743,7 @@ bool BaseFrame::scSetProperty(const char *name, ScValue *value) { //////////////////////////////////////////////////////////////////////////
else {
- if (_subframes.getSize() == 1) {
+ if (_subframes.size() == 1) {
return _subframes[0]->scSetProperty(name, value);
} else {
return BaseScriptable::scSetProperty(name, value);
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp index 5436b4637f..e8aaac6c40 100644 --- a/engines/wintermute/base/base_game.cpp +++ b/engines/wintermute/base/base_game.cpp @@ -328,7 +328,7 @@ bool BaseGame::cleanup() { unregisterObject(_fader);
_fader = NULL;
- for (int i = 0; i < _regObjects.getSize(); i++) {
+ for (uint32 i = 0; i < _regObjects.size(); i++) {
delete _regObjects[i];
_regObjects[i] = NULL;
}
@@ -349,7 +349,7 @@ bool BaseGame::cleanup() { _scValue = NULL;
_sFX = NULL;
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
_scripts[i]->_owner = NULL;
_scripts[i]->finish();
}
@@ -361,7 +361,7 @@ bool BaseGame::cleanup() { _fontStorage->removeFont(_videoFont);
_videoFont = NULL;
- for (int i = 0; i < _quickMessages.getSize(); i++) {
+ for (uint32 i = 0; i < _quickMessages.size(); i++) {
delete _quickMessages[i];
}
_quickMessages.clear();
@@ -587,7 +587,7 @@ bool BaseGame::initLoop() { getMousePos(&_mousePos);
_focusedWindow = NULL;
- for (int i = _windows.getSize() - 1; i >= 0; i--) {
+ for (int i = _windows.size() - 1; i >= 0; i--) {
if (_windows[i]->_visible) {
_focusedWindow = _windows[i];
break;
@@ -1922,7 +1922,7 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack else if (strcmp(name, "DeleteWindow") == 0) {
stack->correctParams(1);
BaseObject *obj = (BaseObject *)stack->pop()->getNative();
- for (int i = 0; i < _windows.getSize(); i++) {
+ for (uint32 i = 0; i < _windows.size(); i++) {
if (_windows[i] == obj) {
unregisterObject(_windows[i]);
stack->pushBool(true);
@@ -2849,12 +2849,12 @@ const char *BaseGame::scToString() { #define QUICK_MSG_DURATION 3000
//////////////////////////////////////////////////////////////////////////
bool BaseGame::displayQuickMsg() {
- if (_quickMessages.getSize() == 0 || !_systemFont) {
+ if (_quickMessages.size() == 0 || !_systemFont) {
return STATUS_OK;
}
// update
- for (int i = 0; i < _quickMessages.getSize(); i++) {
+ for (uint32 i = 0; i < _quickMessages.size(); i++) {
if (_currentTime - _quickMessages[i]->_startTime >= QUICK_MSG_DURATION) {
delete _quickMessages[i];
_quickMessages.remove_at(i);
@@ -2865,7 +2865,7 @@ bool BaseGame::displayQuickMsg() { int posY = 20;
// display
- for (int i = 0; i < _quickMessages.getSize(); i++) {
+ for (uint32 i = 0; i < _quickMessages.size(); i++) {
_systemFont->drawText((byte *)_quickMessages[i]->getText(), 0, posY, _renderer->_width);
posY += _systemFont->getTextHeight((byte *)_quickMessages[i]->getText(), _renderer->_width);
}
@@ -2876,7 +2876,7 @@ bool BaseGame::displayQuickMsg() { #define MAX_QUICK_MSG 5
//////////////////////////////////////////////////////////////////////////
void BaseGame::quickMessage(const char *text) {
- if (_quickMessages.getSize() >= MAX_QUICK_MSG) {
+ if (_quickMessages.size() >= MAX_QUICK_MSG) {
delete _quickMessages[0];
_quickMessages.remove_at(0);
}
@@ -2911,7 +2911,7 @@ bool BaseGame::unregisterObject(BaseObject *object) { }
// is it a window?
- for (int i = 0; i < _windows.getSize(); i++) {
+ for (uint32 i = 0; i < _windows.size(); i++) {
if ((BaseObject *)_windows[i] == object) {
_windows.remove_at(i);
@@ -2935,7 +2935,7 @@ bool BaseGame::unregisterObject(BaseObject *object) { }
// destroy object
- for (int i = 0; i < _regObjects.getSize(); i++) {
+ for (uint32 i = 0; i < _regObjects.size(); i++) {
if (_regObjects[i] == object) {
_regObjects.remove_at(i);
if (!_loadInProgress) {
@@ -2973,7 +2973,7 @@ bool BaseGame::validObject(BaseObject *object) { return true;
}
- for (int i = 0; i < _regObjects.getSize(); i++) {
+ for (uint32 i = 0; i < _regObjects.size(); i++) {
if (_regObjects[i] == object) {
return true;
}
@@ -3322,7 +3322,7 @@ bool BaseGame::displayWindows(bool inGame) { // did we lose focus? focus topmost window
if (_focusedWindow == NULL || !_focusedWindow->_visible || _focusedWindow->_disable) {
_focusedWindow = NULL;
- for (int i = _windows.getSize() - 1; i >= 0; i--) {
+ for (int i = _windows.size() - 1; i >= 0; i--) {
if (_windows[i]->_visible && !_windows[i]->_disable) {
_focusedWindow = _windows[i];
break;
@@ -3331,7 +3331,7 @@ bool BaseGame::displayWindows(bool inGame) { }
// display all windows
- for (int i = 0; i < _windows.getSize(); i++) {
+ for (uint32 i = 0; i < _windows.size(); i++) {
if (_windows[i]->_visible && _windows[i]->_inGame == inGame) {
res = _windows[i]->display();
@@ -3656,9 +3656,9 @@ bool BaseGame::persist(BasePersistenceManager *persistMgr) { bool BaseGame::focusWindow(UIWindow *window) {
UIWindow *prev = _focusedWindow;
- for (int i = 0; i < _windows.getSize(); i++) {
+ for (uint32 i = 0; i < _windows.size(); i++) {
if (_windows[i] == window) {
- if (i < _windows.getSize() - 1) {
+ if (i < _windows.size() - 1) {
_windows.remove_at(i);
_windows.add(window);
@@ -3854,7 +3854,7 @@ bool BaseGame::setActiveObject(BaseObject *obj) { //////////////////////////////////////////////////////////////////////////
bool BaseGame::pushViewport(BaseViewport *viewport) {
_viewportSP++;
- if (_viewportSP >= _viewportStack.getSize()) {
+ if (_viewportSP >= (int32)_viewportStack.size()) {
_viewportStack.add(viewport);
} else {
_viewportStack[_viewportSP] = viewport;
@@ -3873,7 +3873,7 @@ bool BaseGame::popViewport() { _gameRef->LOG(0, "Fatal: Viewport stack underflow!");
}
- if (_viewportSP >= 0 && _viewportSP < _viewportStack.getSize()) {
+ if (_viewportSP >= 0 && _viewportSP < (int32)_viewportStack.size()) {
_renderer->setViewport(_viewportStack[_viewportSP]->getRect());
} else _renderer->setViewport(_renderer->_drawOffsetX,
_renderer->_drawOffsetY,
@@ -4065,7 +4065,7 @@ void BaseGame::DEBUG_DumpClassRegistry() { //////////////////////////////////////////////////////////////////////////
bool BaseGame::invalidateDeviceObjects() {
- for (int i = 0; i < _regObjects.getSize(); i++) {
+ for (uint32 i = 0; i < _regObjects.size(); i++) {
_regObjects[i]->invalidateDeviceObjects();
}
return STATUS_OK;
@@ -4074,7 +4074,7 @@ bool BaseGame::invalidateDeviceObjects() { //////////////////////////////////////////////////////////////////////////
bool BaseGame::restoreDeviceObjects() {
- for (int i = 0; i < _regObjects.getSize(); i++) {
+ for (uint32 i = 0; i < _regObjects.size(); i++) {
_regObjects[i]->restoreDeviceObjects();
}
return STATUS_OK;
diff --git a/engines/wintermute/base/base_region.cpp b/engines/wintermute/base/base_region.cpp index a781c7eeb7..4d7f3487f0 100644 --- a/engines/wintermute/base/base_region.cpp +++ b/engines/wintermute/base/base_region.cpp @@ -60,7 +60,7 @@ BaseRegion::~BaseRegion() { //////////////////////////////////////////////////////////////////////////
void BaseRegion::cleanup() {
- for (int i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
delete _points[i];
}
_points.clear();
@@ -78,7 +78,7 @@ bool BaseRegion::createRegion() { //////////////////////////////////////////////////////////////////////////
bool BaseRegion::pointInRegion(int x, int y) {
- if (_points.getSize() < 3) {
+ if (_points.size() < 3) {
return false;
}
@@ -160,9 +160,7 @@ bool BaseRegion::loadBuffer(byte *buffer, bool complete) { buffer = params;
}
- int i;
-
- for (i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
delete _points[i];
}
_points.clear();
@@ -248,7 +246,7 @@ bool BaseRegion::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta int x = stack->pop()->getInt();
int y = stack->pop()->getInt();
- if (index >= 0 && index < _points.getSize()) {
+ if (index >= 0 && index < (int32)_points.size()) {
_points.insert_at(index, new BasePoint(x, y));
createRegion();
@@ -269,7 +267,7 @@ bool BaseRegion::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta int x = stack->pop()->getInt();
int y = stack->pop()->getInt();
- if (index >= 0 && index < _points.getSize()) {
+ if (index >= 0 && index < (int32)_points.size()) {
_points[index]->x = x;
_points[index]->y = y;
createRegion();
@@ -289,7 +287,7 @@ bool BaseRegion::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta stack->correctParams(1);
int index = stack->pop()->getInt();
- if (index >= 0 && index < _points.getSize()) {
+ if (index >= 0 && index < (int32)_points.size()) {
delete _points[index];
_points[index] = NULL;
@@ -311,7 +309,7 @@ bool BaseRegion::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta stack->correctParams(1);
int index = stack->pop()->getInt();
- if (index >= 0 && index < _points.getSize()) {
+ if (index >= 0 && index < (int32)_points.size()) {
ScValue *val = stack->getPushValue();
if (val) {
val->setProperty("X", _points[index]->x);
@@ -360,7 +358,7 @@ ScValue *BaseRegion::scGetProperty(const char *name) { // NumPoints
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumPoints") == 0) {
- _scValue->setInt(_points.getSize());
+ _scValue->setInt(_points.size());
return _scValue;
} else {
return BaseObject::scGetProperty(name);
@@ -409,13 +407,11 @@ bool BaseRegion::saveAsText(BaseDynamicBuffer *buffer, int indent, const char *n buffer->putTextIndent(indent + 2, "ACTIVE=%s\n", _active ? "TRUE" : "FALSE");
buffer->putTextIndent(indent + 2, "EDITOR_SELECTED_POINT=%d\n", _editorSelectedPoint);
- int i;
-
- for (i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
- for (i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
buffer->putTextIndent(indent + 2, "POINT {%d,%d}\n", _points[i]->x, _points[i]->y);
}
@@ -451,7 +447,7 @@ typedef struct { //////////////////////////////////////////////////////////////////////////
bool BaseRegion::ptInPolygon(int x, int y) {
- if (_points.getSize() < 3) {
+ if (_points.size() < 3) {
return false;
}
@@ -465,9 +461,9 @@ bool BaseRegion::ptInPolygon(int x, int y) { p1.x = (double)_points[0]->x;
p1.y = (double)_points[0]->y;
- for (int i = 1; i <= _points.getSize(); i++) {
- p2.x = (double)_points[i % _points.getSize()]->x;
- p2.y = (double)_points[i % _points.getSize()]->y;
+ for (uint32 i = 1; i <= _points.size(); i++) {
+ p2.x = (double)_points[i % _points.size()]->x;
+ p2.y = (double)_points[i % _points.size()]->y;
if (p.y > MIN(p1.y, p2.y)) {
if (p.y <= MAX(p1.y, p2.y)) {
@@ -494,12 +490,12 @@ bool BaseRegion::ptInPolygon(int x, int y) { //////////////////////////////////////////////////////////////////////////
bool BaseRegion::getBoundingRect(Rect32 *rect) {
- if (_points.getSize() == 0) {
+ if (_points.size() == 0) {
BasePlatform::setRectEmpty(rect);
} else {
int minX = INT_MAX, minY = INT_MAX, maxX = INT_MIN, maxY = INT_MIN;
- for (int i = 0; i < _points.getSize(); i++) {
+ for (uint32 i = 0; i < _points.size(); i++) {
minX = MIN(minX, _points[i]->x);
minY = MIN(minY, _points[i]->y);
@@ -520,7 +516,7 @@ bool BaseRegion::mimic(BaseRegion *region, float scale, int x, int y) { cleanup();
- for (int i = 0; i < region->_points.getSize(); i++) {
+ for (uint32 i = 0; i < region->_points.size(); i++) {
int xVal, yVal;
xVal = (int)((float)region->_points[i]->x * scale / 100.0f);
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp index d57638a4a8..e4132351e0 100644 --- a/engines/wintermute/base/base_script_holder.cpp +++ b/engines/wintermute/base/base_script_holder.cpp @@ -58,9 +58,7 @@ bool BaseScriptHolder::cleanup() { delete[] _filename;
_filename = NULL;
- int i;
-
- for (i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
_scripts[i]->finish(true);
_scripts[i]->_owner = NULL;
}
@@ -90,7 +88,7 @@ bool BaseScriptHolder::applyEvent(const char *eventName, bool unbreakable) { int numHandlers = 0;
bool ret = STATUS_FAILED;
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (!_scripts[i]->_thread) {
ScScript *handler = _scripts[i]->invokeEventHandler(eventName, unbreakable);
if (handler) {
@@ -186,7 +184,7 @@ bool BaseScriptHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *t const char *filename = stack->pop()->getString();
bool killThreads = stack->pop()->getBool(false);
bool ret = false;
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (scumm_stricmp(_scripts[i]->_filename, filename) == 0) {
_scripts[i]->finish(killThreads);
ret = true;
@@ -205,7 +203,7 @@ bool BaseScriptHolder::scCallMethod(ScScript *script, ScStack *stack, ScStack *t stack->correctParams(1);
const char *filename = stack->pop()->getString();
bool ret = false;
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (scumm_stricmp(_scripts[i]->_filename, filename) == 0 && _scripts[i]->_state != SCRIPT_FINISHED && _scripts[i]->_state != SCRIPT_ERROR) {
ret = true;
break;
@@ -300,7 +298,7 @@ bool BaseScriptHolder::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
bool BaseScriptHolder::addScript(const char *filename) {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (scumm_stricmp(_scripts[i]->_filename, filename) == 0) {
if (_scripts[i]->_state != SCRIPT_FINISHED) {
_gameRef->LOG(0, "BaseScriptHolder::AddScript - trying to add script '%s' mutiple times (obj: '%s')", filename, getName());
@@ -334,7 +332,7 @@ bool BaseScriptHolder::addScript(const char *filename) { //////////////////////////////////////////////////////////////////////////
bool BaseScriptHolder::removeScript(ScScript *script) {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (_scripts[i] == script) {
_scripts.remove_at(i);
break;
@@ -345,7 +343,7 @@ bool BaseScriptHolder::removeScript(ScScript *script) { //////////////////////////////////////////////////////////////////////////
bool BaseScriptHolder::canHandleEvent(const char *EventName) {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (!_scripts[i]->_thread && _scripts[i]->canHandleEvent(EventName)) {
return true;
}
@@ -356,7 +354,7 @@ bool BaseScriptHolder::canHandleEvent(const char *EventName) { //////////////////////////////////////////////////////////////////////////
bool BaseScriptHolder::canHandleMethod(const char *MethodName) {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (!_scripts[i]->_thread && _scripts[i]->canHandleMethod(MethodName)) {
return true;
}
@@ -452,7 +450,7 @@ bool BaseScriptHolder::parseProperty(byte *buffer, bool complete) { //////////////////////////////////////////////////////////////////////////
void BaseScriptHolder::makeFreezable(bool freezable) {
_freezable = freezable;
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
_scripts[i]->_freezable = freezable;
}
@@ -461,7 +459,7 @@ void BaseScriptHolder::makeFreezable(bool freezable) { //////////////////////////////////////////////////////////////////////////
ScScript *BaseScriptHolder::invokeMethodThread(const char *methodName) {
- for (int i = _scripts.getSize() - 1; i >= 0; i--) {
+ for (int i = _scripts.size() - 1; i >= 0; i--) {
if (_scripts[i]->canHandleMethod(methodName)) {
ScScript *thread = new ScScript(_gameRef, _scripts[i]->_engine);
diff --git a/engines/wintermute/base/base_sprite.cpp b/engines/wintermute/base/base_sprite.cpp index 2fc2096802..ae0e844cb5 100644 --- a/engines/wintermute/base/base_sprite.cpp +++ b/engines/wintermute/base/base_sprite.cpp @@ -88,7 +88,7 @@ void BaseSprite::setDefaults() { void BaseSprite::cleanup() {
BaseScriptHolder::cleanup();
- for (int i = 0; i < _frames.getSize(); i++) {
+ for (uint32 i = 0; i < _frames.size(); i++) {
delete _frames[i];
}
_frames.clear();
@@ -103,7 +103,7 @@ void BaseSprite::cleanup() { //////////////////////////////////////////////////////////////////////////
bool BaseSprite::draw(int x, int y, BaseObject *registerOwner, float zoomX, float zoomY, uint32 alpha) {
getCurrentFrame(zoomX, zoomY);
- if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) {
+ if (_currentFrame < 0 || _currentFrame >= (int32)_frames.size()) {
return STATUS_OK;
}
@@ -334,7 +334,7 @@ bool BaseSprite::loadBuffer(byte *buffer, bool complete, int lifeTime, TSpriteCa //////////////////////////////////////////////////////////////////////
void BaseSprite::reset() {
- if (_frames.getSize() > 0) {
+ if (_frames.size() > 0) {
_currentFrame = 0;
} else {
_currentFrame = -1;
@@ -367,10 +367,10 @@ bool BaseSprite::getCurrentFrame(float zoomX, float zoomY) { // get current frame
if (!_paused && !_finished && timer >= _lastFrameTime + _frames[_currentFrame]->_delay && _lastFrameTime != 0) {
- if (_currentFrame < _frames.getSize() - 1) {
+ if (_currentFrame < (int32)_frames.size() - 1) {
_currentFrame++;
if (_continuous) {
- _canBreak = (_currentFrame == _frames.getSize() - 1);
+ _canBreak = (_currentFrame == (int32)_frames.size() - 1);
}
} else {
if (_looping) {
@@ -385,13 +385,13 @@ bool BaseSprite::getCurrentFrame(float zoomX, float zoomY) { _lastFrameTime = timer;
}
- _changed = (lastFrame != _currentFrame || (_looping && _frames.getSize() == 1));
+ _changed = (lastFrame != _currentFrame || (_looping && (int32)_frames.size() == 1));
if (_lastFrameTime == 0) {
_lastFrameTime = timer;
_changed = true;
if (_continuous) {
- _canBreak = (_currentFrame == _frames.getSize() - 1);
+ _canBreak = (_currentFrame == (int32)_frames.size() - 1);
}
}
@@ -411,7 +411,7 @@ bool BaseSprite::getCurrentFrame(float zoomX, float zoomY) { //////////////////////////////////////////////////////////////////////
bool BaseSprite::display(int x, int y, BaseObject *registerVal, float zoomX, float zoomY, uint32 alpha, float rotate, TSpriteBlendMode blendMode) {
- if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) {
+ if (_currentFrame < 0 || _currentFrame >= (int32)_frames.size()) {
return STATUS_OK;
}
@@ -432,11 +432,11 @@ bool BaseSprite::display(int x, int y, BaseObject *registerVal, float zoomX, flo //////////////////////////////////////////////////////////////////////////
BaseSurface *BaseSprite::getSurface() {
// only used for animated textures for 3D models
- if (_currentFrame < 0 || _currentFrame >= _frames.getSize()) {
+ if (_currentFrame < 0 || _currentFrame >= (int32)_frames.size()) {
return NULL;
}
BaseFrame *frame = _frames[_currentFrame];
- if (frame && frame->_subframes.getSize() > 0) {
+ if (frame && frame->_subframes.size() > 0) {
BaseSubFrame *subframe = frame->_subframes[0];
if (subframe) {
return subframe->_surface;
@@ -455,7 +455,7 @@ bool BaseSprite::getBoundingRect(Rect32 *rect, int x, int y, float scaleX, float }
BasePlatform::setRectEmpty(rect);
- for (int i = 0; i < _frames.getSize(); i++) {
+ for (uint32 i = 0; i < _frames.size(); i++) {
Rect32 frame;
Rect32 temp;
BasePlatform::copyRect(&temp, rect);
@@ -493,15 +493,12 @@ bool BaseSprite::saveAsText(BaseDynamicBuffer *buffer, int indent) { BaseScriptHolder::saveAsText(buffer, indent + 2);
- int i;
-
// scripts
- for (i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
buffer->putTextIndent(indent + 2, "SCRIPT=\"%s\"\n", _scripts[i]->_filename);
}
-
- for (i = 0; i < _frames.getSize(); i++) {
+ for (uint32 i = 0; i < _frames.size(); i++) {
_frames[i]->saveAsText(buffer, indent + 2);
}
@@ -554,7 +551,7 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta if (strcmp(name, "GetFrame") == 0) {
stack->correctParams(1);
int index = stack->pop()->getInt(-1);
- if (index < 0 || index >= _frames.getSize()) {
+ if (index < 0 || index >= (int32)_frames.size()) {
script->runtimeError("Sprite.GetFrame: Frame index %d is out of range.", index);
stack->pushNULL();
} else {
@@ -571,14 +568,14 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta ScValue *val = stack->pop();
if (val->isInt()) {
int index = val->getInt(-1);
- if (index < 0 || index >= _frames.getSize()) {
+ if (index < 0 || index >= (int32)_frames.size()) {
script->runtimeError("Sprite.DeleteFrame: Frame index %d is out of range.", index);
}
} else {
BaseFrame *frame = (BaseFrame *)val->getNative();
- for (int i = 0; i < _frames.getSize(); i++) {
+ for (uint32 i = 0; i < _frames.size(); i++) {
if (_frames[i] == frame) {
- if (i == _currentFrame) {
+ if (i == (uint32)_currentFrame) {
_lastFrameTime = 0;
}
delete _frames[i];
@@ -654,7 +651,7 @@ bool BaseSprite::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSta }
}
- if (index >= _frames.getSize()) {
+ if (index >= (int32)_frames.size()) {
_frames.add(frame);
} else {
_frames.insert_at(index, frame);
@@ -704,7 +701,7 @@ ScValue *BaseSprite::scGetProperty(const char *name) { // NumFrames (RO)
//////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumFrames") == 0) {
- _scValue->setInt(_frames.getSize());
+ _scValue->setInt(_frames.size());
return _scValue;
}
@@ -771,7 +768,7 @@ bool BaseSprite::scSetProperty(const char *name, ScValue *value) { //////////////////////////////////////////////////////////////////////////
if (strcmp(name, "CurrentFrame") == 0) {
_currentFrame = value->getInt(0);
- if (_currentFrame >= _frames.getSize() || _currentFrame < 0) {
+ if (_currentFrame >= (int32)_frames.size() || _currentFrame < 0) {
_currentFrame = -1;
}
_lastFrameTime = 0;
@@ -806,7 +803,7 @@ const char *BaseSprite::scToString() { //////////////////////////////////////////////////////////////////////////
bool BaseSprite::killAllSounds() {
- for (int i = 0; i < _frames.getSize(); i++) {
+ for (uint32 i = 0; i < _frames.size(); i++) {
if (_frames[i]->_sound) {
_frames[i]->_sound->stop();
}
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp index ff1207b31f..a9d71e0fa1 100644 --- a/engines/wintermute/base/font/base_font_bitmap.cpp +++ b/engines/wintermute/base/font/base_font_bitmap.cpp @@ -256,8 +256,8 @@ void BaseFontBitmap::drawChar(byte c, int x, int y) { bool handled = false;
if (_sprite) {
_sprite->getCurrentFrame();
- if (_sprite->_currentFrame >= 0 && _sprite->_currentFrame < _sprite->_frames.getSize() && _sprite->_frames[_sprite->_currentFrame]) {
- if (_sprite->_frames[_sprite->_currentFrame]->_subframes.getSize() > 0) {
+ if (_sprite->_currentFrame >= 0 && _sprite->_currentFrame < (int32)_sprite->_frames.size() && _sprite->_frames[_sprite->_currentFrame]) {
+ if (_sprite->_frames[_sprite->_currentFrame]->_subframes.size() > 0) {
_sprite->_frames[_sprite->_currentFrame]->_subframes[0]->_surface->displayTrans(x, y, rect);
}
handled = true;
@@ -532,8 +532,8 @@ bool BaseFontBitmap::getWidths() { BaseSurface *surf = NULL;
if (_sprite) {
- if (_widthsFrame >= 0 && _widthsFrame < _sprite->_frames.getSize()) {
- if (_sprite->_frames[_widthsFrame] && _sprite->_frames[_widthsFrame]->_subframes.getSize() > 0) {
+ if (_widthsFrame >= 0 && _widthsFrame < (int32)_sprite->_frames.size()) {
+ if (_sprite->_frames[_widthsFrame] && (int32)_sprite->_frames[_widthsFrame]->_subframes.size() > 0) {
surf = _sprite->_frames[_widthsFrame]->_subframes[0]->_surface;
}
}
diff --git a/engines/wintermute/base/font/base_font_storage.cpp b/engines/wintermute/base/font/base_font_storage.cpp index bc7ab6f22c..298417ec32 100644 --- a/engines/wintermute/base/font/base_font_storage.cpp +++ b/engines/wintermute/base/font/base_font_storage.cpp @@ -51,7 +51,7 @@ BaseFontStorage::~BaseFontStorage() { //////////////////////////////////////////////////////////////////////////
bool BaseFontStorage::cleanup(bool warn) {
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
if (warn) {
_gameRef->LOG(0, "Removing orphan font '%s'", _fonts[i]->getFilename());
}
@@ -64,7 +64,7 @@ bool BaseFontStorage::cleanup(bool warn) { //////////////////////////////////////////////////////////////////////////
bool BaseFontStorage::initLoop() {
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
_fonts[i]->initLoop();
}
return STATUS_OK;
@@ -76,7 +76,7 @@ BaseFont *BaseFontStorage::addFont(const Common::String &filename) { return NULL;
}
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
if (scumm_stricmp(_fonts[i]->getFilename(), filename.c_str()) == 0) {
_fonts[i]->_refCount++;
return _fonts[i];
@@ -112,7 +112,7 @@ bool BaseFontStorage::removeFont(BaseFont *font) { return STATUS_FAILED;
}
- for (int i = 0; i < _fonts.getSize(); i++) {
+ for (uint32 i = 0; i < _fonts.size(); i++) {
if (_fonts[i] == font) {
_fonts[i]->_refCount--;
if (_fonts[i]->_refCount <= 0) {
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp index 2c8cd261a9..19c5cef7ee 100644 --- a/engines/wintermute/base/font/base_font_truetype.cpp +++ b/engines/wintermute/base/font/base_font_truetype.cpp @@ -69,7 +69,7 @@ BaseFontTT::BaseFontTT(BaseGame *inGame) : BaseFont(inGame) { BaseFontTT::~BaseFontTT(void) {
clearCache();
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
delete _layers[i];
}
_layers.clear();
@@ -224,7 +224,7 @@ void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign if (surface) {
Rect32 rc;
BasePlatform::setRect(&rc, 0, 0, surface->getWidth(), surface->getHeight());
- for (int i = 0; i < _layers.getSize(); i++) {
+ for (uint32 i = 0; i < _layers.size(); i++) {
uint32 color = _layers[i]->_color;
uint32 origForceAlpha = renderer->_forceAlphaColor;
if (renderer->_forceAlphaColor != 0) {
@@ -433,7 +433,7 @@ bool BaseFontTT::loadBuffer(byte *buffer) { }
// create at least one layer
- if (_layers.getSize() == 0) {
+ if (_layers.size() == 0) {
BaseTTFontLayer *layer = new BaseTTFontLayer;
layer->_color = baseColor;
_layers.add(layer);
@@ -508,13 +508,13 @@ bool BaseFontTT::persist(BasePersistenceManager *persistMgr) { // persist layers
int numLayers;
if (persistMgr->getIsSaving()) {
- numLayers = _layers.getSize();
+ numLayers = _layers.size();
persistMgr->transfer(TMEMBER(numLayers));
for (int i = 0; i < numLayers; i++) {
_layers[i]->persist(persistMgr);
}
} else {
- numLayers = _layers.getSize();
+ numLayers = _layers.size();
persistMgr->transfer(TMEMBER(numLayers));
for (int i = 0; i < numLayers; i++) {
BaseTTFontLayer *layer = new BaseTTFontLayer;
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp index 4fb0eb6637..f52a1b8c82 100644 --- a/engines/wintermute/base/particles/part_emitter.cpp +++ b/engines/wintermute/base/particles/part_emitter.cpp @@ -94,18 +94,18 @@ PartEmitter::PartEmitter(BaseGame *inGame, BaseScriptHolder *owner) : BaseObject //////////////////////////////////////////////////////////////////////////
PartEmitter::~PartEmitter(void) {
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
delete _particles[i];
}
_particles.clear();
- for (int i = 0; i < _forces.getSize(); i++) {
+ for (uint32 i = 0; i < _forces.size(); i++) {
delete _forces[i];
}
_forces.clear();
- for (int i = 0; i < _sprites.getSize(); i++) {
+ for (uint32 i = 0; i < _sprites.size(); i++) {
delete[] _sprites[i];
}
_sprites.clear();
@@ -121,7 +121,7 @@ bool PartEmitter::addSprite(const char *filename) { }
// do we already have the file?
- for (int i = 0; i < _sprites.getSize(); i++) {
+ for (uint32 i = 0; i < _sprites.size(); i++) {
if (scumm_stricmp(filename, _sprites[i]) == 0) {
return STATUS_OK;
}
@@ -145,7 +145,7 @@ bool PartEmitter::addSprite(const char *filename) { //////////////////////////////////////////////////////////////////////////
bool PartEmitter::removeSprite(const char *filename) {
- for (int i = 0; i < _sprites.getSize(); i++) {
+ for (uint32 i = 0; i < _sprites.size(); i++) {
if (scumm_stricmp(filename, _sprites[i]) == 0) {
delete[] _sprites[i];
_sprites.remove_at(i);
@@ -160,7 +160,7 @@ bool PartEmitter::initParticle(PartParticle *particle, uint32 currentTime, uint3 if (!particle) {
return STATUS_FAILED;
}
- if (_sprites.getSize() == 0) {
+ if (_sprites.size() == 0) {
return STATUS_FAILED;
}
@@ -190,7 +190,7 @@ bool PartEmitter::initParticle(PartParticle *particle, uint32 currentTime, uint3 }
float angle = BaseUtils::randomAngle(_angle1, _angle2);
- int spriteIndex = BaseUtils::randomInt(0, _sprites.getSize() - 1);
+ int spriteIndex = BaseUtils::randomInt(0, _sprites.size() - 1);
float rotation = BaseUtils::randomAngle(_rotation1, _rotation2);
float angVelocity = BaseUtils::randomFloat(_angVelocity1, _angVelocity2);
@@ -259,7 +259,7 @@ bool PartEmitter::update() { bool PartEmitter::updateInternal(uint32 currentTime, uint32 timerDelta) {
int numLive = 0;
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
_particles[i]->update(this, currentTime, timerDelta);
if (!_particles[i]->_isDead) {
@@ -282,7 +282,7 @@ bool PartEmitter::updateInternal(uint32 currentTime, uint32 timerDelta) { int toGen = MIN(_genAmount, _maxParticles - numLive);
while (toGen > 0) {
int firstDeadIndex = -1;
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
if (_particles[i]->_isDead) {
firstDeadIndex = i;
break;
@@ -319,11 +319,11 @@ bool PartEmitter::updateInternal(uint32 currentTime, uint32 timerDelta) { //////////////////////////////////////////////////////////////////////////
bool PartEmitter::display(BaseRegion *region) {
- if (_sprites.getSize() <= 1) {
+ if (_sprites.size() <= 1) {
_gameRef->_renderer->startSpriteBatch();
}
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
if (region != NULL && _useRegion) {
if (!region->pointInRegion((int)_particles[i]->_pos.x, (int)_particles[i]->_pos.y)) {
continue;
@@ -333,7 +333,7 @@ bool PartEmitter::display(BaseRegion *region) { _particles[i]->display(this);
}
- if (_sprites.getSize() <= 1) {
+ if (_sprites.size() <= 1) {
_gameRef->_renderer->endSpriteBatch();
}
@@ -342,7 +342,7 @@ bool PartEmitter::display(BaseRegion *region) { //////////////////////////////////////////////////////////////////////////
bool PartEmitter::start() {
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
_particles[i]->_isDead = true;
}
_running = true;
@@ -406,7 +406,7 @@ bool PartEmitter::setBorderThickness(int thicknessLeft, int thicknessRight, int PartForce *PartEmitter::addForceByName(const Common::String &name) {
PartForce *force = NULL;
- for (int i = 0; i < _forces.getSize(); i++) {
+ for (uint32 i = 0; i < _forces.size(); i++) {
if (scumm_stricmp(name.c_str(), _forces[i]->getName()) == 0) {
force = _forces[i];
break;
@@ -443,7 +443,7 @@ bool PartEmitter::addForce(const Common::String &name, PartForce::TForceType typ //////////////////////////////////////////////////////////////////////////
bool PartEmitter::removeForce(const Common::String &name) {
- for (int i = 0; i < _forces.getSize(); i++) {
+ for (uint32 i = 0; i < _forces.size(); i++) {
if (scumm_stricmp(name.c_str(), _forces[i]->getName()) == 0) {
delete _forces[i];
_forces.remove_at(i);
@@ -524,7 +524,7 @@ bool PartEmitter::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisSt else if (strcmp(name, "Stop") == 0) {
stack->correctParams(0);
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
delete _particles[i];
}
_particles.clear();
@@ -787,7 +787,7 @@ ScValue *PartEmitter::scGetProperty(const char *name) { //////////////////////////////////////////////////////////////////////////
else if (strcmp(name, "NumLiveParticles") == 0) {
int numAlive = 0;
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
if (_particles[i] && !_particles[i]->_isDead) {
numAlive++;
}
@@ -1218,32 +1218,32 @@ bool PartEmitter::persist(BasePersistenceManager *persistMgr) { _sprites.persist(persistMgr);
- int numForces;
+ uint32 numForces;
if (persistMgr->getIsSaving()) {
- numForces = _forces.getSize();
+ numForces = _forces.size();
persistMgr->transfer(TMEMBER(numForces));
- for (int i = 0; i < _forces.getSize(); i++) {
+ for (uint32 i = 0; i < _forces.size(); i++) {
_forces[i]->persist(persistMgr);
}
} else {
persistMgr->transfer(TMEMBER(numForces));
- for (int i = 0; i < numForces; i++) {
+ for (uint32 i = 0; i < numForces; i++) {
PartForce *force = new PartForce(_gameRef);
force->persist(persistMgr);
_forces.add(force);
}
}
- int numParticles;
+ uint32 numParticles;
if (persistMgr->getIsSaving()) {
- numParticles = _particles.getSize();
+ numParticles = _particles.size();
persistMgr->transfer(TMEMBER(numParticles));
- for (int i = 0; i < _particles.getSize(); i++) {
+ for (uint32 i = 0; i < _particles.size(); i++) {
_particles[i]->persist(persistMgr);
}
} else {
persistMgr->transfer(TMEMBER(numParticles));
- for (int i = 0; i < numParticles; i++) {
+ for (uint32 i = 0; i < numParticles; i++) {
PartParticle *particle = new PartParticle(_gameRef);
particle->persist(persistMgr);
_particles.add(particle);
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp index 9247514ac3..5f523612b8 100644 --- a/engines/wintermute/base/particles/part_particle.cpp +++ b/engines/wintermute/base/particles/part_particle.cpp @@ -148,7 +148,7 @@ bool PartParticle::update(PartEmitter *emitter, uint32 currentTime, uint32 timer // update position
float elapsedTime = (float)timerDelta / 1000.f;
- for (int i = 0; i < emitter->_forces.getSize(); i++) {
+ for (uint32 i = 0; i < emitter->_forces.size(); i++) {
PartForce *force = emitter->_forces[i];
switch (force->_type) {
case PartForce::FORCE_GLOBAL:
diff --git a/engines/wintermute/base/scriptables/script.cpp b/engines/wintermute/base/scriptables/script.cpp index 6c8a88adb0..beef4ee9d2 100644 --- a/engines/wintermute/base/scriptables/script.cpp +++ b/engines/wintermute/base/scriptables/script.cpp @@ -1423,7 +1423,7 @@ bool ScScript::copyParameters(ScStack *stack) { //////////////////////////////////////////////////////////////////////////
bool ScScript::finishThreads() {
- for (int i = 0; i < _engine->_scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _engine->_scripts.size(); i++) {
ScScript *scr = _engine->_scripts[i];
if (scr->_thread && scr->_state != SCRIPT_FINISHED && scr->_owner == _owner && scumm_stricmp(scr->_filename, _filename) == 0) {
scr->finish(true);
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp index 575e24a3a3..d518be579f 100644 --- a/engines/wintermute/base/scriptables/script_engine.cpp +++ b/engines/wintermute/base/scriptables/script_engine.cpp @@ -95,7 +95,7 @@ ScEngine::~ScEngine() { //////////////////////////////////////////////////////////////////////////
bool ScEngine::cleanup() {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (!_scripts[i]->_thread && _scripts[i]->_owner) {
_scripts[i]->_owner->removeScript(_scripts[i]);
}
@@ -248,19 +248,19 @@ byte *ScEngine::getCompiledScript(const char *filename, uint32 *outSize, bool ig //////////////////////////////////////////////////////////////////////////
bool ScEngine::tick() {
- if (_scripts.getSize() == 0) {
+ if (_scripts.size() == 0) {
return STATUS_OK;
}
// resolve waiting scripts
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
switch (_scripts[i]->_state) {
case SCRIPT_WAITING: {
/*
bool obj_found=false;
- for(int j=0; j<_gameRef->_regObjects.getSize(); j++)
+ for(int j=0; j<_gameRef->_regObjects.size(); j++)
{
if (_gameRef->_regObjects[j] == _scripts[i]->_waitObject)
{
@@ -318,7 +318,7 @@ bool ScEngine::tick() { // execute scripts
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
// skip paused scripts
if (_scripts[i]->_state == SCRIPT_PAUSED) {
@@ -365,7 +365,7 @@ bool ScEngine::tick() { //////////////////////////////////////////////////////////////////////////
bool ScEngine::tickUnbreakable() {
// execute unbreakable scripts
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (!_scripts[i]->_unbreakable) {
continue;
}
@@ -386,7 +386,7 @@ bool ScEngine::tickUnbreakable() { //////////////////////////////////////////////////////////////////////////
bool ScEngine::removeFinishedScripts() {
// remove finished scripts
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); 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]);
@@ -405,7 +405,7 @@ bool ScEngine::removeFinishedScripts() { int ScEngine::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 (uint32 i = 0; i < _scripts.size(); i++) {
if (_scripts[i]->_state == SCRIPT_FINISHED) {
continue;
}
@@ -456,7 +456,7 @@ bool ScEngine::emptyScriptCache() { //////////////////////////////////////////////////////////////////////////
bool ScEngine::resetObject(BaseObject *Object) {
// terminate all scripts waiting for this object
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (_scripts[i]->_state == SCRIPT_WAITING && _scripts[i]->_waitObject == Object) {
if (!_gameRef->_compatKillMethodThreads) {
resetScript(_scripts[i]);
@@ -472,7 +472,7 @@ bool ScEngine::resetObject(BaseObject *Object) { //////////////////////////////////////////////////////////////////////////
bool ScEngine::resetScript(ScScript *script) {
// terminate all scripts waiting for this script
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (_scripts[i]->_state == SCRIPT_WAITING_SCRIPT && _scripts[i]->_waitScript == script) {
_scripts[i]->finish();
}
@@ -497,7 +497,7 @@ bool ScEngine::persist(BasePersistenceManager *persistMgr) { //////////////////////////////////////////////////////////////////////////
void ScEngine::editorCleanup() {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (_scripts[i]->_owner == NULL && (_scripts[i]->_state == SCRIPT_FINISHED || _scripts[i]->_state == SCRIPT_ERROR)) {
delete _scripts[i];
_scripts.remove_at(i);
@@ -509,7 +509,7 @@ void ScEngine::editorCleanup() { //////////////////////////////////////////////////////////////////////////
bool ScEngine::pauseAll() {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (_scripts[i] != _currentScript) {
_scripts[i]->pause();
}
@@ -521,7 +521,7 @@ bool ScEngine::pauseAll() { //////////////////////////////////////////////////////////////////////////
bool ScEngine::resumeAll() {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
_scripts[i]->resume();
}
@@ -531,7 +531,7 @@ bool ScEngine::resumeAll() { //////////////////////////////////////////////////////////////////////////
bool ScEngine::isValidScript(ScScript *script) {
- for (int i = 0; i < _scripts.getSize(); i++) {
+ for (uint32 i = 0; i < _scripts.size(); i++) {
if (_scripts[i] == script) {
return true;
}
diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp index 7e81cdaf17..d27748abe6 100644 --- a/engines/wintermute/base/scriptables/script_stack.cpp +++ b/engines/wintermute/base/scriptables/script_stack.cpp @@ -44,10 +44,10 @@ ScStack::ScStack(BaseGame *inGame) : BaseClass(inGame) { ScStack::~ScStack() {
#if _DEBUG
- //_gameRef->LOG(0, "STAT: Stack size: %d, SP=%d", _values.getSize(), _sP);
+ //_gameRef->LOG(0, "STAT: Stack size: %d, SP=%d", _values.size(), _sP);
#endif
- for (int i = 0; i < _values.getSize(); i++) {
+ for (uint32 i = 0; i < _values.size(); i++) {
delete _values[i];
}
_values.clear();
@@ -69,7 +69,7 @@ ScValue *ScStack::pop() { void ScStack::push(ScValue *val) {
_sP++;
- if (_sP < _values.getSize()) {
+ if (_sP < (int32)_values.size()) {
_values[_sP]->cleanup();
_values[_sP]->copy(val);
} else {
@@ -84,7 +84,7 @@ void ScStack::push(ScValue *val) { ScValue *ScStack::getPushValue() {
_sP++;
- if (_sP >= _values.getSize()) {
+ if (_sP >= (int32)_values.size()) {
ScValue *val = new ScValue(_gameRef);
_values.add(val);
}
@@ -96,7 +96,7 @@ ScValue *ScStack::getPushValue() { //////////////////////////////////////////////////////////////////////////
ScValue *ScStack::getTop() {
- if (_sP < 0 || _sP >= _values.getSize()) {
+ if (_sP < 0 || _sP >= (int32)_values.size()) {
return NULL;
} else {
return _values[_sP];
@@ -107,7 +107,7 @@ ScValue *ScStack::getTop() { //////////////////////////////////////////////////////////////////////////
ScValue *ScStack::getAt(int index) {
index = _sP - index;
- if (index < 0 || index >= _values.getSize()) {
+ if (index < 0 || index >= (int32)_values.size()) {
return NULL;
} else {
return _values[index];
@@ -136,9 +136,9 @@ void ScStack::correctParams(uint32 expectedParams) { nuParams++;
_sP++;
- if (_values.getSize() > _sP + 1) {
- delete _values[_values.getSize() - 1];
- _values.remove_at(_values.getSize() - 1);
+ if ((int32)_values.size() > _sP + 1) {
+ delete _values[_values.size() - 1];
+ _values.remove_at(_values.size() - 1);
}
}
}
|