Skip to content

Commit

Permalink
Readd TGA to the list of valid texture formats. (#11598)
Browse files Browse the repository at this point in the history
  • Loading branch information
rollerozxa committed Sep 15, 2021
1 parent 719a12e commit 6fedee1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/client/tile.cpp
Expand Up @@ -81,7 +81,7 @@ static bool replace_ext(std::string &path, const char *ext)
std::string getImagePath(std::string path)
{
// 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 (removeStringEnd(path, extensions).empty())
path = path + ".png";
Expand Down
2 changes: 1 addition & 1 deletion src/server.cpp
Expand Up @@ -2453,7 +2453,7 @@ bool Server::addMediaFile(const std::string &filename,
}
// If name is not in a supported format, ignore it
const char *supported_ext[] = {
".png", ".jpg", ".bmp",
".png", ".jpg", ".bmp", ".tga",
".ogg",
".x", ".b3d", ".obj",
// Custom translation file format
Expand Down

0 comments on commit 6fedee1

Please sign in to comment.