[Scummvm-git-logs] scummvm master -> 9b8fff5e542297be8a5af7796c2bf6337f6f8671

digitall noreply at scummvm.org
Wed Nov 27 01:23:42 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:
9b8fff5e54 QDENGINE: Fix Various GCC Compiler Warnings


Commit: 9b8fff5e542297be8a5af7796c2bf6337f6f8671
    https://github.com/scummvm/scummvm/commit/9b8fff5e542297be8a5af7796c2bf6337f6f8671
Author: D G Turner (digitall at scummvm.org)
Date: 2024-11-27T01:22:36Z

Commit Message:
QDENGINE: Fix Various GCC Compiler Warnings

Most of these were signed vs. unsigned comparison, but some unused
variable warnings from WIP code.

Changed paths:
    engines/qdengine/minigames/adv/m_puzzle.cpp
    engines/qdengine/minigames/adv/m_scores.cpp
    engines/qdengine/minigames/adv/m_swap.cpp


diff --git a/engines/qdengine/minigames/adv/m_puzzle.cpp b/engines/qdengine/minigames/adv/m_puzzle.cpp
index 241c042e099..f2b3843a39a 100644
--- a/engines/qdengine/minigames/adv/m_puzzle.cpp
+++ b/engines/qdengine/minigames/adv/m_puzzle.cpp
@@ -94,14 +94,14 @@ Puzzle::Puzzle() {
 	assert(flySpeed_ > 0.f);
 	returnSpeed_ = getParameter("inventory_return_speed", -1.f);
 
+	warning("STUB: Puzzle::Puzzle()");
+
+#if 0
 	const char *name_begin = g_runtime->parameter("obj_name_begin", "obj_");
 
 	char buf[128];
 	buf[127] = 0;
 
-	warning("STUB: Puzzle::Puzzle()");
-
-#if 0
 	XBuffer gameData;
 	for (int idx = 0; idx < gameSize_; ++idx) {
 		snprintf(buf, 127, "%s%02d", name_begin, idx + 1);
@@ -162,7 +162,7 @@ Puzzle::~Puzzle() {
 }
 
 void Puzzle::rotate(int item) {
-	assert(item >= 0 && item < nodes_.size());
+	assert(item >= 0 && item < (int)nodes_.size());
 	nodes_[item].angle = (nodes_[item].angle + 1) % angles_;
 }
 
@@ -171,7 +171,7 @@ int Puzzle::stidx(int idx) const {
 }
 
 bool Puzzle::testPlace(int item) const {
-	assert(item >= 0 && item < nodes_.size());
+	assert(item >= 0 && item < (int)nodes_.size());
 	return nodes_[item].pos == item && nodes_[item].angle == 0;
 }
 
@@ -191,7 +191,7 @@ bool Puzzle::isOnMouse(const Node& node) const {
 
 void Puzzle::put(int where, int what, float flowSpeed) {
 	assert(where < (int)field_.size());
-	assert(what >= 0 && what < nodes_.size());
+	assert(what >= 0 && what < (int)nodes_.size());
 
 	Node& node = nodes_[what];
 	int start = node.pos;
@@ -266,8 +266,8 @@ void Puzzle::quant(float dt) {
 		else
 			fit = flyObjs_.erase(fit);
 
-	if (inField_ < nodes_.size() && g_runtime->getTime() > nextObjTime_ &&
-			(stack_.size() < stackSize_ - 1 || (stack_.size() < stackSize_ && pickedItem_ == -1))) { // нужно добавить в инвентори фишку
+	if (inField_ < (int)nodes_.size() && g_runtime->getTime() > nextObjTime_ &&
+			((int)stack_.size() < stackSize_ - 1 || ((int)stack_.size() < stackSize_ && pickedItem_ == -1))) { // нужно добавить в инвентори фишку
 		// ищем случайный не выставленный фрагмент
 		int freeIdx = round(g_runtime->rnd(0.f, nodes_.size() - 1));
 		Nodes::iterator it = nodes_.begin();
@@ -292,7 +292,7 @@ void Puzzle::quant(float dt) {
 	mgVect2f mouse = g_runtime->mousePosition();
 
 	int hovPlace = -1;  // Номер места которое сейчас под мышкой
-	for (int idx = 0; idx < stack_.size(); ++idx)
+	for (int idx = 0; idx < (int)stack_.size(); ++idx)
 		if (nodes_[stack_[idx]].obj.hit(mouse)) {
 			hovPlace = stidx(idx);
 			break;
@@ -360,7 +360,7 @@ void Puzzle::quant(float dt) {
 		} else if (hovPlace < -1) { // клик по стеку
 			int hovStack = stidx(hovPlace);
 			if (pickedItem_ == -1) // на мыши ничего нет
-				if (hovStack < stack_.size()) { // взять фрагмент из стека на мышь
+				if (hovStack < (int)stack_.size()) { // взять фрагмент из стека на мышь
 					g_runtime->event(EVENT_GET, mouse);
 					Indexes::iterator it = stack_.begin() + hovStack;
 					assert(*it >= 0);
@@ -368,7 +368,7 @@ void Puzzle::quant(float dt) {
 					pickedItem_ = *it;
 					nodes_[pickedItem_].pos = mouseObjPose_;
 					stack_.erase(it);
-					for (int idx = hovStack; idx < stack_.size(); ++idx)
+					for (int idx = hovStack; idx < (int)stack_.size(); ++idx)
 						put(stidx(idx), stack_[idx], flySpeed_);
 				} else // пустой клик в области стека
 					g_runtime->event(EVENT_CLICK, mouse);
@@ -394,7 +394,7 @@ void Puzzle::quant(float dt) {
 				}
 			} else  if (hovPlace < -1) { // клик по стеку
 				int hovStack = stidx(hovPlace);
-				if (hovStack < stack_.size()) { // покрутить внутри стека
+				if (hovStack < (int)stack_.size()) { // покрутить внутри стека
 					g_runtime->event(EVENT_ROTATE_IN_STACK, mouse);
 					rotate(stack_[hovStack]);
 				} else // попытка прокрутить пустое место
@@ -406,7 +406,7 @@ void Puzzle::quant(float dt) {
 	}
 
 	bool iWin = true;
-	for (int idx = 0; idx < nodes_.size(); ++idx) {
+	for (int idx = 0; idx < (int)nodes_.size(); ++idx) {
 		Node& node = nodes_[idx];
 		if (node.pos != -1) {
 			if (node.pos >= 0) {
@@ -437,7 +437,7 @@ void Puzzle::quant(float dt) {
 }
 
 const mgVect3f &Puzzle::position(int num) const {
-	assert(num >= 0 && num < positions_.size());
+	assert(num >= 0 && num < (int)positions_.size());
 	// Если глобальный поворот ненулевой, пересчитываем индекс
 	if (globalAngle_ > 0) {
 		int size = sqrt((float)gameSize_);
@@ -451,7 +451,7 @@ const mgVect3f &Puzzle::position(int num) const {
 		}
 		num = y * (size + 1) + x;
 	}
-	assert(num >= 0 && num < positions_.size());
+	assert(num >= 0 && num < (int)positions_.size());
 	return positions_[num];
 }
 
diff --git a/engines/qdengine/minigames/adv/m_scores.cpp b/engines/qdengine/minigames/adv/m_scores.cpp
index ac497c7d33d..ced5b99bfed 100644
--- a/engines/qdengine/minigames/adv/m_scores.cpp
+++ b/engines/qdengine/minigames/adv/m_scores.cpp
@@ -133,7 +133,7 @@ Scores::Scores() {
 
 	outMaxLevel_ = g_runtime->getObject(g_runtime->parameter("for_game_level"));
 	if (outMaxLevel_) {
-		int level = 0;
+		uint level = 0;
 		for (; level < levels_.size(); ++level)
 			if (levels_[level].data.size() < levels_[level].games.size())
 				break;
@@ -157,7 +157,7 @@ Scores::~Scores() {
 }
 
 void Scores::quant(float dt) {
-	assert(level_ >= 0 && level_ < levels_.size());
+	assert(level_ >= 0 && level_ < (int)levels_.size());
 	const Level& lvl = levels_[level_];
 
 	if (level_ != preLevel_) {
@@ -166,19 +166,19 @@ void Scores::quant(float dt) {
 
 		g_runtime->setText(currentLevel_, lvl.level);
 
-		for (int idx = 0; idx < games_.size(); ++idx)
+		for (int idx = 0; idx < (int)games_.size(); ++idx)
 			g_runtime->hide(games_[idx]);
 
-		for (int idx = 0; idx < games_.size(); ++idx) {
-			if (idx < lvl.data.size()) {
+		for (int idx = 0; idx < (int)games_.size(); ++idx) {
+			if (idx < (int)lvl.data.size()) {
 				const GameData& data = lvl.data[idx];
 				int gameId = data.num;
 				int gameNum;
-				for (gameNum = 0; gameNum < lvl.games.size(); ++gameNum)
+				for (gameNum = 0; gameNum < (int)lvl.games.size(); ++gameNum)
 					if (gameId == lvl.games[gameNum])
 						break;
-				assert(gameNum < lvl.games.size());
-				assert(gameNum < games_.size());
+				assert(gameNum < (int)lvl.games.size());
+				assert(gameNum < (int)games_.size());
 				games_[gameNum].setState(Common::String::format("%d", level_).c_str());
 				games_[gameNum]->set_R(positions_[idx]);
 				g_runtime->setText(getName(bestScore_, idx), data.info._bestScore);
@@ -195,7 +195,7 @@ void Scores::quant(float dt) {
 	}
 
 	if (g_runtime->mouseLeftPressed()) {
-		if (level_ < levels_.size() - 1 && lvl.data.size() == lvl.games.size() && next_.hit(g_runtime->mousePosition()))
+		if (level_ < (int)levels_.size() - 1 && lvl.data.size() == lvl.games.size() && next_.hit(g_runtime->mousePosition()))
 			++level_;
 		else if (level_ > 0 && prev_.hit(g_runtime->mousePosition()))
 			--level_;
diff --git a/engines/qdengine/minigames/adv/m_swap.cpp b/engines/qdengine/minigames/adv/m_swap.cpp
index f776724b413..b55fbb289f8 100644
--- a/engines/qdengine/minigames/adv/m_swap.cpp
+++ b/engines/qdengine/minigames/adv/m_swap.cpp
@@ -71,7 +71,7 @@ Swap::Swap(MinigameManager *runtime) {
 		return;
 	nextRotateTime_ = _runtime->getTime() + rotateTimePeriod_;
 
-	const char *name_begin = _runtime->parameter("obj_name_begin", "obj_");
+	/*const char *name_begin = */_runtime->parameter("obj_name_begin", "obj_");
 
 	warning("STUB: Swap::Swap()");
 #if 0
@@ -201,19 +201,19 @@ void Swap::quant(float dt) {
 		if (!testPlace(idx))
 			break;
 
-	if (idx == nodes_.size()) {
+	if (idx == (int)nodes_.size()) {
 		deactivate();
 		setState(MinigameInterface::GAME_WIN);
 	}
 }
 
 const mgVect3f &Swap::position(int num) const {
-	assert(num >= 0 && num < positions_.size());
+	assert(num >= 0 && num < (int)positions_.size());
 	return positions_[num];
 }
 
 void Swap::put(int item, bool hl) {
-	assert(item >= 0 && item < nodes_.size());
+	assert(item >= 0 && item < (int)nodes_.size());
 	nodes_[item].obj->set_R(position(item));
 	nodes_[item].obj.setState(getStateName(nodes_[item].angle, hl));
 
@@ -230,13 +230,13 @@ void Swap::deactivate() {
 }
 
 bool Swap::testPlace(int item) const {
-	assert(item >= 0 && item < nodes_.size());
+	assert(item >= 0 && item < (int)nodes_.size());
 	return nodes_[item].home == item && nodes_[item].angle == 0;
 }
 
 void Swap::swap(int item1, int item2, bool silent) {
-	assert(item1 >= 0 && item1 < nodes_.size());
-	assert(item2 >= 0 && item2 < nodes_.size());
+	assert(item1 >= 0 && item1 < (int)nodes_.size());
+	assert(item2 >= 0 && item2 < (int)nodes_.size());
 
 	bool res = false;
 	if (!silent) {
@@ -269,8 +269,8 @@ void Swap::swap(int item1, int item2, bool silent) {
 }
 
 void Swap::rotate(int item1, int item2, bool silent, bool avto) {
-	assert(item1 >= 0 && item1 < nodes_.size());
-	assert(item2 >= 0 && item2 < nodes_.size());
+	assert(item1 >= 0 && item1 < (int)nodes_.size());
+	assert(item2 >= 0 && item2 < (int)nodes_.size());
 
 	if (!silent) {
 		if (testPlace(item1)) // сняли со своего места

More information about the Scummvm-git-logs mailing list