diff --git a/src/openrct2-cli/Cli.cpp b/src/openrct2-cli/Cli.cpp index 672bb47f87..fbbd0e8028 100644 --- a/src/openrct2-cli/Cli.cpp +++ b/src/openrct2-cli/Cli.cpp @@ -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; diff --git a/src/openrct2-dll/openrct2-dll.cpp b/src/openrct2-dll/openrct2-dll.cpp index e5122dd03e..df97b86a42 100644 --- a/src/openrct2-dll/openrct2-dll.cpp +++ b/src/openrct2-dll/openrct2-dll.cpp @@ -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(argv)); FreeCommandLineArgs(argc, argv); return exitCode; diff --git a/src/openrct2-ui/Ui.cpp b/src/openrct2-ui/Ui.cpp index f9c00db3a8..0c31fcb529 100644 --- a/src/openrct2-ui/Ui.cpp +++ b/src/openrct2-ui/Ui.cpp @@ -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(); diff --git a/src/openrct2-ui/Ui.h b/src/openrct2-ui/Ui.h index a4ecd9f9c7..de7d02103d 100644 --- a/src/openrct2-ui/Ui.h +++ b/src/openrct2-ui/Ui.h @@ -15,5 +15,5 @@ #pragma endregion #ifdef _MSC_VER - int NormalisedMain(int argc, char * * argv); + int NormalisedMain(int argc, const char * * argv); #endif diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 30bec5c0cc..acc148ac30 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -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()) { diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index 61b7ebde8a..f0fc9a122b 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -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;