From ab66f3ffd52abab2e8fe24d796762ac4ec5922f7 Mon Sep 17 00:00:00 2001 From: Armin Burgmeier Date: Thu, 10 Jan 2013 23:58:33 +0100 Subject: [PATCH] Fix overload_materials and overload_textures flag being erroneously set to true since they are not initialized by C4TextureMap::LoadMap in case materials and/or textures are not overloaded. --- src/mape/cpp-handles/texture-handle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mape/cpp-handles/texture-handle.cpp b/src/mape/cpp-handles/texture-handle.cpp index 6c839b3b7..6b95acbe8 100644 --- a/src/mape/cpp-handles/texture-handle.cpp +++ b/src/mape/cpp-handles/texture-handle.cpp @@ -40,8 +40,8 @@ void c4_texture_map_handle_free(C4TextureMapHandle* texture_map) guint c4_texture_map_handle_load_map(C4TextureMapHandle* texture_map, C4GroupHandle* group, const char* entry_name, gboolean* overload_materials, gboolean* overload_textures) { - bool fOverloadMaterials; - bool fOverloadTextures; + bool fOverloadMaterials = false; + bool fOverloadTextures = false; guint32 retval = HANDLE_TO_TEXTURE_MAP(texture_map)->LoadMap(*HANDLE_TO_GROUP(group), entry_name, &fOverloadMaterials, &fOverloadTextures); if(overload_materials) *overload_materials = fOverloadMaterials; if(overload_textures) *overload_textures = fOverloadTextures;