Fix merge conflit

AlexCS1337 · Aug 1, 2024 · 8c19eea · 8c19eea
1 parent 44c52bc
commit 8c19eea
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/codemp/qcommon/files.cpp b/codemp/qcommon/files.cpp
@@ -314,6 +314,12 @@ FILE*		missingFiles = NULL;
 #  endif
 #endif
 
+const char *get_filename(const char *path) {
+	const char *slash = strrchr(path, PATH_SEP);
+	if (!slash || slash == path) return "";
+	return slash + 1;
+}
+
 const char *get_filename_ext(const char *filename) {
 	const char *dot = strrchr(filename, '.');
 	if (!dot || dot == filename) return "";