Merge commit 'e7c45da823515747a88569374d62717b72dcf078' into garux-merge

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

diff --git a/radiant/environment.cpp b/radiant/environment.cpp
index a84a7d42bc7ba0b10fc25b465aa2098fbff582ae..a1a13b8686442e5faf01f6fdb7582ec56ae502cd 100644 (file)
--- a/radiant/environment.cpp
+++ b/radiant/environment.cpp
@@ -188,6 +188,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>
@@ -259,24 +273,13 @@ void environment_init( int argc, char const* argv[] ){
                home_path = home.c_str();
        }
        gamedetect();
+       cmdMap();
 }
 
 #elif GDEF_OS_WINDOWS
 
 #include <windows.h>
 
-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" ) ){
-                       openCmdMap = g_argv[i];
-               }
-       }
-}
-
 void environment_init( int argc, char const* argv[] ){
        args_init( argc, argv );