Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / radiant / environment.cpp

diff --git a/radiant/environment.cpp b/radiant/environment.cpp
index e9cf2dc513e6f40f5cb986055fea64049435ab7b..1e02a14153336f81fdb408ae11cc2b4d51b25b85 100644 (file)
--- a/radiant/environment.cpp
+++ b/radiant/environment.cpp
@@ -209,6 +209,20 @@ bool portable_app_setup(){
        return false;
 }
 
+
+const char* openCmdMap;
+
+void cmdMap(){
+       openCmdMap = NULL;
+       for ( int i = 1; i < g_argc; ++i )
+       {
+               //if ( !stricmp( g_argv[i] + strlen(g_argv[i]) - 4, ".map" ) ){
+               if( string_equal_suffix_nocase( g_argv[i], ".map" ) ){
+                       openCmdMap = g_argv[i];
+               }
+       }
+}
+
 #if GDEF_OS_POSIX
 
 #include <stdlib.h>
@@ -337,24 +351,13 @@ void environment_init( int argc, char const* argv[] ){
        }
 
        gamedetect();
+       cmdMap();
 }
 
 #elif GDEF_OS_WINDOWS
 
 #include <windows.h>
 
-char openCmdMap[260];
-
-void cmdMap(){
-       openCmdMap[0] = '\0';
-       for ( int i = 1; i < g_argc; ++i )
-       {
-               if ( !stricmp( g_argv[i] + strlen(g_argv[i]) - 4, ".map" ) ){
-                       strcpy( openCmdMap, g_argv[i] );
-               }
-       }
-}
-
 void environment_init( int argc, char const* argv[] ){
        args_init( argc, argv );