From 8c19eea12f5f527530b89a12e66f7aa48ad2bdd3 Mon Sep 17 00:00:00 2001
From: AlexCS1337 <alexander.carlos.silva@gmail.com>
Date: Thu, 1 Aug 2024 15:07:10 +1000
Subject: [PATCH] Fix merge conflit

---
 codemp/qcommon/files.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/codemp/qcommon/files.cpp b/codemp/qcommon/files.cpp
index 0d12e336e4..bc96e33532 100644
--- 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 "";