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

rollerozxa · web-flow · commit 6fedee16f098 · 2021-09-15T11:12:24.000+01:00
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ static bool replace_ext(std::string &path, const char *ext)`
`81`	`81`	`std::string getImagePath(std::string path)`
`82`	`82`	`{`
`83`	`83`	`// A NULL-ended list of possible image extensions`
`84`		`- const char *extensions[] = { "png", "jpg", "bmp", NULL };`
	`84`	`+ const char *extensions[] = { "png", "jpg", "bmp", "tga", NULL };`
`85`	`85`	`// If there is no extension, assume PNG`
`86`	`86`	`if (removeStringEnd(path, extensions).empty())`
`87`	`87`	`path = path + ".png";`
Original file line number	Diff line number	Diff line change
`@@ -2453,7 +2453,7 @@ bool Server::addMediaFile(const std::string &filename,`
`2453`	`2453`	`}`
`2454`	`2454`	`// If name is not in a supported format, ignore it`
`2455`	`2455`	`const char *supported_ext[] = {`
`2456`		`- ".png", ".jpg", ".bmp",`
	`2456`	`+ ".png", ".jpg", ".bmp", ".tga",`
`2457`	`2457`	`".ogg",`
`2458`	`2458`	`".x", ".b3d", ".obj",`
`2459`	`2459`	`// Custom translation file format`