minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix inconsistent integer comparison warnings

This commit is contained in:
SmallJoker 2021-08-17 20:00:47 +02:00
parent 2eec997e97
commit 3b842a7e02
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/imagefilters.cpp
View File

@ -102,7 +102,7 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
// Then repeatedly look for transparent pixels, filling them in until // Then repeatedly look for transparent pixels, filling them in until
// we're finished. // we're finished.
for (u32 iter = 0; iter < iter_max; iter++) { for (int iter = 0; iter < iter_max; iter++) {
for (u32 ctry = 0; ctry < dim.Height; ctry++) for (u32 ctry = 0; ctry < dim.Height; ctry++)
for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) { for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) {

8
src/settings.cpp
View File

@ -49,7 +49,7 @@ SettingsHierarchy::SettingsHierarchy(Settings *fallback)
Settings *SettingsHierarchy::getLayer(int layer) const Settings *SettingsHierarchy::getLayer(int layer) const
{ {
if (layer < 0 || layer >= layers.size()) if (layer < 0 || layer >= (int)layers.size())
throw BaseException("Invalid settings layer"); throw BaseException("Invalid settings layer");
return layers[layer]; return layers[layer];
} }
@ -57,7 +57,7 @@ Settings *SettingsHierarchy::getLayer(int layer) const
Settings *SettingsHierarchy::getParent(int layer) const Settings *SettingsHierarchy::getParent(int layer) const
{ {
assert(layer >= 0 && layer < layers.size()); assert(layer >= 0 && layer < (int)layers.size());
// iterate towards the origin (0) to find the next fallback layer // iterate towards the origin (0) to find the next fallback layer
for (int i = layer - 1; i >= 0; --i) { for (int i = layer - 1; i >= 0; --i) {
if (layers[i]) if (layers[i])
@ -72,8 +72,8 @@ void SettingsHierarchy::onLayerCreated(int layer, Settings *obj)
{ {
if (layer < 0) if (layer < 0)
throw BaseException("Invalid settings layer"); throw BaseException("Invalid settings layer");
if (layers.size() < layer+1) if ((int)layers.size() < layer + 1)
layers.resize(layer+1); layers.resize(layer + 1);
Settings *&pos = layers[layer]; Settings *&pos = layers[layer];
if (pos) if (pos)