mirror of https://github.com/OpenRCT2/OpenRCT2.git
Fix arguments to main()
This commit is contained in:
parent
6a66ef8668
commit
8271da85a2
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -15,5 +15,5 @@
|
|||
#pragma endregion
|
||||
|
||||
#ifdef _MSC_VER
|
||||
int NormalisedMain(int argc, char * * argv);
|
||||
int NormalisedMain(int argc, const char * * argv);
|
||||
#endif
|
||||
|
|
|
@ -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())
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue