Updated online help link if VC redist missing.

Updated code comments in launchers.
multitheftauto · Jul 9, 2016 · 584f0ad · 584f0ad
1 parent d477991
commit 584f0ad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/MTA10/ceflauncher/Main.cpp b/MTA10/ceflauncher/Main.cpp
@@ -11,6 +11,17 @@
 #include <Windows.h>
 #include <string>
 
+/*
+    IMPORTANT
+
+    If this project changes, a new release build should be copied into
+    the Shared\data\launchers directory.
+
+    The .exe in Shared\data\launchers will be used by the installer and updater.
+
+    (set flag.new_cef_exe on the build server to generate new exe)
+*/
+
 int _declspec(dllimport) InitCEF ();
 
 int WINAPI WinMain ( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow )

diff --git a/MTA10/launch/Main.cpp b/MTA10/launch/Main.cpp
@@ -16,11 +16,11 @@
     IMPORTANT
 
     If this project changes, a new release build should be copied into
-    the launch/output diectory.
+    the Shared\data\launchers directory.
 
-    The .exe in launch/output will be used by the installer and updater.
+    The .exe in Shared\data\launchers will be used by the installer and updater.
 
-    (set flag.newexe on the build server to generate new exe)
+    (set flag.new_client_exe on the build server to generate new exe)
 */
 
 ///////////////////////////////////////////////////////////////
@@ -69,17 +69,9 @@ int WINAPI WinMain ( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
         SString strMessage ( "Failed to load: '%s'\n\n%s", *strLoaderDllPathFilename, *strError );
         AddReportLog ( 5711, strMessage );
 
-        // Check if runtime is loadable
-        HMODULE hModule = LoadLibrary ( MSVCR_DLL );
-        if ( hModule )
-        {
-            BrowseToSolution ( "loader-dll-missing", ASK_GO_ONLINE, strMessage );
-            FreeLibrary ( hModule );
-        }
-        else
-        {
-            BrowseToSolution ( "launch-" MSVCR_DLL "-missing", ASK_GO_ONLINE, "Redistributable Packages for Visual Studio are not installed" );     
-        }
+        // Error could be due to missing VC Redist.
+        // Online help page will have VC Redist download link.
+        BrowseToSolution ( "loader-dll-not-loadable", ASK_GO_ONLINE, strMessage );
     }
 
     return iReturnCode;

diff --git a/MTA10_Server/launcher/Main.cpp b/MTA10_Server/launcher/Main.cpp
@@ -14,11 +14,11 @@
     IMPORTANT (Windows only)
 
     If this project changes, a new release build should be copied into
-    the launcher/output diectory.
+    the Shared\data\launchers directory.
 
-    The 'MTA Server.exe' in launcher/output will be used by the installer and updater.
+    The .exe in Shared\data\launchers will be used by the installer and updater.
 
-    (set flag.new_server_exe on the build server to generate a new 'MTA Server.exe')
+    (set flag.new_server_exe on the build server to generate new exe)
 */
 
 #include "CDynamicLibrary.h"
@@ -172,7 +172,7 @@ int main ( int argc, char* argv [] )
         printf ( "ERROR: Could not load %s\n", LIB_CORE );
         printf ( "* Check installed data files.\n" );
 #ifdef WIN32
-        printf ( "* Check installed Microsoft Visual C++ 2013 Redistributable Package (x86).\n" );
+        printf ( "* Check installed Microsoft Visual C++ Redistributable Package (x86).\n" );
 #endif
     }