cpp/openttd-patchpack/source File Diff

File diff r6934:b83649dffc1d → r6935:a7744b917c21

src/fileio.cpp

➞

Show inline comments

@@ @@ -279,7 +279,7 @@ FILE *FioFOpenFileSp(const char *filenam @@
 	FILE *f = NULL;
 	char buf[MAX_PATH];
-	if (subdir == BASE_DIR) {
+	if (subdir == NO_DIRECTORY) {
 		ttd_strlcpy(buf, filename, lengthof(buf));
 	} else {
 		snprintf(buf, lengthof(buf), "%s%s%s", _searchpaths[sp], _subdirs[subdir], filename);
@@ @@ -301,11 +301,11 @@ FILE *FioFOpenFile(const char *filename, @@
 	FILE *f = NULL;
 	Searchpath sp;
 	assert(subdir < NUM_SUBDIRS);
+	assert(subdir < NUM_SUBDIRS || subdir == NO_DIRECTORY);
 	FOR_ALL_SEARCHPATHS(sp) {
 		f = FioFOpenFileSp(filename, mode, sp, subdir);
-		if (f != NULL || subdir == 0) break;
+		if (f != NULL || subdir == NO_DIRECTORY) break;
+	}
 	return f;