[Scummvm-git-logs] scummvm master -> 2e71b64ad790f909c65cea9158fa747dffa11a88

digitall noreply at scummvm.org
Sun Oct 27 17:53:36 UTC 2024 

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2e71b64ad7 QDENGINE: Fix Signed vs. Unsigned GCC Compiler Warnings


Commit: 2e71b64ad790f909c65cea9158fa747dffa11a88
    https://github.com/scummvm/scummvm/commit/2e71b64ad790f909c65cea9158fa747dffa11a88
Author: D G Turner (digitall at scummvm.org)
Date: 2024-10-27T17:53:00Z

Commit Message:
QDENGINE: Fix Signed vs. Unsigned GCC Compiler Warnings

Changed paths:
    engines/qdengine/minigames/adv/EventManager.cpp
    engines/qdengine/minigames/adv/ObjectContainer.cpp
    engines/qdengine/minigames/adv/RunTime.cpp
    engines/qdengine/minigames/adv/TextManager.cpp
    engines/qdengine/minigames/adv/m_triangles.cpp
    engines/qdengine/qdcore/qd_screen_text_set.cpp
    engines/qdengine/system/graphics/gr_tile_animation.cpp


diff --git a/engines/qdengine/minigames/adv/EventManager.cpp b/engines/qdengine/minigames/adv/EventManager.cpp
index fb6e7dbdf4d..bf57d7eb731 100644
--- a/engines/qdengine/minigames/adv/EventManager.cpp
+++ b/engines/qdengine/minigames/adv/EventManager.cpp
@@ -114,13 +114,13 @@ void EventManager::event(int eventID, const mgVect2f& pos, int factor) {
 
 	eventID += SYSTEM_EVENTS_SIZE;
 
-	if (eventID >= _eventPresets.size())
+	if (eventID >= (int)_eventPresets.size())
 		return;
 
 	const EventPreset& pr = _eventPresets[eventID];
 
 	if (pr.triggerEventID >= 0) {
-		assert(pr.triggerEventID < _triggerEvents.size());
+		assert(pr.triggerEventID < (int)_triggerEvents.size());
 		_triggerEvents[pr.triggerEventID]->set_state("on");
 	}
 
diff --git a/engines/qdengine/minigames/adv/ObjectContainer.cpp b/engines/qdengine/minigames/adv/ObjectContainer.cpp
index 9a3f05ca9a1..0eae062118a 100644
--- a/engines/qdengine/minigames/adv/ObjectContainer.cpp
+++ b/engines/qdengine/minigames/adv/ObjectContainer.cpp
@@ -90,7 +90,7 @@ void ObjectContainer::hideAll() {
 }
 
 QDObject ObjectContainer::getObject() {
-	if (_current < _objects.size())
+	if (_current < (int)_objects.size())
 		return _objects[_current++];
 
 	return _objects[0]; // bad, but better than crashing
diff --git a/engines/qdengine/minigames/adv/RunTime.cpp b/engines/qdengine/minigames/adv/RunTime.cpp
index 65503d46865..942d317185a 100644
--- a/engines/qdengine/minigames/adv/RunTime.cpp
+++ b/engines/qdengine/minigames/adv/RunTime.cpp
@@ -873,7 +873,7 @@ int MinigameManager::rnd(const Std::vector<float> &prob) const {
 		if (rnd <= accum)
 			break;
 	}
-	assert(idx >= 0 && idx < prob.size());
+	assert(idx >= 0 && idx < (int)prob.size());
 #ifdef _DEBUG
 	float sum = 0.f;
 
diff --git a/engines/qdengine/minigames/adv/TextManager.cpp b/engines/qdengine/minigames/adv/TextManager.cpp
index 5c67bec7495..aee0c170cfc 100644
--- a/engines/qdengine/minigames/adv/TextManager.cpp
+++ b/engines/qdengine/minigames/adv/TextManager.cpp
@@ -155,7 +155,7 @@ TextManager::~TextManager() {
 }
 
 int TextManager::createStaticText(const mgVect3f& pos, int fontID, TextAlign align) {
-	assert(fontID >= 0 && fontID < _fonts.size());
+	assert(fontID >= 0 && fontID < (int)_fonts.size());
 
 	StaticMessage msg(&_fonts[fontID]);
 
@@ -168,14 +168,14 @@ int TextManager::createStaticText(const mgVect3f& pos, int fontID, TextAlign ali
 }
 
 void TextManager::updateStaticText(int textID, const char* txt) {
-	assert(textID >= 0 && textID < _staticMsgs.size());
+	assert(textID >= 0 && textID < (int)_staticMsgs.size());
 
 	_staticMsgs[textID].setText(txt);
 }
 
 void TextManager::showText(const char* txt, const mgVect2f& pos, int fontID, int escapeID) {
-	assert(fontID >= 0 && fontID < _fonts.size());
-	assert(escapeID >= 0 && escapeID < _escapes.size());
+	assert(fontID >= 0 && fontID < (int)_fonts.size());
+	assert(escapeID >= 0 && escapeID < (int)_escapes.size());
 
 	Escape& es = _escapes[escapeID];
 
@@ -199,8 +199,8 @@ void TextManager::showText(const char* txt, const mgVect2f& pos, int fontID, int
 }
 
 void TextManager::showNumber(int num, const mgVect2f& pos, int fontID, int escapeID) {
-	assert(fontID >= 0 && fontID < _fonts.size());
-	assert(escapeID >= 0 && escapeID < _escapes.size());
+	assert(fontID >= 0 && fontID < (int)_fonts.size());
+	assert(escapeID >= 0 && escapeID < (int)_escapes.size());
 
 	char buf[16];
 	buf[15] = 0;
@@ -245,10 +245,10 @@ void TextManager::StaticMessage::setText(const char* str) {
 
 	int len = (int)strlen(str);
 
-	if (_objects.size() < len)
+	if ((int)_objects.size() < len)
 		_objects.resize(len);
 	else
-		while (_objects.size() > len) {
+		while ((int)_objects.size() > len) {
 			if (_objects.back())
 				_font->pool.releaseObject(_objects.back());
 			_objects.pop_back();
diff --git a/engines/qdengine/minigames/adv/m_triangles.cpp b/engines/qdengine/minigames/adv/m_triangles.cpp
index a830fe57f9c..4afa629fabb 100644
--- a/engines/qdengine/minigames/adv/m_triangles.cpp
+++ b/engines/qdengine/minigames/adv/m_triangles.cpp
@@ -191,7 +191,7 @@ const char *MinigameTriangle::Node::getFaceStateName(int angle, bool selected, b
 	assert(!selected || !animated); // анимированные выделенными быть не могут
 
 	static const char *angleNames[3] = {"0", "120", "240"};
-	assert(angle >= 0 && angle < sizeof(angleNames) / sizeof(angleNames[0]));
+	assert(angle >= 0 && angle < ARRAYSIZE(angleNames));
 
 	Common::String out;
 
@@ -614,7 +614,7 @@ int MinigameTriangle::destination(int num1, int num2) const {
 }
 
 mgVect3f MinigameTriangle::slotCoord(int pos, int angle) const {
-	assert(pos * 3 + angle < positions_.size());
+	assert(pos * 3 + angle < (int)positions_.size());
 	return positions_[pos * 3 + angle];
 }
 
diff --git a/engines/qdengine/qdcore/qd_screen_text_set.cpp b/engines/qdengine/qdcore/qd_screen_text_set.cpp
index 7c3819cd155..2c38c93040a 100644
--- a/engines/qdengine/qdcore/qd_screen_text_set.cpp
+++ b/engines/qdengine/qdcore/qd_screen_text_set.cpp
@@ -149,7 +149,7 @@ void qdScreenTextSet::clear_texts(qdNamedObject *owner) {
 	// Equivalent of
 	// texts_container_t::iterator it = std::remove_if(_texts.begin(), _texts.end(), std::bind2nd(std::mem_fun_ref(&qdScreenText::is_owned_by), owner));
 
-	for (int i = 0; i < _texts.size();) {
+	for (int i = 0; i < (int)_texts.size();) {
 		if (_texts[i].is_owned_by(owner)) {
 			_texts.remove_at(i);
 
diff --git a/engines/qdengine/system/graphics/gr_tile_animation.cpp b/engines/qdengine/system/graphics/gr_tile_animation.cpp
index ac109e4dbe8..d605762c52a 100644
--- a/engines/qdengine/system/graphics/gr_tile_animation.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_animation.cpp
@@ -111,7 +111,7 @@ bool grTileAnimation::compress(grTileCompressionMethod method) {
 		uint32 offs = tile_offsets.back();
 		uint32 sz = grTileSprite::compress(data, &*tile_vector.begin(), method);
 
-		for (int j = 0; j < sz; j++)
+		for (uint32 j = 0; j < sz; j++)
 			tile_data.push_back(tile_vector[j]);
 
 		tile_offsets.push_back(offs + sz);

More information about the Scummvm-git-logs mailing list