diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 19:51:07 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 20:00:41 +0200 |
| commit | 7027741de777f3d1f5e9e93f5a2dd8ade09b6599 (patch) | |
| tree | fd56cde84561323e545e7b3792af20cf83f6156c /engines/wintermute/base/base_frame.cpp | |
| parent | 158a2060868eceff254460a89b67d78dc650bc94 (diff) | |
| download | scummvm-rg350-7027741de777f3d1f5e9e93f5a2dd8ade09b6599.tar.gz scummvm-rg350-7027741de777f3d1f5e9e93f5a2dd8ade09b6599.tar.bz2 scummvm-rg350-7027741de777f3d1f5e9e93f5a2dd8ade09b6599.zip | |
WINTERMUTE: Fix warnings
Diffstat (limited to 'engines/wintermute/base/base_frame.cpp')
| -rw-r--r-- | engines/wintermute/base/base_frame.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/wintermute/base/base_frame.cpp b/engines/wintermute/base/base_frame.cpp index eb66661c62..ed2c7acaca 100644 --- a/engines/wintermute/base/base_frame.cpp +++ b/engines/wintermute/base/base_frame.cpp @@ -349,7 +349,7 @@ bool BaseFrame::getBoundingRect(Rect32 *rect, int x, int y, float scaleX, float Rect32 subRect;
- for (int i = 0; i < _subframes.size(); i++) {
+ for (uint32 i = 0; i < _subframes.size(); i++) {
_subframes[i]->getBoundingRect(&subRect, x, y, scaleX, scaleY);
BasePlatform::unionRect(rect, rect, &subRect);
}
@@ -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.size()) {
+ if (index < 0 || index >= (int32)_subframes.size()) {
script->runtimeError("Frame.GetSubframe: Subframe index %d is out of range.", index);
stack->pushNULL();
} else {
@@ -487,7 +487,7 @@ 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.size()) {
+ if (index < 0 || index >= (int32)_subframes.size()) {
script->runtimeError("Frame.DeleteSubframe: Subframe index %d is out of range.", index);
}
} else {
@@ -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.size()) {
+ if (index < 0 || index >= (int32)_applyEvent.size()) {
script->runtimeError("Frame.GetEvent: Event index %d is out of range.", index);
stack->pushNULL();
} else {
|