Fix arguments to main()

This commit is contained in:
Arnav Borborah 2017-10-16 18:04:40 -04:00 committed by Michał Janiszewski
parent 6a66ef8668
commit 8271da85a2
6 changed files with 8 additions and 8 deletions

View File

@ -24,10 +24,10 @@ using namespace OpenRCT2;
/**
* Main entry point for non-Windows sytems. Windows instead uses its own DLL proxy.
*/
int main(int argc, char * * argv)
int main(int argc, const char * * argv)
{
core_init();
int runGame = cmdline_run((const char * *)argv, argc);
int runGame = cmdline_run(argv, argc);
if (runGame == 1)
{
gOpenRCT2Headless = true;

View File

@ -50,7 +50,7 @@ DLLEXPORT int LaunchOpenRCT2(int argc, wchar_t * * argvW)
return -1;
}
int exitCode = NormalisedMain(argc, argv);
int exitCode = NormalisedMain(argc, const_cast<const char * *>(argv));
FreeCommandLineArgs(argc, argv);
return exitCode;

View File

@ -33,9 +33,9 @@ using namespace OpenRCT2::Ui;
* Main entry point for non-Windows sytems. Windows instead uses its own DLL proxy.
*/
#ifdef _MSC_VER
int NormalisedMain(int argc, char * * argv)
int NormalisedMain(int argc, const char * * argv)
#else
int main(int argc, char * * argv)
int main(int argc, const char * * argv)
#endif
{
core_init();

View File

@ -15,5 +15,5 @@
#pragma endregion
#ifdef _MSC_VER
int NormalisedMain(int argc, char * * argv);
int NormalisedMain(int argc, const char * * argv);
#endif

View File

@ -150,7 +150,7 @@ namespace OpenRCT2
return _uiContext;
}
sint32 RunOpenRCT2(int argc, char * * argv) override
sint32 RunOpenRCT2(int argc, const char * * argv) override
{
if (Initialise())
{

View File

@ -84,7 +84,7 @@ namespace OpenRCT2
virtual Audio::IAudioContext * GetAudioContext() abstract;
virtual Ui::IUiContext * GetUiContext() abstract;
virtual sint32 RunOpenRCT2(int argc, char * * argv) abstract;
virtual sint32 RunOpenRCT2(int argc, const char * * argv) abstract;
virtual bool Initialise() abstract;
virtual bool LoadParkFromFile(const std::string &path, bool loadTitleScreenOnFail = false) abstract;