Corrected an issue that prevented changing default languages

The script->get_translation_file_name() is more robust (and actually
works) now.

Signed-off-by: Haru <haru@dotalux.com>

1 files changed, 26 insertions, 12 deletions

diff --git a/src/map/script.c b/src/map/script.c
index a6a9a9cf9..64966f987 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -4910,28 +4910,42 @@ void script_load_translations(void) {
 }
 
 /**
+ * Generates a language name from a translation filename.
  *
- **/
+ * @param file The filename.
+ * @return The corresponding translation name.
+ */
 const char *script_get_translation_file_name(const char *file)
 {
-	int i, len = (int)strlen(file), last_bar = -1, last_dot = -1;
+	const char *basename = NULL, *last_dot = NULL;
+
+	nullpo_retr("Unknown", file);
 
-	for(i = 0; i < len; i++) {
-		if( file[i] == '/' || file[i] == '\\' )
-			last_bar = i;
-		else if ( file[i] == '.' )
-			last_dot = i;
+	basename = strrchr(file, '/');;
+#ifdef WIN32
+	{
+		const char *basename_windows = strrchr(file, '\\');
+		if (basename_windows > basename)
+			basename = basename_windows;
 	}
+#endif // WIN32
+	if (basename == NULL)
+		basename = file;
+	else
+		basename++; // Skip slash
+	Assert_retr("Unknown", *basename != '\0');
 
-	if( last_bar != -1 || last_dot != -1 ) {
+	last_dot = strrchr(basename, '.');
+	if (last_dot != NULL) {
 		static char file_name[200];
-		if( last_bar != -1 && last_dot < last_bar )
-			last_dot = -1;
-		safestrncpy(file_name, file+(last_bar >= 0 ? last_bar+1 : 0), ( last_dot >= 0 ? ( last_bar >= 0 ? last_dot - last_bar : last_dot ) : sizeof(file_name) ));
+		if (last_dot == basename)
+			return basename + 1;
+
+		safestrncpy(file_name, basename, last_dot - basename + 1);
 		return file_name;
 	}
 
-	return file;
+	return basename;
 }
 
 /**