changeset 14338:9131228e1ebb draft

(svn r18891) -Fix: Avoid duplicate path separator when searching for PNG files which prevented tar-lookups.
author peter1138 <peter1138@openttd.org>
date Fri, 22 Jan 2010 23:55:20 +0000
parents 70f56511ebee
children e487dbe8736f
files src/spriteloader/png.cpp
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/spriteloader/png.cpp
+++ b/src/spriteloader/png.cpp
@@ -39,7 +39,9 @@
 {
 	char png_file[MAX_PATH];
 
-	snprintf(png_file, sizeof(png_file), "sprites" PATHSEP "%s" PATHSEP "%d%s.png", filename, id, mask ? "m" : "");
+	/* Add path separator after 'sprites' if not present */
+	const char *sep = (filename[0] == PATHSEPCHAR) ? "" : PATHSEP;
+	snprintf(png_file, sizeof(png_file), "sprites%s%s" PATHSEP "%d%s.png", sep, filename, id, mask ? "m" : "");
 	if (FioCheckFileExists(png_file)) {
 		FioOpenFile(PNG_SLOT, png_file);
 		return true;