diff options
| author | ROllerozxa <temporaryemail4meh+github@gmail.com> | 2021-09-15 12:12:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-15 11:12:24 +0100 |
| commit | 6fedee16f098549ffaee188b02b777239513abc3 (patch) | |
| tree | 081521a2ca8c94d717d9797228e68bd68635805d /src | |
| parent | 719a12ecac1c5363612e0c230eae411bdb3fe058 (diff) | |
| download | minetest-6fedee16f098549ffaee188b02b777239513abc3.tar.gz minetest-6fedee16f098549ffaee188b02b777239513abc3.tar.bz2 minetest-6fedee16f098549ffaee188b02b777239513abc3.zip | |
Readd TGA to the list of valid texture formats. (#11598)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/tile.cpp | 2 | ||||
| -rw-r--r-- | src/server.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 15ae5472d..a31e3aca1 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -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"; diff --git a/src/server.cpp b/src/server.cpp index 8474bc6f1..7fb9a78e9 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -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 |