[Scummvm-git-logs] scummvm master -> 8ded3dc2c942e44cb6245bb9e8430cd95ce7367a

sev- noreply at scummvm.org
Fri Aug 23 14:52:51 UTC 2024 

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

Summary:
9964cb8cf8 QDENGINE: Fix signedness warnings
ce7dd31f83 QDENGINE: Fixed another case of bad Python-like indentation
8ded3dc2c9 QDENGINE: Fix more signedness warnings


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

Commit Message:
QDENGINE: Fix signedness warnings

Changed paths:
    engines/qdengine/qdcore/qd_animation.cpp
    engines/qdengine/qdcore/qd_animation_set.cpp
    engines/qdengine/qdcore/qd_condition.cpp
    engines/qdengine/qdcore/qd_conditional_object.cpp
    engines/qdengine/qdcore/qd_coords_animation.cpp
    engines/qdengine/qdcore/qd_counter.cpp
    engines/qdengine/qdcore/qd_game_object_animated.cpp
    engines/qdengine/qdcore/qd_game_object_moving.cpp
    engines/qdengine/qdcore/qd_game_object_state.cpp
    engines/qdengine/qdcore/qd_interface_button.cpp
    engines/qdengine/qdcore/qd_interface_button.h
    engines/qdengine/system/graphics/gr_tile_sprite.cpp
    engines/qdengine/system/graphics/rle_compress.cpp


