aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/wintermute/ad/ad_actor.cpp10
-rw-r--r--engines/wintermute/base/base_frame.cpp8
-rw-r--r--engines/wintermute/base/base_surface_storage.cpp4
-rw-r--r--engines/wintermute/base/font/base_font_bitmap.cpp4
-rw-r--r--engines/wintermute/base/font/base_font_truetype.cpp4
-rw-r--r--engines/wintermute/base/particles/part_emitter.cpp4
6 files changed, 17 insertions, 17 deletions
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index dd50955b4c..63b1532416 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -1036,7 +1036,7 @@ bool AdActor::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
const char *animName = stack->pop()->getString();
bool found = false;
- for (int i = 0; i < _anims.size(); i++) {
+ for (uint32 i = 0; i < _anims.size(); i++) {
if (scumm_stricmp(_anims[i]->getName(), animName) == 0) {
// invalidate sprites in use
if (_anims[i]->containsSprite(_tempSprite2)) {
@@ -1255,7 +1255,7 @@ BaseSprite *AdActor::getTalkStance(const char *stance) {
// not - get a random talk
if (!ret) {
BaseArray<AdSpriteSet *> talkAnims;
- for (int i = 0; i < _anims.size(); i++) {
+ for (uint32 i = 0; i < _anims.size(); i++) {
if (_talkAnimName.compareToIgnoreCase(_anims[i]->getName()) == 0) {
talkAnims.add(_anims[i]);
}
@@ -1284,7 +1284,7 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) {
if (stance != NULL) {
// search special stances
- for (int i = 0; i < _talkSpritesEx.size(); i++) {
+ for (uint32 i = 0; i < _talkSpritesEx.size(); i++) {
if (scumm_stricmp(_talkSpritesEx[i]->getName(), stance) == 0) {
ret = _talkSpritesEx[i]->getSprite(_dir);
break;
@@ -1292,7 +1292,7 @@ BaseSprite *AdActor::getTalkStanceOld(const char *stance) {
}
if (ret == NULL) {
// search generic stances
- for (int i = 0; i < _talkSprites.size(); i++) {
+ for (uint32 i = 0; i < _talkSprites.size(); i++) {
if (scumm_stricmp(_talkSprites[i]->getName(), stance) == 0) {
ret = _talkSprites[i]->getSprite(_dir);
break;
@@ -1395,7 +1395,7 @@ int AdActor::getHeight() {
//////////////////////////////////////////////////////////////////////////
AdSpriteSet *AdActor::getAnimByName(const Common::String &animName) {
- for (int i = 0; i < _anims.size(); i++) {
+ for (uint32 i = 0; i < _anims.size(); i++) {
if (animName.compareToIgnoreCase(_anims[i]->getName()) == 0) {
return _anims[i];
}
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 {
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index 0e0976b838..c87da898db 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -176,8 +176,8 @@ bool BaseSurfaceStorage::sortSurfaces() {
//////////////////////////////////////////////////////////////////////////
int BaseSurfaceStorage::surfaceSortCB(const void *arg1, const void *arg2) {
- const BaseSurface *s1 = *((BaseSurface **)arg1);
- const BaseSurface *s2 = *((BaseSurface **)arg2);
+ const BaseSurface *s1 = *((const BaseSurface *const *)arg1);
+ const BaseSurface *s2 = *((const BaseSurface *const *)arg2);
// sort by life time
if (s1->_lifeTime <= 0 && s2->_lifeTime > 0) {
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index a9d71e0fa1..062f4801cf 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -118,10 +118,10 @@ int BaseFontBitmap::textHeightDraw(const byte *text, int x, int y, int width, TT
AnsiString str;
if (_gameRef->_textEncoding == TEXT_UTF8) {
- WideString wstr = StringUtil::utf8ToWide(Utf8String((char *)text));
+ WideString wstr = StringUtil::utf8ToWide(Utf8String((const char *)text));
str = StringUtil::wideToAnsi(wstr);
} else {
- str = AnsiString((char *)text);
+ str = AnsiString((const char *)text);
}
if (str.empty()) {
return 0;
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index 36703ed44f..171f33d8ab 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -153,11 +153,11 @@ int BaseFontTT::getTextHeight(byte *text, int width) {
//////////////////////////////////////////////////////////////////////////
void BaseFontTT::drawText(const byte *text, int x, int y, int width, TTextAlign align, int maxHeight, int maxLength) {
- if (text == NULL || strcmp((char *)text, "") == 0) {
+ if (text == NULL || strcmp((const char *)text, "") == 0) {
return;
}
- WideString textStr = (char *)text;
+ WideString textStr = (const char *)text;
// TODO: Why do we still insist on Widestrings everywhere?
/* if (_gameRef->_textEncoding == TEXT_UTF8) text = StringUtil::Utf8ToWide((char *)Text);
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index f52a1b8c82..7012bef86f 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -373,8 +373,8 @@ bool PartEmitter::sortParticlesByZ() {
//////////////////////////////////////////////////////////////////////////
int PartEmitter::compareZ(const void *obj1, const void *obj2) {
- const PartParticle *p1 = *(PartParticle **)obj1;
- const PartParticle *p2 = *(PartParticle **)obj2;
+ const PartParticle *p1 = *(const PartParticle *const *)obj1;
+ const PartParticle *p2 = *(const PartParticle *const *)obj2;
if (p1->_posZ < p2->_posZ) {
return -1;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 13:54:49 +0000