From e33f7f751b92d98a855cae0b000fd17c944367ec Mon Sep 17 00:00:00 2001 From: Kp Date: Tue, 24 Nov 2015 04:05:35 +0000 Subject: [PATCH] Move SysShowCmdHelp to CGameArg Both games support SysShowCmdHelp. Move it to the common structure. --- common/include/args.h | 2 +- similar/main/inferno.cpp | 2 +- similar/misc/args.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/include/args.h b/common/include/args.h index c30d85772..06989ea56 100644 --- a/common/include/args.h +++ b/common/include/args.h @@ -72,6 +72,7 @@ struct CArg : prohibit_void_ptr #if defined(__unix__) bool SysNoHogDir; #endif + bool SysShowCmdHelp; int DbgVerbose; int SysMaxFPS; std::string SysMissionDir; @@ -83,7 +84,6 @@ struct Arg : prohibit_void_ptr std::string SysHogDir; std::string SysPilot; std::string SysRecordDemoNameTemplate; - bool SysShowCmdHelp; bool SysNoNiceFPS; bool SysUsePlayersDir; bool SysLowMem; diff --git a/similar/main/inferno.cpp b/similar/main/inferno.cpp index 63a3ddaa6..acf4b8546 100644 --- a/similar/main/inferno.cpp +++ b/similar/main/inferno.cpp @@ -357,7 +357,7 @@ int main(int argc, char *argv[]) freopen( "CON", "w", stderr ); #endif - if (GameArg.SysShowCmdHelp) { + if (CGameArg.SysShowCmdHelp) { print_commandline_help(); return(0); diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp index 1874eddc9..2c704791e 100644 --- a/similar/misc/args.cpp +++ b/similar/misc/args.cpp @@ -193,7 +193,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args) // System Options if (!d_stricmp(p, "-help") || !d_stricmp(p, "-h") || !d_stricmp(p, "-?") || !d_stricmp(p, "?")) - GameArg.SysShowCmdHelp = 1; + CGameArg.SysShowCmdHelp = true; else if (!d_stricmp(p, "-nonicefps")) GameArg.SysNoNiceFPS = 1; else if (!d_stricmp(p, "-maxfps"))