diff --git a/engines/qdengine/qdcore/qd_animation.cpp b/engines/qdengine/qdcore/qd_animation.cpp
index f9370b05294..31fe59c89a6 100644
--- a/engines/qdengine/qdcore/qd_animation.cpp
+++ b/engines/qdengine/qdcore/qd_animation.cpp
@@ -1029,7 +1029,7 @@ bool qdAnimation::create_scaled_frames() {
 		delete *it;
 	_scaled_frames.clear();
 
-	for (int i = 0; i < _scales.size(); i++) {
+	for (uint i = 0; i < _scales.size(); i++) {
 		for (qdAnimationFrameList::iterator it = _frames.begin(); it != _frames.end(); ++it) {
 			_scaled_frames.push_back((*it)->clone());
 			_scaled_frames.back()->scale(_scales[i], _scales[i]);
@@ -1045,7 +1045,7 @@ int qdAnimation::get_scale_index(float &scale_value) const {
 
 	const Std::vector<float> &scales_vect = (check_flag(QD_ANIMATION_FLAG_REFERENCE) && _parent) ? _parent->_scales : _scales;
 
-	for (int i = 0; i < scales_vect.size(); i++) {
+	for (uint i = 0; i < scales_vect.size(); i++) {
 		if (fabs(scale_value - scl) > fabs(scale_value - scales_vect[i])) {
 			scl = scales_vect[i];
 			index = i;
diff --git a/engines/qdengine/qdcore/qd_animation_set.cpp b/engines/qdengine/qdcore/qd_animation_set.cpp
index 10a215d85fe..bb901e916c2 100644
--- a/engines/qdengine/qdcore/qd_animation_set.cpp
+++ b/engines/qdengine/qdcore/qd_animation_set.cpp
@@ -253,7 +253,7 @@ bool qdAnimationSet::save_script(Common::WriteStream &fh, int indent) const {
 		}
 
 		fh.writeString(Common::String::format("<walk_sound_frequency>%u", _walk_sound_frequency.size()));
-		for (int i = 0; i < _walk_sound_frequency.size(); i++) {
+		for (uint i = 0; i < _walk_sound_frequency.size(); i++) {
 			fh.writeString(Common::String::format(" %f", _walk_sound_frequency[i]));
 		}
 
@@ -429,7 +429,7 @@ float qdAnimationSet::adjust_angle(float angle) const {
 }
 
 float qdAnimationSet::walk_sound_frequency(int direction_index) const {
-	if (direction_index < 0 || direction_index >= _walk_sound_frequency.size())
+	if (direction_index < 0 || direction_index >= (int)_walk_sound_frequency.size())
 		return 1;
 	else
 		return _walk_sound_frequency[direction_index];
@@ -443,7 +443,7 @@ float qdAnimationSet::walk_sound_frequency(float direction_angle) const {
 void qdAnimationSet::set_walk_sound_frequency(int direction_index, float freq) {
 	assert(direction_index >= 0);
 
-	if (direction_index >= _walk_sound_frequency.size())
+	if (direction_index >= (int)_walk_sound_frequency.size())
 		_walk_sound_frequency.resize(direction_index + 1, 1);
 
 	_walk_sound_frequency[direction_index] = freq;
diff --git a/engines/qdengine/qdcore/qd_condition.cpp b/engines/qdengine/qdcore/qd_condition.cpp
index 2dd19f3b33c..cece5b3c961 100644
--- a/engines/qdengine/qdcore/qd_condition.cpp
+++ b/engines/qdengine/qdcore/qd_condition.cpp
@@ -272,22 +272,22 @@ void qdCondition::set_type(ConditionType tp) {
 }
 
 bool qdCondition::put_value(int idx, const char *str) {
-	assert(idx >= 0 && idx < _data.size());
+	assert(idx >= 0 && idx < (int)_data.size());
 	return _data[idx].put_string(str);
 }
 
 bool qdCondition::put_value(int idx, int val, int val_index) {
-	assert(idx >= 0 && idx < _data.size());
+	assert(idx >= 0 && idx < (int)_data.size());
 	return _data[idx].put_int(val, val_index);
 }
 
 bool qdCondition::put_value(int idx, float val, int val_index) {
-	assert(idx >= 0 && idx < _data.size());
+	assert(idx >= 0 && idx < (int)_data.size());
 	return _data[idx].put_float(val, val_index);
 }
 
 bool qdCondition::get_value(int idx, const char *&str) const {
-	assert(idx >= 0 && idx < _data.size());
+	assert(idx >= 0 && idx < (int)_data.size());
 
 	if (_data[idx].get_string()) {
 		str = _data[idx].get_string();
@@ -298,14 +298,14 @@ bool qdCondition::get_value(int idx, const char *&str) const {
 }
 
 bool qdCondition::get_value(int idx, int &val, int val_index) const {
-	assert(idx >= 0 && idx < _data.size());
+	assert(idx >= 0 && idx < (int)_data.size());
 	val = _data[idx].get_int(val_index);
 
 	return true;
 }
 
 bool qdCondition::get_value(int idx, float &val, int val_index) const {
-	assert(idx >= 0 && idx < _data.size());
+	assert(idx >= 0 && idx < (int)_data.size());
 	val = _data[idx].get_float(val_index);
 
 	return true;
@@ -318,7 +318,7 @@ bool qdCondition::load_script(const xml::tag *p) {
 		case QDSCR_CONDITION_DATA_INT:
 		case QDSCR_CONDITION_DATA_FLOAT:
 		case QDSCR_CONDITION_DATA_STRING:
-			if (data_idx < _data.size())
+			if (data_idx < (int)_data.size())
 				_data[data_idx++].load_script(&*it);
 			break;
 		case QDSCR_CONDITION_INVERSE:
@@ -331,7 +331,7 @@ bool qdCondition::load_script(const xml::tag *p) {
 			if (const xml::tag *tp = it->search_subtag(QDSCR_ID)) {
 				int object_idx = xml::tag_buffer(*tp).get_int();
 
-				if (object_idx >= 0 && object_idx < _objects.size())
+				if (object_idx >= 0 && object_idx < (int)_objects.size())
 					_objects[object_idx].load_script(&*it);
 			}
 			break;
@@ -357,7 +357,7 @@ bool qdCondition::save_script(Common::WriteStream &fh, int indent) const {
 		it.save_script(fh, indent + 1);
 	}
 
-	for (int i = 0; i < _objects.size(); i++) {
+	for (uint i = 0; i < _objects.size(); i++) {
 		if (_objects[i].object())
 			_objects[i].save_script(fh, indent + 1, i);
 	}
@@ -457,13 +457,13 @@ bool qdCondition::check() {
 }
 
 bool qdCondition::put_object(int idx, qdNamedObject *obj) {
-	assert(idx >= 0 && idx < _objects.size());
+	assert(idx >= 0 && idx < (int)_objects.size());
 	_objects[idx].set_object(obj);
 	return true;
 }
 
 const qdNamedObject *qdCondition::get_object(int idx) {
-	if (idx >= 0 && idx < _objects.size()) {
+	if (idx >= 0 && idx < (int)_objects.size()) {
 		if (!_objects[idx].object())
 			_objects[idx].find_object();
 
diff --git a/engines/qdengine/qdcore/qd_conditional_object.cpp b/engines/qdengine/qdcore/qd_conditional_object.cpp
index d3baaec1b8f..bbff8628709 100644
--- a/engines/qdengine/qdcore/qd_conditional_object.cpp
+++ b/engines/qdengine/qdcore/qd_conditional_object.cpp
@@ -64,7 +64,7 @@ int qdConditionalObject::add_condition(const qdCondition *p) {
 }
 
 bool qdConditionalObject::update_condition(int num, const qdCondition &p) {
-	assert(num >= 0 && num < _conditions.size());
+	assert(num >= 0 && num < (int)_conditions.size());
 
 	qdCondition &cond = _conditions[num];
 	cond = p;
@@ -109,7 +109,7 @@ bool qdConditionalObject::check_conditions() {
 }
 
 bool qdConditionalObject::remove_conditon(int idx) {
-	assert(idx >= 0 && idx < _conditions.size());
+	assert(idx >= 0 && idx < (int)_conditions.size());
 
 	_conditions.erase(_conditions.begin() + idx);
 
@@ -163,7 +163,7 @@ bool qdConditionalObject::load_conditions_script(const xml::tag *p) {
 		}
 	}
 
-	for (int i = 0; i < _conditions.size(); i++) {
+	for (uint i = 0; i < _conditions.size(); i++) {
 		if (is_condition_in_group(i))
 			_conditions[i].add_group_reference();
 	}
@@ -256,7 +256,7 @@ int qdConditionalObject::add_condition_group(const qdConditionGroup *p) {
 }
 
 bool qdConditionalObject::update_condition_group(int num, const qdConditionGroup &p) {
-	assert(num >= 0 && num < _condition_groups.size());
+	assert(num >= 0 && num < (int)_condition_groups.size());
 
 	qdConditionGroup &gr = _condition_groups[num];
 	gr = p;
@@ -272,11 +272,11 @@ bool qdConditionalObject::update_condition_group(int num, const qdConditionGroup
 }
 
 bool qdConditionalObject::remove_conditon_group(int idx) {
-	assert(idx >= 0 && idx < _condition_groups.size());
+	assert(idx >= 0 && idx < (int)_condition_groups.size());
 
 	_condition_groups.erase(_condition_groups.begin() + idx);
 
-	for (int i = 0; i < _conditions.size(); i++) {
+	for (uint i = 0; i < _conditions.size(); i++) {
 		if (is_condition_in_group(i))
 			_conditions[i].add_group_reference();
 		else
@@ -290,7 +290,7 @@ bool qdConditionalObject::remove_conditon_group(int idx) {
 bool qdConditionalObject::init() {
 	bool result = true;
 
-	for (int i = 0; i < _conditions.size(); i++) {
+	for (uint i = 0; i < _conditions.size(); i++) {
 		if (!_conditions[i].init())
 			result = false;
 	}
diff --git a/engines/qdengine/qdcore/qd_coords_animation.cpp b/engines/qdengine/qdcore/qd_coords_animation.cpp
index f577698c118..dc32c282d2c 100644
--- a/engines/qdengine/qdcore/qd_coords_animation.cpp
+++ b/engines/qdengine/qdcore/qd_coords_animation.cpp
@@ -98,11 +98,11 @@ void qdCoordsAnimation::insert_point(const qdCoordsAnimationPoint *p, int insert
 }
 
 void qdCoordsAnimation::remove_point(int num) {
-	assert(0 <= num && num < _points.size());
+	assert(0 <= num && num < (int)_points.size());
 
 	_points.erase(_points.begin() + num);
 
-	if (_cur_point >= _points.size())
+	if (_cur_point >= (int)_points.size())
 		_cur_point = _points.size() - 1;
 
 	calc_paths();
@@ -174,7 +174,7 @@ void qdCoordsAnimation::quant(float dt) const {
 	if (_type == CA_INTERPOLATE_COORDS) {
 		float path = _speed * dt;
 		while (_points[_cur_point].move(path)) {
-			if (++_cur_point >= _points.size()) {
+			if (++_cur_point >= (int)_points.size()) {
 				_is_finished = true;
 				if (!check_flag(QD_COORDS_ANM_LOOP_FLAG)) {
 					_cur_point --;
@@ -200,7 +200,7 @@ void qdCoordsAnimation::quant(float dt) const {
 			qdGameObjectMoving *p = static_cast<qdGameObjectMoving *>(obj);
 
 			if (p->is_in_position(_points[_cur_point].dest_pos() - _del)) {
-				if (++_cur_point >= _points.size()) {
+				if (++_cur_point >= (int)_points.size()) {
 					_is_finished = true;
 					if (!check_flag(QD_COORDS_ANM_LOOP_FLAG)) {
 						stop();
@@ -338,7 +338,7 @@ bool qdCoordsAnimation::set_cur_point(int point_num) const {
 		p->skip_movement();
 
 		for (int i = 0; i < point_num; i++) {
-			if (++_cur_point >= _points.size()) {
+			if (++_cur_point >= (int)_points.size()) {
 				if (!check_flag(QD_COORDS_ANM_LOOP_FLAG)) {
 					stop();
 					return false;
@@ -364,7 +364,7 @@ bool qdCoordsAnimation::set_cur_point(int point_num) const {
 		p->set_pos(cur_pos());
 
 		for (int i = 0; i < point_num; i++) {
-			if (++_cur_point >= _points.size()) {
+			if (++_cur_point >= (int)_points.size()) {
 				if (!check_flag(QD_COORDS_ANM_LOOP_FLAG)) {
 					stop();
 					if (p->named_object_type() == QD_NAMED_OBJECT_MOVING_OBJ)
@@ -430,7 +430,7 @@ bool qdCoordsAnimation::load_data(Common::SeekableReadStream &fh, int save_versi
 
 	_cur_point = fh.readSint32LE();
 	v = fh.readSint32LE();
-	if (_points.size() != v) return false;
+	if ((int)_points.size() != v) return false;
 
 	if (save_version >= 101) {
 		_del.x = fh.readFloatLE();
diff --git a/engines/qdengine/qdcore/qd_counter.cpp b/engines/qdengine/qdcore/qd_counter.cpp
index 668261c5ba7..1383d354560 100644
--- a/engines/qdengine/qdcore/qd_counter.cpp
+++ b/engines/qdengine/qdcore/qd_counter.cpp
@@ -176,7 +176,7 @@ bool qdCounter::remove_element(const qdGameObjectState *p) {
 }
 
 bool qdCounter::remove_element(int idx) {
-	assert(idx >= 0 && idx < _elements.size());
+	assert(idx >= 0 && idx < (int)_elements.size());
 
 	_elements.erase(_elements.begin() + idx);
 	return true;
@@ -275,7 +275,7 @@ bool qdCounter::load_data(Common::SeekableReadStream &fh, int save_version) {
 	_value = fh.readSint32LE();
 	sz = fh.readSint32LE();
 
-	if (sz != _elements.size())
+	if (sz != (int)_elements.size())
 		return false;
 
 	for (auto &it : _elements)
diff --git a/engines/qdengine/qdcore/qd_game_object_animated.cpp b/engines/qdengine/qdcore/qd_game_object_animated.cpp
index 3e049135884..f18d8155955 100644
--- a/engines/qdengine/qdcore/qd_game_object_animated.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_animated.cpp
@@ -1223,7 +1223,7 @@ void qdGameObjectAnimated::set_default_state() {
 }
 
 qdGameObjectState *qdGameObjectAnimated::get_default_state() {
-	for (int i = 0; i < _states.size(); i++) {
+	for (uint i = 0; i < _states.size(); i++) {
 		if (!_states[i]->is_in_triggers() && !_states[i]->check_flag(qdGameObjectState::QD_OBJ_STATE_FLAG_INVENTORY))
 			return _states[i];
 	}
@@ -1232,7 +1232,7 @@ qdGameObjectState *qdGameObjectAnimated::get_default_state() {
 }
 
 const qdGameObjectState *qdGameObjectAnimated::get_default_state() const {
-	for (int i = 0; i < _states.size(); i++) {
+	for (uint i = 0; i < _states.size(); i++) {
 		if (!_states[i]->is_in_triggers() && !_states[i]->check_flag(qdGameObjectState::QD_OBJ_STATE_FLAG_INVENTORY))
 			return _states[i];
 	}
@@ -1241,7 +1241,7 @@ const qdGameObjectState *qdGameObjectAnimated::get_default_state() const {
 }
 
 int qdGameObjectAnimated::get_state_index(const qdGameObjectState *p) const {
-	for (int i = 0; i < _states.size(); i++) {
+	for (uint i = 0; i < _states.size(); i++) {
 		if (_states[i] == p)
 			return i;
 	}
@@ -1255,7 +1255,7 @@ bool qdGameObjectAnimated::load_data(Common::SeekableReadStream &fh, int save_ve
 
 	_cur_state = fh.readSint32LE();
 
-	for (int i = 0; i < _states.size(); i++) {
+	for (uint i = 0; i < _states.size(); i++) {
 		if (!_states[i]->load_data(fh, save_version))
 			return false;
 	}
@@ -1296,7 +1296,7 @@ bool qdGameObjectAnimated::save_data(Common::WriteStream &fh) const {
 
 	fh.writeSint32LE(_cur_state);
 
-	for (int i = 0; i < _states.size(); i++) {
+	for (uint i = 0; i < _states.size(); i++) {
 		if (!_states[i]->save_data(fh))
 			return false;
 	}
@@ -1348,7 +1348,7 @@ bool qdGameObjectAnimated::is_state_waiting(const char *state_name) const {
 }
 
 bool qdGameObjectAnimated::was_state_active(const char *state_name) const {
-	for (int i = 0; i < _states.size(); i++) {
+	for (uint i = 0; i < _states.size(); i++) {
 		if (!strcmp(_states[i]->name(), state_name))
 			return _states[i]->check_flag(qdGameObjectState::QD_OBJ_STATE_FLAG_WAS_ACTIVATED);
 	}
@@ -1474,7 +1474,7 @@ bool qdGameObjectAnimated::init() {
 	_queued_state = NULL;
 	_last_inventory_state = NULL;
 
-	for (int i = 0; i < _states.size(); i++)
+	for (uint i = 0; i < _states.size(); i++)
 		_states[i]->init();
 
 	return true;
diff --git a/engines/qdengine/qdcore/qd_game_object_moving.cpp b/engines/qdengine/qdcore/qd_game_object_moving.cpp
index 7caa548a163..56780af4f9c 100644
--- a/engines/qdengine/qdcore/qd_game_object_moving.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_moving.cpp
@@ -353,7 +353,7 @@ void dump_vect(const V &vect) {
 	debugC(3, kDebugLog, "------------");
 	debugC(3, kDebugLog, "%u", vect.size());
 
-	for (int i = 0; i < vect.size(); i++) {
+	for (uint i = 0; i < vect.size(); i++) {
 		debugC(3, kDebugLog, "%d %d", (int)vect[i].x, (int)vect[i].y);
 	}
 
@@ -482,7 +482,7 @@ bool qdGameObjectMoving::find_path(const Vect3f target, bool lock_target) {
 		Std::vector<Vect3f> final_path;
 		finalize_path(R(), trg, path_vect, final_path);
 
-		for (int i = 0; i < final_path.size(); i++)
+		for (uint i = 0; i < final_path.size(); i++)
 			_path[i] = final_path[i];
 
 		idx = final_path.size();
@@ -1846,7 +1846,7 @@ bool qdGameObjectMoving::save_data(Common::WriteStream &fh) const {
 	fh.writeUint32LE(_follow_condition);
 
 	fh.writeUint32LE(_circuit_objs.size());
-	for (int i = 0; i < _circuit_objs.size(); i++) {
+	for (uint i = 0; i < _circuit_objs.size(); i++) {
 		qdNamedObjectReference circ_ref(_circuit_objs[i]);
 		circ_ref.save_data(fh);
 	}
@@ -2389,7 +2389,7 @@ void qdGameObjectMoving::finalize_path(const Vect3f &from, const Vect3f &to, con
 	qdCamera *cp = qdCamera::current_camera();
 
 	out_path.resize(path.size(), Vect3f(0, 0, 0));
-	for (int i = 0; i < path.size(); i++)
+	for (uint i = 0; i < path.size(); i++)
 		out_path[i] = cp->get_cell_coords(path[i].x, path[i].y);
 
 	Vect2f d = to - out_path.back();
diff --git a/engines/qdengine/qdcore/qd_game_object_state.cpp b/engines/qdengine/qdcore/qd_game_object_state.cpp
index 01086bb6b8f..2ab06efb15d 100644
--- a/engines/qdengine/qdcore/qd_game_object_state.cpp
+++ b/engines/qdengine/qdcore/qd_game_object_state.cpp
@@ -1119,7 +1119,7 @@ const Vect2i &qdGameObjectStateWalk::center_offset(int direction_index, OffsetTy
 		break;
 	}
 
-	if (direction_index < 0 || direction_index >= vect->size()) {
+	if (direction_index < 0 || direction_index >= (int)vect->size()) {
 		static Vect2i v(0, 0);
 		return v;
 	} else
@@ -1154,14 +1154,14 @@ void qdGameObjectStateWalk::set_center_offset(int direction_index, const Vect2i
 		break;
 	}
 
-	if (direction_index >= vect->size())
+	if (direction_index >= (int)vect->size())
 		vect->resize(direction_index + 1, Vect2i(0, 0));
 
 	(*vect)[direction_index] = offs;
 }
 
 float qdGameObjectStateWalk::walk_sound_frequency(int direction_index) const {
-	if (direction_index < 0 || direction_index >= _walk_sound_frequency.size())
+	if (direction_index < 0 || direction_index >= (int)_walk_sound_frequency.size())
 		return 1;
 	else
 		return _walk_sound_frequency[direction_index];
@@ -1178,7 +1178,7 @@ float qdGameObjectStateWalk::walk_sound_frequency(float direction_angle) const {
 void qdGameObjectStateWalk::set_walk_sound_frequency(int direction_index, float freq) {
 	assert(direction_index >= 0);
 
-	if (direction_index >= _walk_sound_frequency.size())
+	if (direction_index >= (int)_walk_sound_frequency.size())
 		_walk_sound_frequency.resize(direction_index + 1, 1);
 
 	_walk_sound_frequency[direction_index] = freq;
@@ -1276,7 +1276,7 @@ bool qdGameObjectStateWalk::save_script(Common::WriteStream &fh, int indent) con
 			fh.writeString("\t");
 		}
 		fh.writeString(Common::String::format("<center_offsets>%u", _center_offsets.size() * 2));
-		for (int i = 0; i < _center_offsets.size(); i++) {
+		for (uint i = 0; i < _center_offsets.size(); i++) {
 			fh.writeString(Common::String::format(" %d %d", _center_offsets[i].x, _center_offsets[i].y));
 		}
 		fh.writeString("</center_offsets>\r\n");
@@ -1287,7 +1287,7 @@ bool qdGameObjectStateWalk::save_script(Common::WriteStream &fh, int indent) con
 			fh.writeString("\t");
 		}
 		fh.writeString(Common::String::format("<static_center_offsets>%u", _static_center_offsets.size() * 2));
-		for (int i = 0; i < _static_center_offsets.size(); i++) {
+		for (uint i = 0; i < _static_center_offsets.size(); i++) {
 			fh.writeString(Common::String::format(" %d %d", _static_center_offsets[i].x, _static_center_offsets[i].y));
 		}
 		fh.writeString("</static_center_offsets>\r\n");
@@ -1298,7 +1298,7 @@ bool qdGameObjectStateWalk::save_script(Common::WriteStream &fh, int indent) con
 			fh.writeString("\t");
 		}
 		fh.writeString(Common::String::format("<start_center_offsets>%u", _start_center_offsets.size() * 2));
-		for (int i = 0; i < _start_center_offsets.size(); i++){
+		for (uint i = 0; i < _start_center_offsets.size(); i++){
 			fh.writeString(Common::String::format(" %d %d", _start_center_offsets[i].x, _start_center_offsets[i].y));
 		}
 		fh.writeString("</start_center_offsets>\r\n");
@@ -1309,7 +1309,7 @@ bool qdGameObjectStateWalk::save_script(Common::WriteStream &fh, int indent) con
 			fh.writeString("\t");
 		}
 		fh.writeString(Common::String::format("<stop_center_offsets>%u", _stop_center_offsets.size() * 2));
-		for (int i = 0; i < _stop_center_offsets.size(); i++) {
+		for (uint i = 0; i < _stop_center_offsets.size(); i++) {
 			fh.writeString(Common::String::format(" %d %d", _stop_center_offsets[i].x, _stop_center_offsets[i].y));
 		}
 		fh.writeString("</stop_center_offsets>\r\n");
@@ -1320,7 +1320,7 @@ bool qdGameObjectStateWalk::save_script(Common::WriteStream &fh, int indent) con
 			fh.writeString("\t");
 		}
 		fh.writeString(Common::String::format("<walk_sound_frequency>%u", _walk_sound_frequency.size()));
-		for (int i = 0; i < _walk_sound_frequency.size(); i++) {
+		for (uint i = 0; i < _walk_sound_frequency.size(); i++) {
 			fh.writeString(Common::String::format(" %f", _walk_sound_frequency[i]));
 		}
 		fh.writeString("</walk_sound_frequency>\r\n");
diff --git a/engines/qdengine/qdcore/qd_interface_button.cpp b/engines/qdengine/qdcore/qd_interface_button.cpp
index 47b798ee108..c985fc7f873 100644
--- a/engines/qdengine/qdcore/qd_interface_button.cpp
+++ b/engines/qdengine/qdcore/qd_interface_button.cpp
@@ -83,7 +83,7 @@ qdInterfaceButton &qdInterfaceButton::operator = (const qdInterfaceButton &bt) {
 }
 
 bool qdInterfaceButton::activate_state(int state_num) {
-	if (state_num >= _states.size())
+	if (state_num >= (int)_states.size())
 		state_num = _states.size() - 1;
 
 	if (!_states.size() || _cur_state == state_num) return false;
@@ -93,7 +93,7 @@ bool qdInterfaceButton::activate_state(int state_num) {
 
 	_cur_state = state_num;
 
-	if (state_num >= 0 && state_num < _states.size())
+	if (state_num >= 0 && state_num < (int)_states.size())
 		return set_state(get_state(state_num));
 
 	return true;
@@ -130,7 +130,7 @@ bool qdInterfaceButton::add_state(const qdInterfaceElementState &st) {
 }
 
 bool qdInterfaceButton::insert_state(int insert_before, const qdInterfaceElementState &st) {
-	assert(insert_before >= 0 && insert_before < _states.size());
+	assert(insert_before >= 0 && insert_before < (int)_states.size());
 
 #ifdef _QD_INTERFACE_BUTTON_PTR_CONTAINER
 	_states.insert(_states.begin() + insert_before, new qdInterfaceElementState(st));
@@ -145,7 +145,7 @@ bool qdInterfaceButton::insert_state(int insert_before, const qdInterfaceElement
 }
 
 bool qdInterfaceButton::erase_state(int state_num) {
-	assert(state_num >= 0 && state_num < _states.size());
+	assert(state_num >= 0 && state_num < (int)_states.size());
 
 #ifdef _QD_INTERFACE_BUTTON_PTR_CONTAINER
 //	delete *(_states.begin() + state_num);
diff --git a/engines/qdengine/qdcore/qd_interface_button.h b/engines/qdengine/qdcore/qd_interface_button.h
index 55f503383c6..2878b2e20ab 100644
--- a/engines/qdengine/qdcore/qd_interface_button.h
+++ b/engines/qdengine/qdcore/qd_interface_button.h
@@ -60,7 +60,7 @@ public:
 
 	//! Возвращает указатель на состояние кнопки.
 	const qdInterfaceElementState *get_state(int state_num) const {
-		assert(state_num >= 0 && state_num < _states.size());
+		assert(state_num >= 0 && state_num < (int)_states.size());
 #ifndef _QD_INTERFACE_BUTTON_PTR_CONTAINER
 		return &_states[state_num];
 #else
@@ -69,7 +69,7 @@ public:
 	}
 	//! Возвращает указатель на состояние кнопки.
 	qdInterfaceElementState *get_state(int state_num) {
-		assert(state_num >= 0 && state_num < _states.size());
+		assert(state_num >= 0 && state_num < (int)_states.size());
 #ifndef _QD_INTERFACE_BUTTON_PTR_CONTAINER
 		return &_states[state_num];
 #else
@@ -98,7 +98,7 @@ public:
 	Соответствующему состоянию присваивается значение st.
 	*/
 	bool modify_state(int state_num, const qdInterfaceElementState &st) {
-		assert(state_num >= 0 && state_num < _states.size());
+		assert(state_num >= 0 && state_num < (int)_states.size());
 #ifdef _QD_INTERFACE_BUTTON_PTR_CONTAINER
 		*_states[state_num] = st;
 		_states[state_num]->set_owner(this);
diff --git a/engines/qdengine/system/graphics/gr_tile_sprite.cpp b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
index 5ea03970de9..35647f5911c 100644
--- a/engines/qdengine/system/graphics/gr_tile_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
@@ -80,11 +80,11 @@ bool decodeRLE(const uint32 *in_data, uint32 *out_data) {
 		uint32 count = *in_buf++;
 		if (count & RLE_SEQUENCE_MASK) {
 			count ^= RLE_SEQUENCE_MASK;
-			for (int i = 0; i < count; i++)
+			for (uint i = 0; i < count; i++)
 				*out_buf++ = *in_buf++;
 		} else {
 			uint32 color = *in_buf++;
-			for (int i = 0; i < count; i++)
+			for (uint i = 0; i < count; i++)
 				*out_buf++ = color;
 		}
 
diff --git a/engines/qdengine/system/graphics/rle_compress.cpp b/engines/qdengine/system/graphics/rle_compress.cpp
index 71992b1e036..ed9e65889fc 100644
--- a/engines/qdengine/system/graphics/rle_compress.cpp
+++ b/engines/qdengine/system/graphics/rle_compress.cpp
@@ -31,14 +31,14 @@ namespace QDEngine {
 
 byte *g_buffer0 = nullptr;
 byte *g_buffer1 = nullptr;
-int g_buffersLen = 0;
+uint32 g_buffersLen = 0;
 
 static void ensureBuffers() {
 	if (g_buffer0 == nullptr) {
 		g_buffer0 = (byte *)calloc(4096, 1);
 		g_buffer1 = (byte *)calloc(4096, 1);
 
-		g_buffersLen = 4096;
+		g_buffersLen = 4096U;
 	}
 }
 
@@ -306,9 +306,9 @@ void RLEBuffer::resize_buffers() {
 int RLEBuffer::line_length() {
 	if (_header_offset.empty()) return 0;
 
-	int sz = (_header_offset.size() > 1) ? _header_offset[1] : _header.size();
+	uint sz = (_header_offset.size() > 1) ? _header_offset[1] : _header.size();
 
-	int len = 0;
+	uint len = 0;
 	for (int i = 0; i < sz; i++) {
 		len += abs(_header[i]);
 	}
@@ -325,7 +325,7 @@ int RLEBuffer::line_header_length(int line_num) const {
 
 
 bool RLEBuffer::load(Common::SeekableReadStream *fh) {
-	int32 sz = fh->readUint32LE();
+	uint32 sz = fh->readUint32LE();
 	_header_offset.resize(sz);
 
 	sz = fh->readSint32LE();
@@ -338,19 +338,19 @@ bool RLEBuffer::load(Common::SeekableReadStream *fh) {
 	sz = fh->readSint32LE();
 	_data.resize(sz);
 
-	for (int i = 0; i < _header_offset.size(); i++) {
+	for (uint i = 0; i < _header_offset.size(); i++) {
 		_header_offset[i] = fh->readUint32LE();
 	}
 
-	for (int i = 0; i < _data_offset.size(); i++) {
+	for (uint i = 0; i < _data_offset.size(); i++) {
 		_data_offset[i] = fh->readUint32LE();
 	}
 
-	for (int i = 0; i < _header.size() - 1; i++) {
+	for (uint i = 0; i < _header.size() - 1; i++) {
 		_header[i] = fh->readByte();
 	}
 
-	for (int i = 0; i < _data.size(); i++) {
+	for (uint i = 0; i < _data.size(); i++) {
 		_data[i] = fh->readUint32LE();
 	}
 


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

Commit Message:
QDENGINE: Fixed another case of bad Python-like indentation

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


diff --git a/engines/qdengine/qdcore/qd_interface_dispatcher.cpp b/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
index cf389396090..ea1e8c57d95 100644
--- a/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
@@ -177,9 +177,10 @@ bool qdInterfaceDispatcher::select_background_screen(qdInterfaceScreen *p) {
 }
 
 bool qdInterfaceDispatcher::select_ingame_screen(bool inventory_state) {
-	if (has_ingame_screen(inventory_state))
+	if (has_ingame_screen(inventory_state)) {
 		debugC(3, kDebugQuant, "qdInterfaceDispatcher::select_ingame_screen(): Selecting ingame screen: %s", transCyrillic(ingame_screen_name(inventory_state)));
 		return select_screen(ingame_screen_name(inventory_state), true);
+	}
 
 	return select_screen(NULL);
 }


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

Commit Message:
QDENGINE: Fix more signedness warnings

Changed paths:
    engines/qdengine/qdcore/qd_interface_dispatcher.cpp
    engines/qdengine/qdcore/qd_interface_text_window.cpp
    engines/qdengine/qdcore/qd_inventory_cell.cpp
    engines/qdengine/qdcore/qd_screen_text.cpp
    engines/qdengine/qdcore/qd_screen_text_set.cpp
    engines/qdengine/qdcore/qd_sprite.cpp


diff --git a/engines/qdengine/qdcore/qd_interface_dispatcher.cpp b/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
index ea1e8c57d95..7403b313003 100644
--- a/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
+++ b/engines/qdengine/qdcore/qd_interface_dispatcher.cpp
@@ -517,7 +517,7 @@ bool qdInterfaceDispatcher::handle_event(int event_code, const char *event_data,
 	case qdInterfaceEvent::EVENT_BUTTON_STATE:
 		if (_cur_screen && event_data) {
 			Common::String str = event_data;
-			int pos = str.find("::");
+			size_t pos = str.find("::");
 			if (pos != Common::String::npos) {
 				if (qdInterfaceButton * p = dynamic_cast<qdInterfaceButton * >(_cur_screen->get_element(str.substr(0, pos).c_str()))) {
 					return p->activate_state(str.substr(pos + 2).c_str());
diff --git a/engines/qdengine/qdcore/qd_interface_text_window.cpp b/engines/qdengine/qdcore/qd_interface_text_window.cpp
index 430eae14c99..8273d5be714 100644
--- a/engines/qdengine/qdcore/qd_interface_text_window.cpp
+++ b/engines/qdengine/qdcore/qd_interface_text_window.cpp
@@ -168,7 +168,7 @@ bool qdInterfaceTextWindow::char_input_handler(int input) {
 	bool ret = __super::char_input_handler(input);
 #endif
 	if (_windowType == WINDOW_EDIT && _isEditing) {
-		if (!_inputStringLimit || _inputString.size() < _inputStringLimit) {
+		if (!_inputStringLimit || (int)_inputString.size() < _inputStringLimit) {
 			if (Common::isPrint(input) || input == '_' || input == '-' || input == ' ') {
 				_inputString.insertChar(input, _caretPose++);
 				return true;
@@ -617,17 +617,17 @@ bool qdInterfaceTextWindow::edit_input(Common::KeyCode vkey) {
 			return true;
 
 		case Common::KEYCODE_RIGHT:
-			if (_caretPose < _inputString.size())
+			if (_caretPose < (int)_inputString.size())
 				++_caretPose;
 			return true;
 
 		case Common::KEYCODE_BACKSPACE:
-			if (_caretPose > 0 && _caretPose <= _inputString.size())
+			if (_caretPose > 0 && _caretPose <= (int)_inputString.size())
 				_inputString.erase(--_caretPose, 1);
 			return true;
 
 		case Common::KEYCODE_DELETE:
-			if (_caretPose >= 0 && _caretPose < _inputString.size())
+			if (_caretPose >= 0 && _caretPose < (int)_inputString.size())
 				_inputString.erase(_caretPose, 1);
 
 			return true;
diff --git a/engines/qdengine/qdcore/qd_inventory_cell.cpp b/engines/qdengine/qdcore/qd_inventory_cell.cpp
index 9704b9c2546..ac47bb93b83 100644
--- a/engines/qdengine/qdcore/qd_inventory_cell.cpp
+++ b/engines/qdengine/qdcore/qd_inventory_cell.cpp
@@ -215,7 +215,7 @@ void qdInventoryCellSet::redraw(int offs_x, int offs_y, bool inactive_mode) cons
 	for (int i = _cells_shift.y; i < _size.y + _cells_shift.y; i++) {
 		idx = i * (_size.x + _additional_cells.x) + _cells_shift.x;
 		for (int j = _cells_shift.x; j < _size.x + _cells_shift.x; j++) {
-			assert(idx >= 0 && idx < _cells.size());
+			assert(idx >= 0 && idx < (int)_cells.size());
 			_cells[idx].redraw(offs_x + pos.x, offs_y + pos.y, inactive_mode);
 			pos.x += _cells[idx].size_x();
 			idx++;
@@ -269,7 +269,7 @@ bool qdInventoryCellSet::put_object(qdGameObjectAnimated *p, const Vect2s &pos)
 	// Двигаем индекс на текущее смещение ячеек
 	idx += _cells_shift.y * (_size.x + _additional_cells.x) + _cells_shift.x;
 
-	if (idx >= 0 && idx < _cells.size() && _cells[idx].is_empty() && _cells[idx].type() == p->inventory_type()) {
+	if (idx >= 0 && idx < (int)_cells.size() && _cells[idx].is_empty() && _cells[idx].type() == p->inventory_type()) {
 		_cells[idx].set_object(p);
 		return true;
 	}
@@ -286,7 +286,7 @@ qdGameObjectAnimated *qdInventoryCellSet::get_object(const Vect2s &pos) const {
 	// Двигаем индекс на текущее смещение ячеек
 	idx += _cells_shift.y * (_size.x + _additional_cells.x) + _cells_shift.x;
 
-	if (idx >= 0 && idx < _cells.size())
+	if (idx >= 0 && idx < (int)_cells.size())
 		return _cells[idx].object();
 
 	return NULL;
@@ -438,7 +438,7 @@ int qdInventoryCellSet::cell_index(const qdGameObjectAnimated *obj) const {
 }
 
 Vect2s qdInventoryCellSet::cell_position(int cell_idx) const {
-	if (cell_idx >= 0 && cell_idx < _cells.size()) {
+	if (cell_idx >= 0 && cell_idx < (int)_cells.size()) {
 		int x = (cell_idx % _size.x) * _cells.front().size_x() + screen_pos().x;
 		int y = (cell_idx / _size.x) * _cells.front().size_y() + screen_pos().y;
 		// Делаем поправку на смещение ячеек
@@ -485,7 +485,7 @@ void qdInventoryCellSet::pre_redraw() const {
 	for (int i = _cells_shift.y; i < size().y + _cells_shift.y; i++) {
 		idx = i * (_size.x + _additional_cells.x) + _cells_shift.x;
 		for (int j = _cells_shift.x; j < size().x + _cells_shift.x; j++) {
-			assert(idx >= 0 && idx < _cells.size());
+			assert(idx >= 0 && idx < (int)_cells.size());
 			if (!_cells[idx].is_empty() && _cells[idx].object()->need_redraw()) {
 				dp->add_redraw_region(_cells[idx].object()->last_screen_region());
 				dp->add_redraw_region(_cells[idx].object()->screen_region());
@@ -506,7 +506,7 @@ void qdInventoryCellSet::post_redraw() {
 	for (int i = _cells_shift.y; i < size().y + _cells_shift.y; i++) {
 		idx = i * (_size.x + _additional_cells.x) + _cells_shift.x;
 		for (int j = _cells_shift.x; j < size().x + _cells_shift.x; j++) {
-			assert(idx >= 0 && idx < _cells.size());
+			assert(idx >= 0 && idx < (int)_cells.size());
 			if (!_cells[idx].is_empty())
 				_cells[idx].object()->post_redraw();
 			idx++;
@@ -521,7 +521,7 @@ bool qdInventoryCellSet::has_rect_objects(int left, int top, int right, int bott
 	for (int i = top; i <= bottom; i++)
 		for (int j = left; j <= right; j++) {
 			idx = i * (_size.x + _additional_cells.x) + j;
-			assert(idx >= 0 && idx < _cells.size());
+			assert(idx >= 0 && idx < (int)_cells.size());
 			// Нашли объект вне видимой области - значит скроллинг нужен
 			if (!_cells[idx].is_empty())
 				return true;
diff --git a/engines/qdengine/qdcore/qd_screen_text.cpp b/engines/qdengine/qdcore/qd_screen_text.cpp
index 761426c46a3..8019f5ecfb8 100644
--- a/engines/qdengine/qdcore/qd_screen_text.cpp
+++ b/engines/qdengine/qdcore/qd_screen_text.cpp
@@ -194,7 +194,7 @@ bool qdScreenText::format_text(int max_width) {
 					// space we will trigger attempt to format the string ending)
 					// The space will not affect the output because it is at the end.
 
-	for (int i = 0; i < _data.size(); i++) {
+	for (uint i = 0; i < _data.size(); i++) {
 		if (_data[i] == '\n') {
 			if (cur_wid > max_width) {
 				// Safe space is present, so it is safe to split it (e.g. everything fits max_width)
diff --git a/engines/qdengine/qdcore/qd_screen_text_set.cpp b/engines/qdengine/qdcore/qd_screen_text_set.cpp
index 53169020b88..f100995ab0b 100644
--- a/engines/qdengine/qdcore/qd_screen_text_set.cpp
+++ b/engines/qdengine/qdcore/qd_screen_text_set.cpp
@@ -60,7 +60,7 @@ bool qdScreenTextSet::arrange_texts() {
 
 	Vect2i text_pos(0, 0);
 
-	for (int i = 1; i < _texts.size(); i++) {
+	for (uint i = 1; i < _texts.size(); i++) {
 		if (_texts[i].arrangement() == qdScreenTextFormat::ARRANGE_HORIZONTAL) {
 			if (row_sy < _texts[i].size_y())
 				row_sy = _texts[i].size_y();
@@ -79,7 +79,7 @@ bool qdScreenTextSet::arrange_texts() {
 	int row_start = 0;
 	int row_size = 1;
 
-	for (int i = 0; i < _texts.size(); i++) {
+	for (uint i = 0; i < _texts.size(); i++) {
 		if (_texts[i].arrangement() == qdScreenTextFormat::ARRANGE_VERTICAL || i == _texts.size() - 1) {
 			int sx = 0;
 			for (int j = 0; j < row_size; j++)
@@ -112,7 +112,7 @@ bool qdScreenTextSet::arrange_texts() {
 	int sx = 0;
 	int sy = 0;
 
-	for (int i = 0; i < _texts.size(); i++) {
+	for (uint i = 0; i < _texts.size(); i++) {
 		if (_texts[i].screen_pos().x + _texts[i].size_x() > sx)
 			sx = _texts[i].screen_pos().x + _texts[i].size_x();
 		if (_texts[i].screen_pos().y + _texts[i].size_y() > sy)
@@ -120,7 +120,7 @@ bool qdScreenTextSet::arrange_texts() {
 	}
 
 	_size = Vect2i(sx, sy);
-	for (int i = 0; i < _texts.size(); i++) {
+	for (uint i = 0; i < _texts.size(); i++) {
 		Vect2i pos = _texts[i].screen_pos();
 		pos -= _size / 2;
 		_texts[i].set_screen_pos(pos);
diff --git a/engines/qdengine/qdcore/qd_sprite.cpp b/engines/qdengine/qdcore/qd_sprite.cpp
index 68ebbc96d32..4f94101f425 100644
--- a/engines/qdengine/qdcore/qd_sprite.cpp
+++ b/engines/qdengine/qdcore/qd_sprite.cpp
@@ -1377,7 +1377,7 @@ bool qdSprite::scale(float coeff_x, float coeff_y) {
 	byte *src_data = _data;
 
 	if (_format == GR_RGB888) {
-		if (temp_buffer.size() < _picture_size.x * _picture_size.y * 4)
+		if ((int)temp_buffer.size() < _picture_size.x * _picture_size.y * 4)
 			temp_buffer.resize(_picture_size.x * _picture_size.y * 4);
 
 		src_data = &*temp_buffer.begin();

More information about the Scummvm-git-logs mailing list