From 9981dc622e30b42809df1aa3f73c3a7e4e2a34e7 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Tue, 24 Nov 2015 04:05:35 +0000
Subject: [PATCH] Move SysMissionDir to CGameArg

Both games support SysMissionDir.  Move it to the common structure.
---
 common/include/args.h | 2 +-
 similar/misc/args.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/include/args.h b/common/include/args.h
index 78b623f11..17613723f 100644
--- a/common/include/args.h
+++ b/common/include/args.h
@@ -71,13 +71,13 @@ struct CArg : prohibit_void_ptr<CArg>
 	bool DbgSafelog;
 	int DbgVerbose;
 	int SysMaxFPS;
+	std::string SysMissionDir;
 };
 
 #if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
 struct Arg : prohibit_void_ptr<Arg>
 {
 	std::string SysHogDir;
-	std::string SysMissionDir;
 	std::string SysPilot;
 	std::string SysRecordDemoNameTemplate;
 	bool SysShowCmdHelp;
diff --git a/similar/misc/args.cpp b/similar/misc/args.cpp
index c32e10305..3e2b105b4 100644
--- a/similar/misc/args.cpp
+++ b/similar/misc/args.cpp
@@ -202,7 +202,7 @@ static void ReadCmdArgs(Inilist &ini, Arglist &Args)
 			GameArg.SysHogDir = arg_string(pp, end);
 #if PHYSFS_VER_MAJOR >= 2
 		else if (!d_stricmp(p, "-add-missions-dir"))
-			GameArg.SysMissionDir = arg_string(pp, end);
+			CGameArg.SysMissionDir = arg_string(pp, end);
 #endif
 		else if (!d_stricmp(p, "-nohogdir"))
 		{
@@ -400,8 +400,8 @@ static void PostProcessGameArg()
 	else if (CGameArg.SysMaxFPS > MAXIMUM_FPS)
 		CGameArg.SysMaxFPS = MAXIMUM_FPS;
 #if PHYSFS_VER_MAJOR >= 2
-	if (!GameArg.SysMissionDir.empty())
-		PHYSFS_mount(GameArg.SysMissionDir.c_str(), MISSION_DIR, 1);
+	if (!CGameArg.SysMissionDir.empty())
+		PHYSFS_mount(CGameArg.SysMissionDir.c_str(), MISSION_DIR, 1);
 #endif
 
 	static char sdl_disable_lock_keys[] = "SDL_DISABLE_LOCK_KEYS=0";