Skip to content

Commit 584f0ad

Browse files
committed
Updated online help link if VC redist missing.
Updated code comments in launchers.
1 parent d477991 commit 584f0ad

File tree

3 files changed

+21
-18
lines changed

3 files changed

+21
-18
lines changed

MTA10/ceflauncher/Main.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,17 @@
1111
#include <Windows.h>
1212
#include <string>
1313

14+
/*
15+
IMPORTANT
16+
17+
If this project changes, a new release build should be copied into
18+
the Shared\data\launchers directory.
19+
20+
The .exe in Shared\data\launchers will be used by the installer and updater.
21+
22+
(set flag.new_cef_exe on the build server to generate new exe)
23+
*/
24+
1425
int _declspec(dllimport) InitCEF ();
1526

1627
int WINAPI WinMain ( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdShow, int nCmdShow )

MTA10/launch/Main.cpp

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
IMPORTANT
1717
1818
If this project changes, a new release build should be copied into
19-
the launch/output diectory.
19+
the Shared\data\launchers directory.
2020
21-
The .exe in launch/output will be used by the installer and updater.
21+
The .exe in Shared\data\launchers will be used by the installer and updater.
2222
23-
(set flag.newexe on the build server to generate new exe)
23+
(set flag.new_client_exe on the build server to generate new exe)
2424
*/
2525

2626
///////////////////////////////////////////////////////////////
@@ -69,17 +69,9 @@ int WINAPI WinMain ( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLi
6969
SString strMessage ( "Failed to load: '%s'\n\n%s", *strLoaderDllPathFilename, *strError );
7070
AddReportLog ( 5711, strMessage );
7171

72-
// Check if runtime is loadable
73-
HMODULE hModule = LoadLibrary ( MSVCR_DLL );
74-
if ( hModule )
75-
{
76-
BrowseToSolution ( "loader-dll-missing", ASK_GO_ONLINE, strMessage );
77-
FreeLibrary ( hModule );
78-
}
79-
else
80-
{
81-
BrowseToSolution ( "launch-" MSVCR_DLL "-missing", ASK_GO_ONLINE, "Redistributable Packages for Visual Studio are not installed" );
82-
}
72+
// Error could be due to missing VC Redist.
73+
// Online help page will have VC Redist download link.
74+
BrowseToSolution ( "loader-dll-not-loadable", ASK_GO_ONLINE, strMessage );
8375
}
8476

8577
return iReturnCode;

MTA10_Server/launcher/Main.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
IMPORTANT (Windows only)
1515
1616
If this project changes, a new release build should be copied into
17-
the launcher/output diectory.
17+
the Shared\data\launchers directory.
1818
19-
The 'MTA Server.exe' in launcher/output will be used by the installer and updater.
19+
The .exe in Shared\data\launchers will be used by the installer and updater.
2020
21-
(set flag.new_server_exe on the build server to generate a new 'MTA Server.exe')
21+
(set flag.new_server_exe on the build server to generate new exe)
2222
*/
2323

2424
#include "CDynamicLibrary.h"
@@ -172,7 +172,7 @@ int main ( int argc, char* argv [] )
172172
printf ( "ERROR: Could not load %s\n", LIB_CORE );
173173
printf ( "* Check installed data files.\n" );
174174
#ifdef WIN32
175-
printf ( "* Check installed Microsoft Visual C++ 2013 Redistributable Package (x86).\n" );
175+
printf ( "* Check installed Microsoft Visual C++ Redistributable Package (x86).\n" );
176176
#endif
177177
}
178178

0 commit comments

Comments
 (0)