diff --git a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_6/skin.jpg b/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_6/skin.jpg deleted file mode 100644 index ff0c2bf5..00000000 Binary files a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_6/skin.jpg and /dev/null differ diff --git a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_low/skin.jpg b/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_low/skin.jpg deleted file mode 100644 index ff0c2bf5..00000000 Binary files a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_low/skin.jpg and /dev/null differ diff --git a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_top/skin.jpg b/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_top/skin.jpg deleted file mode 100644 index ff0c2bf5..00000000 Binary files a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_top/skin.jpg and /dev/null differ diff --git a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_up/skin.jpg b/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_up/skin.jpg deleted file mode 100644 index ff0c2bf5..00000000 Binary files a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_up/skin.jpg and /dev/null differ diff --git a/packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_2/skin.jpg b/packages/models/mapmodels/misterfloppy/hanging_ladder/skin.jpg similarity index 100% rename from packages/models/mapmodels/misterfloppy/hanging_ladder/ladder_2/skin.jpg rename to packages/models/mapmodels/misterfloppy/hanging_ladder/skin.jpg diff --git a/source/src/rendermodel.cpp b/source/src/rendermodel.cpp index 655df888..b0b5ff56 100644 --- a/source/src/rendermodel.cpp +++ b/source/src/rendermodel.cpp @@ -843,6 +843,8 @@ int findanim(const char *name) void loadskin(const char *dir, const char *altdir, Texture *&skin) // model skin sharing { + bool old_silent_texture_load = silent_texture_load; + silent_texture_load = true; #define ifnoload if((skin = textureload(path))==notexture) defformatstring(path)("packages/models/%s/skin.jpg", dir); ifnoload @@ -854,10 +856,11 @@ void loadskin(const char *dir, const char *altdir, Texture *&skin) // model skin ifnoload { strcpy(path+strlen(path)-3, "png"); - ifnoload return; + ifnoload {}; } } } + silent_texture_load = old_silent_texture_load; } void preload_playermodels()