summaryrefslogtreecommitdiff
path: root/src/client/tile.h
diff options
context:
space:
mode:
authorDaroc Alden <setupminimal@users.noreply.github.com>2022-03-11 15:22:49 -0500
committersfan5 <sfan5@live.de>2022-05-14 18:33:42 +0200
commit6e6cdc834fc2bf6192092d7a29aea72b760fa930 (patch)
treef7f2ed68054476c06f1fa2f264cde1180fba083f /src/client/tile.h
parent4b81ae1b3590ba9159113605254e073c1efddf12 (diff)
downloadminetest-6e6cdc834fc2bf6192092d7a29aea72b760fa930.tar.gz
minetest-6e6cdc834fc2bf6192092d7a29aea72b760fa930.tar.bz2
minetest-6e6cdc834fc2bf6192092d7a29aea72b760fa930.zip
Fix undefined behavior in TileLayer (#12125)
Initialize the values properly
Diffstat (limited to 'src/client/tile.h')
-rw-r--r--src/client/tile.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/client/tile.h b/src/client/tile.h
index fcdc46460..fe96cef58 100644
--- a/src/client/tile.h
+++ b/src/client/tile.h
@@ -195,6 +195,7 @@ struct TileLayer
texture_id == other.texture_id &&
material_type == other.material_type &&
material_flags == other.material_flags &&
+ has_color == other.has_color &&
color == other.color &&
scale == other.scale;
}
@@ -288,9 +289,9 @@ struct TileLayer
* The color of the tile, or if the tile does not own
* a color then the color of the node owning this tile.
*/
- video::SColor color;
+ video::SColor color = video::SColor(0, 0, 0, 0);
- u8 scale;
+ u8 scale = 1;
};
/*!