BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Readd TGA to the list of valid texture formats. (#11598)

Browse Source
This commit is contained in:
ROllerozxa 2021-09-15 12:12:24 +02:00 committed by GitHub
parent 719a12ecac
commit 6fedee16f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/tile.cpp
View File

@ -81,7 +81,7 @@ static bool replace_ext(std::string &path, const char *ext)
std::string getImagePath(std::string path) std::string getImagePath(std::string path)
{ {
// A NULL-ended list of possible image extensions // A NULL-ended list of possible image extensions
const char *extensions[] = { "png", "jpg", "bmp", NULL }; const char *extensions[] = { "png", "jpg", "bmp", "tga", NULL };
// If there is no extension, assume PNG // If there is no extension, assume PNG
if (removeStringEnd(path, extensions).empty()) if (removeStringEnd(path, extensions).empty())
path = path + ".png"; path = path + ".png";

2
src/server.cpp
View File

@ -2453,7 +2453,7 @@ bool Server::addMediaFile(const std::string &filename,
} }
// If name is not in a supported format, ignore it // If name is not in a supported format, ignore it
const char *supported_ext[] = { const char *supported_ext[] = {
".png", ".jpg", ".bmp", ".png", ".jpg", ".bmp", ".tga",
".ogg", ".ogg",
".x", ".b3d", ".obj", ".x", ".b3d", ".obj",
// Custom translation file format // Custom translation file format