[Scummvm-git-logs] scummvm master -> ecbec8b414e89c4e2bad67376422026449fa1032
sev-
noreply at scummvm.org
Fri Aug 23 15:17:31 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:
c7226667b5 QDENGINE: Fix more sign inconsistencies
31f66ef9fb QDENGINE: Fix wrong operator precedence
ecbec8b414 QDENGINE: Fix more signedness in comparisons
Commit: c7226667b5537ef9213811368e922ce7936d7af8
https://github.com/scummvm/scummvm/commit/c7226667b5537ef9213811368e922ce7936d7af8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-23T17:13:45+02:00
Commit Message:
QDENGINE: Fix more sign inconsistencies
Changed paths:
engines/qdengine/parser/xml_parser.cpp
engines/qdengine/qdcore/qd_camera.cpp
engines/qdengine/qdcore/qd_condition_data.cpp
engines/qdengine/qdcore/qd_conditional_object.cpp
engines/qdengine/qdcore/qd_contour.cpp
engines/qdengine/qdcore/qd_interface_element_state.cpp
engines/qdengine/qdcore/qd_trigger_chain.cpp
engines/qdengine/qdcore/util/LZ77.cpp
engines/qdengine/qdcore/util/splash_screen.cpp
engines/qdengine/qdcore/util/splash_screen.h
diff --git a/engines/qdengine/parser/xml_parser.cpp b/engines/qdengine/parser/xml_parser.cpp
index 8dc3ac22cf0..77e4e04fd3c 100644
--- a/engines/qdengine/parser/xml_parser.cpp
+++ b/engines/qdengine/parser/xml_parser.cpp
@@ -65,7 +65,7 @@ bool tag::readTag(Common::SeekableReadStream *ff, tag &tg) {
uint32 num_subtags = ff->readUint32LE();
- for (int i = 0; i < num_subtags; i++) {
+ for (uint32 i = 0; i < num_subtags; i++) {
tag stg;
readTag(ff, stg);
diff --git a/engines/qdengine/qdcore/qd_camera.cpp b/engines/qdengine/qdcore/qd_camera.cpp
index a2d07b41519..b25d7a26a7a 100644
--- a/engines/qdengine/qdcore/qd_camera.cpp
+++ b/engines/qdengine/qdcore/qd_camera.cpp
@@ -1295,7 +1295,7 @@ int qdCamera::cells_num_with_exact_attributes(const Vect2s ¢er_pos, const Ve
for (int y = y0; y < y1; y++) {
const sGridCell *p = cells;
for (int x = x0; x < x1; x++, p++) {
- if (p->attributes() == attr)
+ if (p->attributes() == (uint)attr)
ret++;
}
diff --git a/engines/qdengine/qdcore/qd_condition_data.cpp b/engines/qdengine/qdcore/qd_condition_data.cpp
index 92ca1afb471..19b4c762451 100644
--- a/engines/qdengine/qdcore/qd_condition_data.cpp
+++ b/engines/qdengine/qdcore/qd_condition_data.cpp
@@ -64,7 +64,7 @@ bool qdConditionData::alloc_data(int size) {
break;
}
- if (_data.size() < size)
+ if ((int)_data.size() < size)
_data.resize(size);
return true;
@@ -100,14 +100,14 @@ bool qdConditionData::save_script(Common::WriteStream &fh, int indent) const {
switch (_type) {
case DATA_INT:
fh.writeString(Common::String::format("<condition_data_int>%lu", _data.size() / sizeof(int32)));
- for (int i = 0; i < _data.size() / sizeof(int32); i++) {
+ for (uint i = 0; i < _data.size() / sizeof(int32); i++) {
fh.writeString(Common::String::format(" %d", get_int(i)));
}
fh.writeString("</condition_data_int>\r\n");
break;
case DATA_FLOAT:
fh.writeString(Common::String::format("<condition_data_float>%lu", _data.size() / sizeof(float)));
- for (int i = 0; i < _data.size() / sizeof(float); i++) {
+ for (uint i = 0; i < _data.size() / sizeof(float); i++) {
fh.writeString(Common::String::format(" %f", get_float(i)));
}
fh.writeString("</condition_data_float>\r\n");
diff --git a/engines/qdengine/qdcore/qd_conditional_object.cpp b/engines/qdengine/qdcore/qd_conditional_object.cpp
index bbff8628709..5a436a02400 100644
--- a/engines/qdengine/qdcore/qd_conditional_object.cpp
+++ b/engines/qdengine/qdcore/qd_conditional_object.cpp
@@ -261,7 +261,7 @@ bool qdConditionalObject::update_condition_group(int num, const qdConditionGroup
qdConditionGroup &gr = _condition_groups[num];
gr = 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();
else
diff --git a/engines/qdengine/qdcore/qd_contour.cpp b/engines/qdengine/qdcore/qd_contour.cpp
index 7b107d35204..3253b5d1afc 100644
--- a/engines/qdengine/qdcore/qd_contour.cpp
+++ b/engines/qdengine/qdcore/qd_contour.cpp
@@ -58,7 +58,7 @@ void qdContour::add_contour_point(const Vect2s &pt) {
}
void qdContour::insert_contour_point(const Vect2s &pt, int insert_pos) {
- if (insert_pos < _contour.size()) {
+ if (insert_pos < (int)_contour.size()) {
if (insert_pos < 0) insert_pos = 0;
_contour.insert(_contour.begin() + insert_pos, pt);
} else {
@@ -67,7 +67,7 @@ void qdContour::insert_contour_point(const Vect2s &pt, int insert_pos) {
}
bool qdContour::remove_contour_point(int pos) {
- if (pos >= 0 && pos < _contour.size()) {
+ if (pos >= 0 && pos < (int)_contour.size()) {
_contour.erase(_contour.begin() + pos);
return true;
}
@@ -75,7 +75,7 @@ bool qdContour::remove_contour_point(int pos) {
}
bool qdContour::update_contour_point(const Vect2s &pt, int pos) {
- if (pos >= 0 && pos < _contour.size()) {
+ if (pos >= 0 && pos < (int)_contour.size()) {
_contour[pos] = pt;
return true;
}
@@ -93,7 +93,7 @@ bool qdContour::update_contour() {
int y0 = _contour[0].y;
int y1 = _contour[0].y;
- for (int i = 0; i < _contour.size(); i++) {
+ for (uint i = 0; i < _contour.size(); i++) {
if (_contour[i].x < x0) x0 = _contour[i].x;
if (_contour[i].x > x1) x1 = _contour[i].x;
if (_contour[i].y < y0) y0 = _contour[i].y;
@@ -122,7 +122,7 @@ bool qdContour::is_inside(const Vect2s &pos) const {
int intersections_gt0 = 0;
int intersections_lt1 = 0;
int intersections_gt1 = 0;
- for (int i = 0; i < _contour.size(); i ++) {
+ for (uint i = 0; i < _contour.size(); i ++) {
Vect2s p0 = _contour[i];
Vect2s p1 = (i < _contour.size() - 1) ? _contour[i + 1] : _contour[0];
if (p0.y != p1.y) {
diff --git a/engines/qdengine/qdcore/qd_interface_element_state.cpp b/engines/qdengine/qdcore/qd_interface_element_state.cpp
index 21e30f1267d..4a7d479d5ae 100644
--- a/engines/qdengine/qdcore/qd_interface_element_state.cpp
+++ b/engines/qdengine/qdcore/qd_interface_element_state.cpp
@@ -86,7 +86,7 @@ bool qdInterfaceElementState::save_script(Common::WriteStream &fh, int indent) c
fh.writeString(">\r\n");
- for (int j = 0; j < _events.size(); j++) {
+ for (uint j = 0; j < _events.size(); j++) {
for (int i = 0; i <= indent; i++) {
fh.writeString("\t");
}
@@ -331,7 +331,7 @@ bool qdInterfaceElementState::keyboard_handler(Common::KeyCode vkey) {
bool qdInterfaceElementState::handle_events(qdInterfaceEvent::activation_t activation_type, bool before_animation) {
if (qdInterfaceDispatcher * dp = qdInterfaceDispatcher::get_dispatcher()) {
- for (int i = 0; i < _events.size(); i++) {
+ for (uint i = 0; i < _events.size(); i++) {
if (_events[i].activation() == activation_type && _events[i].is_before_animation() == before_animation) {
dp->handle_event(_events[i].event(), _events[i].event_data(), owner());
}
@@ -354,7 +354,7 @@ bool qdInterfaceElementState::set_contour(state_mode_t mode, const qdContour &cn
}
bool qdInterfaceElementState::need_active_game() const {
- for (int i = 0; i < _events.size(); i++) {
+ for (uint i = 0; i < _events.size(); i++) {
if (_events[i].event() == qdInterfaceEvent::EVENT_SAVE_GAME)
return true;
if (_events[i].event() == qdInterfaceEvent::EVENT_CHANGE_PERSONAGE)
diff --git a/engines/qdengine/qdcore/qd_trigger_chain.cpp b/engines/qdengine/qdcore/qd_trigger_chain.cpp
index dc85e357201..ae989749758 100644
--- a/engines/qdengine/qdcore/qd_trigger_chain.cpp
+++ b/engines/qdengine/qdcore/qd_trigger_chain.cpp
@@ -271,7 +271,7 @@ bool qdTriggerChain::load_data(Common::SeekableReadStream &fh, int save_version)
debugC(4, kDebugSave, " qdTriggerChain::load_data before: %ld", fh.pos());
int32 size = fh.readSint32LE();
- if (size != _elements.size()) {
+ if (size != (int)_elements.size()) {
return false;
}
diff --git a/engines/qdengine/qdcore/util/LZ77.cpp b/engines/qdengine/qdcore/util/LZ77.cpp
index 82797e6bd11..1f53d9a7d79 100644
--- a/engines/qdengine/qdcore/util/LZ77.cpp
+++ b/engines/qdengine/qdcore/util/LZ77.cpp
@@ -145,7 +145,7 @@ int32 CLZ77::decode(byte *target, int32 &tlen, const byte *source, int32 slen) {
border = 1; // offset can`t be more then border
for (s = (const byte *)source + 1; (s < source + slen) && (t - target < tlen);) {
if (shift > BITS_LEN)
- while (t - target >= border) {
+ while (t - target >= (int)border) {
if (shift <= BITS_LEN) break;
border = border << 1;
shift--;
diff --git a/engines/qdengine/qdcore/util/splash_screen.cpp b/engines/qdengine/qdcore/util/splash_screen.cpp
index 75953e6436a..b00ec209331 100644
--- a/engines/qdengine/qdcore/util/splash_screen.cpp
+++ b/engines/qdengine/qdcore/util/splash_screen.cpp
@@ -95,7 +95,7 @@ void SplashScreen::show() {
}
-void SplashScreen::wait(int time) {
+void SplashScreen::wait(uint time) {
if (g_system->getMillis() - _start_time < time)
g_system->delayMillis(time - (g_system->getMillis() - _start_time));
}
diff --git a/engines/qdengine/qdcore/util/splash_screen.h b/engines/qdengine/qdcore/util/splash_screen.h
index 69f1a50c90c..8a36c31e0a4 100644
--- a/engines/qdengine/qdcore/util/splash_screen.h
+++ b/engines/qdengine/qdcore/util/splash_screen.h
@@ -46,11 +46,11 @@ public:
void show();
void hide();
- void wait(int time);
+ void wait(uint time);
private:
- int _start_time = 0;
+ uint _start_time = 0;
Graphics::Surface *_splash = nullptr;
byte *_palette = nullptr;
Commit: 31f66ef9fb8d212b066a9f377611e120eae2d367
https://github.com/scummvm/scummvm/commit/31f66ef9fb8d212b066a9f377611e120eae2d367
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-23T17:14:33+02:00
Commit Message:
QDENGINE: Fix wrong operator precedence
Changed paths:
engines/qdengine/system/graphics/gr_draw_sprite.cpp
diff --git a/engines/qdengine/system/graphics/gr_draw_sprite.cpp b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
index 5e183e4325f..d8aa24c0e74 100644
--- a/engines/qdengine/system/graphics/gr_draw_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_draw_sprite.cpp
@@ -206,7 +206,7 @@ void grDispatcher::putSpr_rot(const Vect2i &pos, const Vect2i &size, const byte
int dx = 0;
int dy = 0;
- if (!(int)(round(R2G(angle))) % 90) {
+ if (!((int)(round(R2G(angle))) % 90)) {
int angle_num = round(cycleAngle(angle) / (M_PI / 2.f));
switch (angle_num) {
case 1:
Commit: ecbec8b414e89c4e2bad67376422026449fa1032
https://github.com/scummvm/scummvm/commit/ecbec8b414e89c4e2bad67376422026449fa1032
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-23T17:17:14+02:00
Commit Message:
QDENGINE: Fix more signedness in comparisons
Changed paths:
engines/qdengine/system/graphics/gr_dispatcher.cpp
engines/qdengine/system/graphics/gr_tile_animation.cpp
engines/qdengine/system/graphics/gr_tile_sprite.cpp
engines/qdengine/system/graphics/rle_compress.cpp
diff --git a/engines/qdengine/system/graphics/gr_dispatcher.cpp b/engines/qdengine/system/graphics/gr_dispatcher.cpp
index 8eea44e28d0..b66d4fe4971 100644
--- a/engines/qdengine/system/graphics/gr_dispatcher.cpp
+++ b/engines/qdengine/system/graphics/gr_dispatcher.cpp
@@ -1040,7 +1040,7 @@ int grDispatcher::textHeight(const char *str, int vspace, const grFont *font) co
int sy = font->size_y() + vspace;
- for (int i = 0; i < strlen(str); i++) {
+ for (uint i = 0; i < strlen(str); i++) {
if (str[i] == '\n')
sy += font->size_y() + vspace;
}
diff --git a/engines/qdengine/system/graphics/gr_tile_animation.cpp b/engines/qdengine/system/graphics/gr_tile_animation.cpp
index f894eed8ea8..c1d974c14a5 100644
--- a/engines/qdengine/system/graphics/gr_tile_animation.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_animation.cpp
@@ -204,7 +204,7 @@ bool grTileAnimation::load(Common::SeekableReadStream *fh) {
size = fh->readUint32LE();
_frameIndex.resize(size);
debugC(7, kDebugLoad, "grTileAnimation::load(): pos: %ld _frameIndex size: %u", fh->pos() - 4, size);
- for (int i = 0; i < size; i++) {
+ for (uint i = 0; i < size; i++) {
_frameIndex[i] = fh->readUint32LE();
debugCN(8, kDebugLoad, " %d ", _frameIndex[i]);
}
@@ -212,13 +212,13 @@ bool grTileAnimation::load(Common::SeekableReadStream *fh) {
size = fh->readUint32LE();
_tileOffsets.resize(size);
- for (int i = 0; i < size; i++) {
+ for (uint i = 0; i < size; i++) {
_tileOffsets[i] = fh->readUint32LE();
}
size = fh->readUint32LE();
_tileData.resize(size);
- for (int i = 0; i < size; i++) {
+ for (uint i = 0; i < size; i++) {
_tileData[i] = fh->readUint32LE();
}
diff --git a/engines/qdengine/system/graphics/gr_tile_sprite.cpp b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
index 35647f5911c..f5d1b47ba9c 100644
--- a/engines/qdengine/system/graphics/gr_tile_sprite.cpp
+++ b/engines/qdengine/system/graphics/gr_tile_sprite.cpp
@@ -153,7 +153,7 @@ bool grTileSprite::operator == (const grTileSprite &sprite) const {
const byte *ptr1 = (const byte *)sprite._data;
for (int i = 0; i < GR_TILE_SPRITE_SIZE_BYTES; i++, ptr0++, ptr1++) {
- if (abs(*ptr0 - *ptr1) > _comprasionTolerance)
+ if ((uint)abs(*ptr0 - *ptr1) > _comprasionTolerance)
return false;
}
diff --git a/engines/qdengine/system/graphics/rle_compress.cpp b/engines/qdengine/system/graphics/rle_compress.cpp
index ed9e65889fc..4a7ef32be80 100644
--- a/engines/qdengine/system/graphics/rle_compress.cpp
+++ b/engines/qdengine/system/graphics/rle_compress.cpp
@@ -309,7 +309,7 @@ int RLEBuffer::line_length() {
uint sz = (_header_offset.size() > 1) ? _header_offset[1] : _header.size();
uint len = 0;
- for (int i = 0; i < sz; i++) {
+ for (uint i = 0; i < sz; i++) {
len += abs(_header[i]);
}
@@ -317,7 +317,7 @@ int RLEBuffer::line_length() {
}
int RLEBuffer::line_header_length(int line_num) const {
- if (line_num < _header_offset.size() - 1)
+ if (line_num < (int)_header_offset.size() - 1)
return _header_offset[line_num + 1] - _header_offset[line_num];
else
return _header.size() - _header_offset[line_num];
More information about the Scummvm-git-logs
mailing list