[Scummvm-git-logs] scummvm master -> 0a767925aa09ed0ccbe30dfba9c72498a86cdf87
aquadran
noreply at scummvm.org
Sat Sep 13 14:10:33 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
0a767925aa WINTERMUTE: Cleanup code a bit
Commit: 0a767925aa09ed0ccbe30dfba9c72498a86cdf87
https://github.com/scummvm/scummvm/commit/0a767925aa09ed0ccbe30dfba9c72498a86cdf87
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-13T16:10:29+02:00
Commit Message:
WINTERMUTE: Cleanup code a bit
Changed paths:
engines/wintermute/ad/ad_actor.cpp
engines/wintermute/ad/ad_entity.cpp
engines/wintermute/ad/ad_inventory_box.cpp
engines/wintermute/ad/ad_layer.cpp
engines/wintermute/ad/ad_object.cpp
engines/wintermute/ad/ad_response_box.cpp
engines/wintermute/ad/ad_scene.cpp
engines/wintermute/base/base.cpp
engines/wintermute/base/base_game.cpp
engines/wintermute/base/base_game.h
engines/wintermute/base/base_script_holder.cpp
engines/wintermute/base/base_script_holder.h
engines/wintermute/base/base_transition_manager.cpp
engines/wintermute/base/font/base_font_bitmap.cpp
engines/wintermute/base/font/base_font_truetype.cpp
engines/wintermute/base/gfx/base_renderer.cpp
engines/wintermute/base/particles/part_particle.cpp
engines/wintermute/base/scriptables/script_engine.cpp
engines/wintermute/base/scriptables/script_stack.cpp
engines/wintermute/base/scriptables/script_value.cpp
engines/wintermute/coll_templ.h
engines/wintermute/system/sys_class.cpp
engines/wintermute/ui/ui_button.cpp
engines/wintermute/ui/ui_edit.cpp
engines/wintermute/ui/ui_text.cpp
engines/wintermute/ui/ui_window.cpp
diff --git a/engines/wintermute/ad/ad_actor.cpp b/engines/wintermute/ad/ad_actor.cpp
index 0336c939a89..bab01072d07 100644
--- a/engines/wintermute/ad/ad_actor.cpp
+++ b/engines/wintermute/ad/ad_actor.cpp
@@ -589,7 +589,7 @@ bool AdActor::display() {
float ScaleX, ScaleY;
GetScale(&ScaleX, &ScaleY);
- RECT rc;
+ Common::Rect32 rc;
SetRectEmpty(&rc);
if (m_CurrentSprite) {
m_CurrentSprite->GetBoundingRect(&rc, m_PosX - Game->m_OffsetX, m_PosY - Game->m_OffsetY, ScaleX, ScaleY);
@@ -812,7 +812,6 @@ bool AdActor::update() {
}
break;
default:
- error("AdActor::Update - Unhandled enum");
}
// Below condition code is not present in Lite up to (Feb 8, 2012) (SVN repo)
diff --git a/engines/wintermute/ad/ad_entity.cpp b/engines/wintermute/ad/ad_entity.cpp
index 946fdd99c3a..00ca2d1c95c 100644
--- a/engines/wintermute/ad/ad_entity.cpp
+++ b/engines/wintermute/ad/ad_entity.cpp
@@ -591,7 +591,7 @@ bool AdEntity::display() {
float ScaleX, ScaleY;
GetScale(&ScaleX, &ScaleY);
- RECT rc;
+ Common::Rect32 rc;
SetRectEmpty(&rc);
if (m_CurrentSprite) {
m_CurrentSprite->GetBoundingRect(&rc, m_PosX - Game->m_OffsetX, m_PosY - Game->m_OffsetY, ScaleX, ScaleY);
diff --git a/engines/wintermute/ad/ad_inventory_box.cpp b/engines/wintermute/ad/ad_inventory_box.cpp
index 09278eb8a1c..6867b333228 100644
--- a/engines/wintermute/ad/ad_inventory_box.cpp
+++ b/engines/wintermute/ad/ad_inventory_box.cpp
@@ -92,7 +92,6 @@ bool AdInventoryBox::listen(BaseScriptHolder *param1, uint32 param2) {
}
break;
default:
- error("AdInventoryBox::Listen - Unhandled enum");
break;
}
diff --git a/engines/wintermute/ad/ad_layer.cpp b/engines/wintermute/ad/ad_layer.cpp
index 548d61de3ac..274cac7dda5 100644
--- a/engines/wintermute/ad/ad_layer.cpp
+++ b/engines/wintermute/ad/ad_layer.cpp
@@ -536,7 +536,6 @@ bool AdLayer::saveAsText(BaseDynamicBuffer *buffer, int indent) {
_nodes[i]->_region->saveAsText(buffer, indent + 2);
break;
default:
- error("AdLayer::SaveAsText - Unhandled enum");
break;
}
}
diff --git a/engines/wintermute/ad/ad_object.cpp b/engines/wintermute/ad/ad_object.cpp
index e038e64b879..8d713496683 100644
--- a/engines/wintermute/ad/ad_object.cpp
+++ b/engines/wintermute/ad/ad_object.cpp
@@ -926,7 +926,7 @@ void AdObject::talk(const char *text, const char *sound, uint32 duration, const
// set duration by text length
if (_sentence->_duration <= 0) {
- _sentence->_duration = MAX<int32>((size_t)1000, _game->_subtitlesSpeed * strlen(_sentence->_text));
+ _sentence->_duration = MAX<int32>(1000, _game->_subtitlesSpeed * (int32)strlen(_sentence->_text));
}
diff --git a/engines/wintermute/ad/ad_response_box.cpp b/engines/wintermute/ad/ad_response_box.cpp
index bdad0e44c2c..0d79f7ad109 100644
--- a/engines/wintermute/ad/ad_response_box.cpp
+++ b/engines/wintermute/ad/ad_response_box.cpp
@@ -403,13 +403,11 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
default:
- error("AdResponseBox::SaveAsText - Unhandled enum");
break;
}
switch (_verticalAlign) {
case VAL_TOP:
- default:
buffer->putTextIndent(indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "top");
break;
case VAL_BOTTOM:
@@ -418,6 +416,8 @@ bool AdResponseBox::saveAsText(BaseDynamicBuffer *buffer, int indent) {
case VAL_CENTER:
buffer->putTextIndent(indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "center");
break;
+ default:
+ break;
}
buffer->putTextIndent(indent + 2, "SPACING=%d\n", _spacing);
@@ -574,7 +574,7 @@ bool AdResponseBox::listen(BaseScriptHolder *param1, uint32 param2) {
}
break;
default:
- error("AdResponseBox::Listen - Unhandled enum");
+ break;
}
return STATUS_OK;
@@ -628,7 +628,6 @@ bool AdResponseBox::weedResponses() {
}
break;
default:
- debugC(kWintermuteDebugGeneral, "AdResponseBox::WeedResponses - Unhandled enum");
break;
}
}
@@ -657,7 +656,7 @@ bool AdResponseBox::handleResponse(const AdResponse *response) {
adGame->addGameResponse(response->_id);
break;
default:
- debugC(kWintermuteDebugGeneral, "AdResponseBox::HandleResponse - Unhandled enum");
+ break;
}
return STATUS_OK;
diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 7462e0678bf..a16d8e679c3 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -271,7 +271,7 @@ bool AdScene::getPath(BasePoint source, BasePoint target, AdPath *path, BaseObje
// correctTargetPoint(&target.x, &target.y);
// last point
- //_pfPath.add(new AdPathPoint(target.x, target.y, INT_MAX));
+ //_pfPath.add(new AdPathPoint(target.x, target.y, INT_MAX_VALUE));
pfPointsAdd(target.x, target.y, INT_MAX_VALUE);
// active waypoints
@@ -311,7 +311,7 @@ void AdScene::pfAddWaypointGroup(AdWaypointGroup *wpt, BaseObject *requester) {
continue;
}
- //_pfPath.add(new AdPathPoint(wpt->_points[i]->x, wpt->_points[i]->y, INT_MAX));
+ //_pfPath.add(new AdPathPoint(wpt->_points[i]->x, wpt->_points[i]->y, INT_MAX_VALUE));
pfPointsAdd(wpt->_points[i]->x, wpt->_points[i]->y, INT_MAX_VALUE);
}
}
@@ -1266,7 +1266,6 @@ bool AdScene::traverseNodes(bool doUpdate) {
break;
default:
- error("AdScene::TraverseNodes - Unhandled enum");
break;
} // switch
} // each node
@@ -3476,7 +3475,6 @@ bool AdScene::persistState(bool saving) {
}
break;
default:
- warning("AdScene::PersistState - unhandled enum");
break;
}
}
@@ -3624,7 +3622,7 @@ BaseObject *AdScene::getNextAccessObject(BaseObject *currObject) {
if (currObject != nullptr) {
for (int32 i = 0; i < objects.getSize(); i++) {
if (objects[i] == currObject) {
- if (i < (int32)objects.getSize() - 1) {
+ if (i < objects.getSize() - 1) {
return objects[i + 1];
} else {
break;
@@ -3702,7 +3700,6 @@ bool AdScene::getSceneObjects(BaseArray<AdObject *> &objects, bool interactiveOn
break;
default:
- debugC(kWintermuteDebugGeneral, "AdScene::GetSceneObjects - Unhandled enum");
break;
}
}
diff --git a/engines/wintermute/base/base.cpp b/engines/wintermute/base/base.cpp
index b882b14a7d9..a0b0b5aec6a 100644
--- a/engines/wintermute/base/base.cpp
+++ b/engines/wintermute/base/base.cpp
@@ -67,11 +67,11 @@ Common::String BaseClass::getEditorProp(const Common::String &propName, const Co
//////////////////////////////////////////////////////////////////////////
bool BaseClass::setEditorProp(const Common::String &propName, const Common::String &propValue) {
- if (propName.size() == 0) {
+ if (propName.empty()) {
return STATUS_FAILED;
}
- if (propValue.size() == 0) {
+ if (propValue.empty()) {
_editorProps.erase(propName);
} else {
_editorProps[propName] = propValue;
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index c4e0469d817..298e93bd0c0 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -2679,10 +2679,10 @@ bool BaseGame::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack
int bytesRead = 0;
while (bytesRead < file->size()) {
- int bufSize = MIN((uint32)1024, (uint32)(file->size() - bytesRead));
+ uint32 bufSize = MIN((uint32)1024, (uint32)(file->size() - bytesRead));
bytesRead += file->read(buf, bufSize);
- for (int i = 0; i < bufSize; i++) {
+ for (uint32 i = 0; i < bufSize; i++) {
remainder = crc_process_byte(buf[i], remainder);
}
}
@@ -5104,11 +5104,6 @@ void BaseGame::resetMousePos() {
BasePlatform::setCursorPos(p.x, p.y);
}
-//////////////////////////////////////////////////////////////////////////
-void BaseGame::setResourceModule(void *resModule) {
- // empty
-}
-
//////////////////////////////////////////////////////////////////////////
bool BaseGame::displayContent(bool doUpdate, bool displayAll) {
return STATUS_OK;
diff --git a/engines/wintermute/base/base_game.h b/engines/wintermute/base/base_game.h
index 44265d752b7..bd988dcf85a 100644
--- a/engines/wintermute/base/base_game.h
+++ b/engines/wintermute/base/base_game.h
@@ -175,7 +175,6 @@ public:
uint32 _thumbnailHeight;
bool _reportTextureFormat;
- void setResourceModule(void *resModule);
void setEngineLogCallback(ENGINE_LOG_CALLBACK callback = nullptr, void *data = nullptr);
ENGINE_LOG_CALLBACK _engineLogCallback;
diff --git a/engines/wintermute/base/base_script_holder.cpp b/engines/wintermute/base/base_script_holder.cpp
index 7eb2f6340a1..56664ded0fc 100644
--- a/engines/wintermute/base/base_script_holder.cpp
+++ b/engines/wintermute/base/base_script_holder.cpp
@@ -42,7 +42,7 @@ IMPLEMENT_PERSISTENT(BaseScriptHolder, false)
//////////////////////////////////////////////////////////////////////
BaseScriptHolder::BaseScriptHolder(BaseGame *inGame) : BaseScriptable(inGame) {
setName("<unnamed>");
- _ready = false;
+
_freezable = true;
_filename = nullptr;
}
diff --git a/engines/wintermute/base/base_script_holder.h b/engines/wintermute/base/base_script_holder.h
index fd7070b1dc3..dfe004d6ddd 100644
--- a/engines/wintermute/base/base_script_holder.h
+++ b/engines/wintermute/base/base_script_holder.h
@@ -56,7 +56,7 @@ public:
char *_filename;
bool _freezable;
- bool _ready;
+ bool _ready{};
BaseArray<ScScript *> _scripts;
// scripting interface
diff --git a/engines/wintermute/base/base_transition_manager.cpp b/engines/wintermute/base/base_transition_manager.cpp
index f27818ac5b2..4fc35839fb5 100644
--- a/engines/wintermute/base/base_transition_manager.cpp
+++ b/engines/wintermute/base/base_transition_manager.cpp
@@ -124,7 +124,7 @@ bool BaseTransitionMgr::update() {
}
break;
default:
- error("BaseTransitionMgr::Update - unhandled enum NUM_TRANSITION_TYPES");
+ break;
}
if (isReady()) {
diff --git a/engines/wintermute/base/font/base_font_bitmap.cpp b/engines/wintermute/base/font/base_font_bitmap.cpp
index 727ae6cd0f4..f4dbf82524a 100644
--- a/engines/wintermute/base/font/base_font_bitmap.cpp
+++ b/engines/wintermute/base/font/base_font_bitmap.cpp
@@ -91,7 +91,7 @@ int BaseFontBitmap::getTextWidth(const byte *text, int maxLength) {
str = AnsiString((const char *)text);
}
- if (maxLength >= 0 && str.size() > (uint32)maxLength) {
+ if (maxLength >= 0 && (int)str.size() > maxLength) {
str = Common::String(str.c_str(), (uint32)maxLength);
}
//str.substr(0, maxLength); // TODO: Remove
@@ -150,7 +150,7 @@ int BaseFontBitmap::textHeightDraw(const byte *text, int x, int y, int width, TT
}
while (!done) {
- if (maxHeight > 0 && (numLines + 1)*_tileHeight > maxHeight) {
+ if (maxHeight > 0 && (numLines + 1) * _tileHeight > maxHeight) {
if (draw) {
_game->_renderer->endSpriteBatch();
}
@@ -204,7 +204,6 @@ int BaseFontBitmap::textHeightDraw(const byte *text, int x, int y, int width, TT
startX = x;
break;
default:
- error("BaseFontBitmap::TextHeightDraw - Unhandled enum");
break;
}
for (i = start; i < end + 1; i++) {
@@ -509,7 +508,7 @@ bool BaseFontBitmap::loadBuffer(char *buffer) {
_widths[spaceChar] = spaceWidth;
} else {
if (_widths[spaceChar] == expandWidth || _widths[spaceChar] == 0) {
- _widths[spaceChar] = (_widths[(uint)'m'] + _widths[(uint)'i']) / 2;
+ _widths[spaceChar] = (_widths[(uint32)'m'] + _widths[(uint32)'i']) / 2;
}
}
} else {
diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index bec47b3abff..3e013d4875a 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -107,7 +107,7 @@ int BaseFontTT::getTextWidth(const byte *text, int maxLength) {
textStr = StringUtil::ansiToWide((const char *)text, _charset);
}
- if (maxLength >= 0 && textStr.size() > (uint32)maxLength) {
+ if (maxLength >= 0 && (int)textStr.size() > maxLength) {
textStr = textStr.substr(0, (uint32)maxLength);
}
//text = text.substr(0, MaxLength); // TODO: Remove
diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index 61e81ccc92a..35ba4cfa89c 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -75,7 +75,7 @@ BaseObject *BaseRenderer::getObjectAt(int x, int y) {
point.x = x;
point.y = y;
- for (int32 i = (int32)_rectList.getSize() - 1; i >= 0; i--) {
+ for (int32 i = _rectList.getSize() - 1; i >= 0; i--) {
if (BasePlatform::ptInRect(&_rectList[i]->_rect, point)) {
if (_rectList[i]->_precise) {
// frame
diff --git a/engines/wintermute/base/particles/part_particle.cpp b/engines/wintermute/base/particles/part_particle.cpp
index ee4421de7a8..515e5e0d2b0 100644
--- a/engines/wintermute/base/particles/part_particle.cpp
+++ b/engines/wintermute/base/particles/part_particle.cpp
@@ -97,7 +97,7 @@ bool PartParticle::update(PartEmitter *emitter, uint32 currentTime, uint32 timer
_state = PARTICLE_NORMAL;
_currentAlpha = _alpha1;
} else {
- _currentAlpha = (int)(((float)currentTime - (float)_fadeStart) / (float)_fadeTime * _alpha1);
+ _currentAlpha = (int32)(((float)currentTime - (float)_fadeStart) / (float)_fadeTime * _alpha1);
}
return STATUS_OK;
@@ -106,7 +106,7 @@ bool PartParticle::update(PartEmitter *emitter, uint32 currentTime, uint32 timer
_isDead = true;
return STATUS_OK;
} else {
- _currentAlpha = _fadeStartAlpha - (int)(((float)currentTime - (float)_fadeStart) / (float)_fadeTime * _fadeStartAlpha);
+ _currentAlpha = _fadeStartAlpha - (int32)(((float)currentTime - (float)_fadeStart) / (float)_fadeTime * _fadeStartAlpha);
}
return STATUS_OK;
diff --git a/engines/wintermute/base/scriptables/script_engine.cpp b/engines/wintermute/base/scriptables/script_engine.cpp
index f653ea0c2df..7fecf8f4a97 100644
--- a/engines/wintermute/base/scriptables/script_engine.cpp
+++ b/engines/wintermute/base/scriptables/script_engine.cpp
@@ -450,15 +450,6 @@ int ScEngine::getNumScripts(int *running, int *waiting, int *persistent) {
numPersistent++;
break;
default:
- // Those states were not handled in original WME as well:
- // * SCRIPT_FINISHED,
- // * SCRIPT_ERROR,
- // * SCRIPT_WAITING_SCRIPT,
- // * SCRIPT_THREAD_FINISHED
- debugN("ScEngine::GetNumScripts - unhandled enum: %d\n", _scripts[i]->_state);
-
- // This method calculates thread counts to be shown at debug screen only
- // Extend BaseGame::displayDebugInfo() if you want to handle those states
break;
}
numTotal++;
diff --git a/engines/wintermute/base/scriptables/script_stack.cpp b/engines/wintermute/base/scriptables/script_stack.cpp
index 90c06c1e5e2..091f6ff0bcf 100644
--- a/engines/wintermute/base/scriptables/script_stack.cpp
+++ b/engines/wintermute/base/scriptables/script_stack.cpp
@@ -103,7 +103,7 @@ ScValue *ScStack::getTop() {
//////////////////////////////////////////////////////////////////////////
ScValue *ScStack::getAt(int index) {
index = _sP - index;
- if (index < 0 || index >= (int32)_values.getSize()) {
+ if (index < 0 || index >= _values.getSize()) {
return nullptr;
} else {
return _values[index];
diff --git a/engines/wintermute/base/scriptables/script_value.cpp b/engines/wintermute/base/scriptables/script_value.cpp
index 132324e8ae1..bf3e99c4e23 100644
--- a/engines/wintermute/base/scriptables/script_value.cpp
+++ b/engines/wintermute/base/scriptables/script_value.cpp
@@ -769,7 +769,6 @@ void ScValue::setValue(ScValue *val) {
_valNative->scSetString(val->getString());
break;
default:
- warning("ScValue::setValue - unhandled enum");
break;
}
}
diff --git a/engines/wintermute/coll_templ.h b/engines/wintermute/coll_templ.h
index b550d8a17ba..826c6af06fc 100644
--- a/engines/wintermute/coll_templ.h
+++ b/engines/wintermute/coll_templ.h
@@ -83,7 +83,7 @@ public:
// Accessing elements
TYPE getAt(int32 nIndex) const;
void setAt(int32 nIndex, TYPE newElement);
- TYPE& elementAt(int32 nIndex);
+ TYPE &elementAt(int32 nIndex);
// Direct Access to the element data (may return NULL)
const TYPE *getData() const;
@@ -176,7 +176,7 @@ inline TYPE &BaseArrayBase<TYPE>::operator[](int32 nIndex) {
}
/////////////////////////////////////////////////////////////////////////////
-// BaseArray<TYPE, ARG_TYPE> out-of-line functions
+// BaseArray<TYPE> out-of-line functions
/////////////////////////////////////////////////////////////////////////////
template<class TYPE>
BaseArrayBase<TYPE>::BaseArrayBase() {
@@ -375,10 +375,10 @@ public:
bool persist(BasePersistenceManager *persistMgr) {
int32 i, j;
if (persistMgr->getIsSaving()) {
- j = getSize();
+ j = BaseArray::getSize();
persistMgr->transferSint32("ArraySize", &j);
for (i = 0; i < j; i++) {
- char *obj = getAt(i);
+ char *obj = BaseArray::getAt(i);
persistMgr->transferCharPtr("", &obj);
}
} else {
@@ -401,19 +401,19 @@ public:
bool persist(BasePersistenceManager *persistMgr) {
int32 i, j;
if (persistMgr->getIsSaving()) {
- j = getSize();
+ j = BaseArray::getSize();
persistMgr->transferSint32("ArraySize", &j);
for (i = 0; i < j; i++) {
- const char * obj = getAt(i);
+ const char * obj = BaseArray::getAt(i);
persistMgr->transferConstChar("", &obj);
}
} else {
- setSize(0, -1);
+ BaseArray::setSize(0, -1);
persistMgr->transferSint32("ArraySize", &j);
for (i = 0; i < j; i++) {
const char * obj;
persistMgr->transferConstChar("", &obj);
- add(obj);
+ BaseArray::add(obj);
}
}
return true;
diff --git a/engines/wintermute/system/sys_class.cpp b/engines/wintermute/system/sys_class.cpp
index a5eafdf72e4..ee250aef488 100644
--- a/engines/wintermute/system/sys_class.cpp
+++ b/engines/wintermute/system/sys_class.cpp
@@ -170,10 +170,6 @@ void SystemClass::loadTable(BaseGame *game, BasePersistenceManager *persistMgr)
// normal instances, create empty objects
else {
void *emptyObject = _build();
- if (!emptyObject) {
- warning("HALT");
- }
-
addInstance(emptyObject, SystemClassRegistry::getInstance()->getNextId(), instId);
}
diff --git a/engines/wintermute/ui/ui_button.cpp b/engines/wintermute/ui/ui_button.cpp
index a2d81fdf562..67f3c2936d8 100644
--- a/engines/wintermute/ui/ui_button.cpp
+++ b/engines/wintermute/ui/ui_button.cpp
@@ -544,7 +544,6 @@ bool UIButton::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
default:
- warning("UIButton::SaveAsText - unhandled enum");
break;
}
@@ -646,7 +645,7 @@ bool UIButton::display(int offsetX, int offsetY) {
BaseSprite *image = nullptr;
BaseFont *font = 0;
- //RECT rect;
+ //Common::Rect32 rect;
//BasePlatform::setRect(&rect, offsetX + _posX, offsetY + _posY, offsetX+_posX+_width, offsetY+_posY+_height);
//_hover = (!_disable && BasePlatform::ptInRect(&rect, _game->_mousePos)!=FALSE);
_hover = (!_disable && _game->_activeObject == this && (_game->_interactive || _game->_state == GAME_SEMI_FROZEN));
@@ -757,7 +756,7 @@ bool UIButton::display(int offsetX, int offsetY) {
_imageHover->reset();
/* if (Game->m_AccessMgr->GetActiveObject() == this) {
- RECT rc;
+ Common::Rect32 rc;
SetRect(&rc, OffsetX + m_PosX, OffsetY + m_PosY, OffsetX + m_PosX + m_Width, OffsetY + m_PosY + m_Height);
Game->m_AccessMgr->SetHintRect(&rc, true);
}*/
diff --git a/engines/wintermute/ui/ui_edit.cpp b/engines/wintermute/ui/ui_edit.cpp
index d623e569387..f2a383a6e68 100644
--- a/engines/wintermute/ui/ui_edit.cpp
+++ b/engines/wintermute/ui/ui_edit.cpp
@@ -482,7 +482,7 @@ bool UIEdit::scSetProperty(const char *name, ScValue *value) {
if (strcmp(name, "SelStart") == 0) {
_selStart = value->getInt();
_selStart = MAX<int32>(_selStart, 0);
- _selStart = (int32)MIN((size_t)_selStart, strlen(_text));
+ _selStart = MIN(_selStart, (int32)strlen(_text));
return STATUS_OK;
}
@@ -492,7 +492,7 @@ bool UIEdit::scSetProperty(const char *name, ScValue *value) {
else if (strcmp(name, "SelEnd") == 0) {
_selEnd = value->getInt();
_selEnd = MAX<int32>(_selEnd, 0);
- _selEnd = (int32)MIN((size_t)_selEnd, strlen(_text));
+ _selEnd = MIN(_selEnd, (int32)strlen(_text));
return STATUS_OK;
}
@@ -602,8 +602,8 @@ bool UIEdit::display(int offsetX, int offsetY) {
_selStart = MAX<int32>(_selStart, 0);
_selEnd = MAX<int32>(_selEnd, 0);
- _selStart = (int32)MIN((size_t)_selStart, strlen(_text));
- _selEnd = (int32)MIN((size_t)_selEnd, strlen(_text));
+ _selStart = MIN(_selStart, (int32)strlen(_text));
+ _selEnd = MIN(_selEnd, (int32)strlen(_text));
//int cursorWidth = font->getCharWidth(_cursorChar[0]);
int cursorWidth = font->getTextWidth((byte *)_cursorChar);
@@ -727,7 +727,7 @@ bool UIEdit::display(int offsetX, int offsetY) {
_game->_renderer->_rectList.add(new BaseActiveRect(_game, this, nullptr, offsetX + _posX, offsetY + _posY, _width, _height, 100, 100, false));
/* if (Game->m_AccessMgr->GetActiveObject() == this) {
- RECT rc;
+ Common::Rect32 rc;
SetRect(&rc, OffsetX + m_PosX, OffsetY + m_PosY, OffsetX + m_PosX + m_Width, OffsetY + m_PosY + m_Height);
Game->m_AccessMgr->SetHintRect(&rc, true);
}*/
@@ -857,7 +857,7 @@ int UIEdit::deleteChars(int start, int end) {
}
start = MAX(start, (int)0);
- end = MIN((size_t)end, strlen(_text));
+ end = MIN(end, (int)strlen(_text));
char *str = new char[strlen(_text) - (end - start) + 1];
if (str) {
@@ -884,7 +884,7 @@ int UIEdit::insertChars(int pos, const byte *chars, int num) {
}
pos = MAX(pos, (int)0);
- pos = MIN((size_t)pos, strlen(_text));
+ pos = MIN(pos, (int)strlen(_text));
char *str = new char[strlen(_text) + num + 1];
if (str) {
diff --git a/engines/wintermute/ui/ui_text.cpp b/engines/wintermute/ui/ui_text.cpp
index c07482f2c36..560c0df2858 100644
--- a/engines/wintermute/ui/ui_text.cpp
+++ b/engines/wintermute/ui/ui_text.cpp
@@ -355,7 +355,6 @@ bool UIText::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "TEXT_ALIGN=\"%s\"\n", "center");
break;
default:
- error("UIText::SaveAsText - Unhandled enum");
break;
}
@@ -370,7 +369,7 @@ bool UIText::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "VERTICAL_ALIGN=\"%s\"\n", "center");
break;
default:
- error("UIText::SaveAsText - Unhandled enum value: NUM_VERTICAL_ALIGN");
+ break;
}
buffer->putTextIndent(indent + 2, "\n");
diff --git a/engines/wintermute/ui/ui_window.cpp b/engines/wintermute/ui/ui_window.cpp
index 0576f9464e4..c90ee41975d 100644
--- a/engines/wintermute/ui/ui_window.cpp
+++ b/engines/wintermute/ui/ui_window.cpp
@@ -664,7 +664,7 @@ bool UIWindow::saveAsText(BaseDynamicBuffer *buffer, int indent) {
buffer->putTextIndent(indent + 2, "TITLE_ALIGN=\"%s\"\n", "center");
break;
default:
- error("UIWindow::SaveAsText - Unhandled enum-value NUM_TEXT_ALIGN");
+ break;
}
if (!BasePlatform::isRectEmpty(&_titleRect)) {
More information about the Scummvm-git-logs
mailing list