Fixed Linux server startup error message formatting

Author: ccw808

MTA10_Server/core/CDynamicLibrary.cpp

@@ -95,7 +95,7 @@ bool CDynamicLibrary::Load ( const char* szFilename )
             if ( szError )
                 Print ( "%s\n", szError );
             else
-                printf ( "Loading %s failed\n", szFilename );
+                Print ( "Loading %s failed\n", szFilename );
         }
     #endif
 
@@ -160,7 +160,7 @@ FuncPtr_t CDynamicLibrary::GetProcedureAddress ( const char* szProcName )
 
 bool CDynamicLibrary::CheckMtaVersion( const char* szLibName )
 {
-#if MTASA_VERSION_TYPE == VERSION_TYPE_RELEASE
+#if MTASA_VERSION_TYPE >= VERSION_TYPE_UNSTABLE
 // define MTASA_SKIP_VERSION_CHECKS in "build_overrides_s.h" to skip version checks
 #ifndef MTASA_SKIP_VERSION_CHECKS
 
@@ -179,7 +179,7 @@ bool CDynamicLibrary::CheckMtaVersion( const char* szLibName )
     if ( strVersionCore != buffer )
     {
         Print( "ERROR: '%s' library version is '%s' (Expected '%s')\n", szLibName, buffer, *strVersionCore );
-        Print( "Reinstall MTA\n" );
+        Print( "\n** REINSTALL MTA **\n" );
         return false;
     }
 

MTA10_Server/core/CServerImpl.cpp

@@ -27,10 +27,6 @@
 #else
     #include <termios.h>
     #include <unistd.h>
-
-    // This is probably safer than changing MTAPlatform.h against compatibility issues
-    #undef Print
-    #define Print printf
 #endif
 
 // Define libraries
@@ -47,6 +43,7 @@ bool g_bNoCrashHandler = false;
     bool g_bDaemonized = false;
     WINDOW* m_wndMenu = NULL;
     WINDOW* m_wndInput = NULL;
+    bool IsCursesActive( void )     { return m_wndInput != NULL; }
 #endif
 
 #ifdef WIN32
@@ -120,7 +117,7 @@ void CServerImpl::Printf ( const char* szFormat, ... )
 #ifdef WIN32
         vprintf ( szFormat, ap );
 #else
-        if(!g_bNoCurses)
+        if( IsCursesActive() )
             vwprintw ( stdscr, szFormat, ap );
         else
             vprintf ( szFormat, ap );
@@ -308,7 +305,7 @@ int CServerImpl::Run ( int iArgumentCount, char* szArguments [] )
 
     // Welcome text
     if ( !g_bSilent )
-        Print ( "MTA:BLUE Server for MTA:SA\r\n\r\n" );
+        Print ( "MTA:BLUE Server for MTA:SA\n\n" );
 
     // Load the network DLL
     if ( m_NetworkLibrary.Load ( PathJoin ( m_strServerPath, SERVER_BIN_PATH, szNetworkLibName ) ) )
@@ -322,10 +319,10 @@ int CServerImpl::Run ( int iArgumentCount, char* szArguments [] )
             ulong ulNetModuleVersion = 0;
             if ( pfnCheckCompatibility )
                 pfnCheckCompatibility ( 1, &ulNetModuleVersion );
-            Print ( "Network module not compatible! (Expected 0x%x, got 0x%x)\n\r", MTA_DM_SERVER_NET_MODULE_VERSION, (uint)ulNetModuleVersion );
-            Print ( "Press Q to shut down the server!\n\r" );
-            Print ( "\n\r\n\r\n\r(If this is a custom build,\n\r" );
-            Print ( " check MTASA_VERSION_TYPE in version.h is set correctly)\n\r" );
+            Print ( "Network module not compatible! (Expected 0x%x, got 0x%x)\n", MTA_DM_SERVER_NET_MODULE_VERSION, (uint)ulNetModuleVersion );
+            Print ( "Press Q to shut down the server!\n" );
+            Print ( "\n\n\n(If this is a custom build,\n" );
+            Print ( " check MTASA_VERSION_TYPE in version.h is set correctly)\n" );
             WaitForKey ( 'q' );
             DestroyWindow ( );
             return ERROR_NETWORK_LIBRARY_FAILED;
@@ -991,7 +988,7 @@ void CServerImpl::DestroyWindow ( void )
 
 void WaitForKey ( int iKey )
 {
-    if ( !g_bSilent )
+    if ( !g_bSilent && !g_bNoCurses )
     {
         for ( ;; )
         {
@@ -1006,3 +1003,24 @@ void WaitForKey ( int iKey )
         }
     }
 }
+
+// Always print these messages
+void Print ( const char* szFormat, ... )
+{
+    va_list ap;
+    va_start ( ap, szFormat );
+
+    SString str;
+    str.vFormat ( szFormat, ap );
+
+#ifdef WIN32
+    printf ( "%s", *str );
+#else
+    if( IsCursesActive() )
+        printw ( "%s", *str );
+    else
+        printf ( "%s", *str );
+#endif
+
+    va_end ( ap );
+}

MTA10_Server/core/StdInc.h

@@ -24,3 +24,4 @@
 #endif
 
 void WaitForKey ( int iKey );
+void Print ( const char* szFormat, ... );

MTA10_Server/sdk/MTAPlatform.h

@@ -58,9 +58,6 @@ extern "C" bool g_bNoTopBar;
     #include <direct.h>
     #include <windows.h>
 
-    // Define functions
-    #define Print printf
-
     // Define types
     typedef int socklen_t;
 
@@ -94,7 +91,6 @@ extern "C" bool g_bNoTopBar;
     #endif
 
     #define MAX_PATH 255
-    #define Print printw
 
     #ifndef stricmp
     #define stricmp strcasecmp