move mounting stuff

Author: ThePixelMoon

src/game/client/cdll_client_int.cpp

@@ -1070,6 +1070,11 @@ int CHLClient::Init( CreateInterfaceFn appSystemFactory, CreateInterfaceFn physi
 		return false;
 	if ( (filesystem = (IFileSystem *)appSystemFactory(FILESYSTEM_INTERFACE_VERSION, NULL)) == NULL )
 		return false;
+#ifdef OMOD
+	// mounting..
+	mountGames();
+	MountAddons();
+#endif
 	if ( (random = (IUniformRandomStream *)appSystemFactory(VENGINE_CLIENT_RANDOM_INTERFACE_VERSION, NULL)) == NULL )
 		return false;
 	if ( (gameuifuncs = (IGameUIFuncs * )appSystemFactory( VENGINE_GAMEUIFUNCS_VERSION, NULL )) == NULL )
@@ -1132,12 +1137,6 @@ int CHLClient::Init( CreateInterfaceFn appSystemFactory, CreateInterfaceFn physi
 	g_pBuildRenderablesJob->Init();
 #endif
 
-#ifdef OMOD
-	// mounting..
-	mountGames();
-	MountAddons();
-#endif
-
 #if defined( ALLOW_TEXT_MODE )
 	if (CommandLine()->FindParm("-textmode"))
 		g_bTextMode = true;

src/game/client/client_open.vpc

@@ -109,8 +109,8 @@ $Project "Client (OpenMod)"
 			$File	"openmod\dynamicsky.cpp"
 			$File	"openmod\dynamicsky.h"
 
-			$File	"openmod\mountsteamcontent.cpp"
-			$File	"openmod\mountsteamcontent.h"
+			$File	"$SRCDIR\game\shared\openmod\mountsteamcontent.cpp"
+			$File	"$SRCDIR\game\shared\openmod\mountsteamcontent.h"
 			$File	"$SRCDIR\game\shared\openmod\mountaddons.cpp"
 			$File	"$SRCDIR\game\shared\openmod\mountaddons.h"
 

src/game/server/gameinterface.cpp

@@ -136,6 +136,7 @@ extern ConVar tf_mm_servermode;
 
 #ifdef OMOD
 #include "mountaddons.h"
+#include "mountsteamcontent.h"
 #endif
 
 extern IToolFrameworkServer *g_pToolFrameworkServer;
@@ -612,6 +613,11 @@ bool CServerGameDLL::DLLInit( CreateInterfaceFn appSystemFactory,
 		return false;
 	if ( (filesystem = (IFileSystem *)fileSystemFactory(FILESYSTEM_INTERFACE_VERSION,NULL)) == NULL )
 		return false;
+#ifdef OMOD
+	// mounting..
+	mountGames();
+	MountAddons();
+#endif
 	if ( (gameeventmanager = (IGameEventManager2 *)appSystemFactory(INTERFACEVERSION_GAMEEVENTSMANAGER2,NULL)) == NULL )
 		return false;
 	if ( (datacache = (IDataCache*)appSystemFactory(DATACACHE_INTERFACE_VERSION, NULL )) == NULL )

src/game/server/server_open.vpc

@@ -249,6 +249,9 @@ $Project "Server (OpenMod)"
 			$File	"vehicle_choreo_generic.cpp"
 			$File	"hl2\vehicle_jeep.cpp"
 
+			$File	"$SRCDIR\game\shared\openmod\mountsteamcontent.cpp"
+			$File	"$SRCDIR\game\shared\openmod\mountsteamcontent.h"
+			
 			$File	"$SRCDIR\game\shared\openmod\weapon_toolgun.cpp"
 			$File	"$SRCDIR\game\shared\openmod\weapon_toolgun.h"
 

src/game/shared/hl2mp/hl2mp_gamerules.h

@@ -79,6 +79,10 @@ class HL2MPViewVectors : public CViewVectors
 	Vector m_vCrouchTraceMax;	
 };
 
+#ifdef GAME_DLL
+char* VarArgs(const char* format, ...);
+#endif
+
 class CHL2MPRules : public CTeamplayRules
 {
 public:

…ame/client/openmod/mountsteamcontent.cpp …ame/shared/openmod/mountsteamcontent.cppsrc/game/client/openmod/mountsteamcontent.cpp renamed to src/game/shared/openmod/mountsteamcontent.cpp src/game/client/openmod/mountsteamcontent.cpp renamed to src/game/shared/openmod/mountsteamcontent.cpp

@@ -18,6 +18,10 @@
 #include "vgui_controls/Label.h"
 #include "vgui/ISurface.h"
 
+#ifdef GAME_DLL // workaround for VarArgs
+#include "hl2mp_gamerules.h"
+#endif
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
@@ -195,8 +199,14 @@ void addSearchPathByAppId( int nAppId )
 
 void mountGames(void)
 {
-	KeyValues* pMainFile, * pFileSystemInfo;
+	KeyValues *pMainFile, *pFileSystemInfo;
+#ifdef CLIENT_DLL
 	const char* gamePath = engine->GetGameDirectory();
+#else
+	char gamePath[256];
+	engine->GetGameDir( gamePath, 256 );
+	Q_StripTrailingSlash( gamePath );
+#endif
 
 	pMainFile = new KeyValues("gamecontent.txt");
 	if (pMainFile->LoadFromFile(filesystem, VarArgs("%s/gamecontent.txt", gamePath), "MOD"))