[Scummvm-git-logs] scummvm master -> aa3f390ae415d5eacc09fa5a88fc3105c67f2ef3

[sev-]

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

Summary:
4d791fbb5d QDENGINE: Fix signedness in comparison
aa3f390ae4 QDENGINE: Remove unused function


Commit: 4d791fbb5d5fa96952c8fb5861a3d64cb6ac2d15
    https://github.com/scummvm/scummvm/commit/4d791fbb5d5fa96952c8fb5861a3d64cb6ac2d15
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-23T16:13:16+02:00

Commit Message:
QDENGINE: Fix signedness in comparison

Changed paths:
    engines/qdengine/qdcore/qd_condition.h
    engines/qdengine/qdcore/qd_inventory.h


diff --git a/engines/qdengine/qdcore/qd_condition.h b/engines/qdengine/qdcore/qd_condition.h
index 7a1a118ac16..1674b17e409 100644
--- a/engines/qdengine/qdcore/qd_condition.h
+++ b/engines/qdengine/qdcore/qd_condition.h
@@ -581,7 +581,7 @@ private:
 	static bool _successful_object_click;
 
 	bool init_data(int data_index, qdConditionData::data_t data_type, int data_size = 0) {
-		assert(data_index >= 0 && data_index < _data.size());
+		assert(data_index >= 0 && data_index < (int)_data.size());
 
 		_data[data_index].set_type(data_type);
 		if (data_size)
diff --git a/engines/qdengine/qdcore/qd_inventory.h b/engines/qdengine/qdcore/qd_inventory.h
index 72a3d39f67b..702d3671968 100644
--- a/engines/qdengine/qdcore/qd_inventory.h
+++ b/engines/qdengine/qdcore/qd_inventory.h
@@ -71,15 +71,15 @@ public:
 	}
 
 	void set_cells_pos(int set_id, const Vect2s &pos) {
-		if (set_id >= 0 && set_id < _cell_sets.size())
+		if (set_id >= 0 && set_id < (int)_cell_sets.size())
 			_cell_sets[set_id].set_screen_pos(pos);
 	}
 	void set_cells_type(int set_id, const qdInventoryCellType &tp) {
-		if (set_id >= 0 && set_id < _cell_sets.size())
+		if (set_id >= 0 && set_id < (int)_cell_sets.size())
 			_cell_sets[set_id].set_cell_type(tp);
 	}
 	void set_cells_size(int set_id, const Vect2s &sz) {
-		if (set_id >= 0 && set_id < _cell_sets.size())
+		if (set_id >= 0 && set_id < (int)_cell_sets.size())
 			_cell_sets[set_id].set_size(sz);
 	}
 


Commit: aa3f390ae415d5eacc09fa5a88fc3105c67f2ef3
    https://github.com/scummvm/scummvm/commit/aa3f390ae415d5eacc09fa5a88fc3105c67f2ef3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-23T16:13:52+02:00

Commit Message:
QDENGINE: Remove unused function

Changed paths:
    engines/qdengine/qdcore/qd_game_dispatcher.cpp


diff --git a/engines/qdengine/qdcore/qd_game_dispatcher.cpp b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
index 544b947cfda..ae477d6d601 100644
--- a/engines/qdengine/qdcore/qd_game_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_game_dispatcher.cpp
@@ -2947,12 +2947,6 @@ bool qdGameDispatcher::is_counter_in_list(qdCounter *p) {
 	return _counters.is_in_list(p);
 }
 
-static Common::String change_ext(const char *file_name, const char *new_ext) {
-	Common::String fpath(file_name);
-	Common::replace(fpath, ".tga", new_ext);
-	return fpath;
-}
-
 bool qdGameDispatcher::start_intro_videos() {
 	for (auto &it : video_list()) {
 		if (it->is_intro_movie()) {