loader/gamedll.cpp
changeset 637 b66489d8aedc
parent 608 30b546cc4e03
child 681 a9f34c9f06e7
     1.1 --- a/loader/gamedll.cpp	Mon Feb 16 18:13:31 2009 -0500
     1.2 +++ b/loader/gamedll.cpp	Wed Feb 18 01:38:23 2009 -0600
     1.3 @@ -36,17 +36,14 @@
     1.4  #include <sh_memory.h>
     1.5  #include "utility.h"
     1.6  #include "gamedll.h"
     1.7 -#include "valve_commandline.h"
     1.8 -
     1.9 -#undef GetCommandLine
    1.10  
    1.11  class IServerGameDLL;
    1.12 -typedef ICommandLine *(*GetCommandLine)();
    1.13  
    1.14  #define MAX_GAMEDLL_PATHS	10
    1.15  
    1.16  IGameDllBridge* gamedll_bridge = NULL;
    1.17  static int game_info_detected = 0;
    1.18 +static const char *game_name = NULL;
    1.19  static char gamedll_paths[MAX_GAMEDLL_PATHS][PLATFORM_MAX_PATH];
    1.20  static void *gamedll_libs[MAX_GAMEDLL_PATHS];
    1.21  static unsigned int gamedll_path_count = 0;
    1.22 @@ -57,24 +54,15 @@
    1.23  static int isgd_shutdown_index = -1;
    1.24  
    1.25  #if defined _WIN32
    1.26 -#define TIER0_NAME			"bin\\tier0.dll"
    1.27 -#define VSTDLIB_NAME		"bin\\vstdlib.dll"
    1.28  #define SERVER_NAME			"server.dll"
    1.29  #elif defined __linux__
    1.30 -#define TIER0_NAME			"bin/tier0_i486.so"
    1.31 -#define VSTDLIB_NAME		"bin/vstdlib_i486.so"
    1.32  #define SERVER_NAME			"server_i486.so"
    1.33  #endif
    1.34  
    1.35  static bool
    1.36  mm_DetectGameInformation()
    1.37  {
    1.38 -	void *lib;
    1.39 -	char error[255];
    1.40 -	GetCommandLine valve_cmdline;
    1.41  	char mm_path[PLATFORM_MAX_PATH];
    1.42 -	char lib_path[PLATFORM_MAX_PATH];
    1.43 -	char game_name[PLATFORM_MAX_PATH];
    1.44  	char game_path[PLATFORM_MAX_PATH];
    1.45  
    1.46  	if (game_info_detected)
    1.47 @@ -82,43 +70,8 @@
    1.48  
    1.49  	game_info_detected = -1;
    1.50  
    1.51 -	if (!mm_ResolvePath(TIER0_NAME, lib_path, sizeof(lib_path)))
    1.52 -	{
    1.53 -		mm_LogFatal("Could not find path for: " TIER0_NAME);
    1.54 -		return false;
    1.55 -	}
    1.56 -
    1.57 -	if ((lib = mm_LoadLibrary(lib_path, error, sizeof(error))) == NULL)
    1.58 -	{
    1.59 -		mm_LogFatal("Could not load %s: %s", lib_path, error);
    1.60 -		return false;
    1.61 -	}
    1.62 -
    1.63 -	valve_cmdline = (GetCommandLine)mm_GetLibAddress(lib, "CommandLine_Tier0");
    1.64 -	if (valve_cmdline == NULL)
    1.65 +	if ((game_name = mm_GetGameName()) == NULL)
    1.66  	{
    1.67 -		/* We probably have a Ship engine. */
    1.68 -		mm_UnloadLibrary(lib);
    1.69 -		if (!mm_ResolvePath(VSTDLIB_NAME, lib_path, sizeof(lib_path)))
    1.70 -		{
    1.71 -			mm_LogFatal("Could not find path for: " VSTDLIB_NAME);
    1.72 -			return false;
    1.73 -		}
    1.74 -
    1.75 -		if ((lib = mm_LoadLibrary(lib_path, error, sizeof(error))) == NULL)
    1.76 -		{
    1.77 -			mm_LogFatal("Could not load %s: %s", lib_path, error);
    1.78 -			return false;
    1.79 -		}
    1.80 -
    1.81 -		valve_cmdline = (GetCommandLine)mm_GetLibAddress(lib, "CommandLine");
    1.82 -	}
    1.83 -
    1.84 -	mm_UnloadLibrary(lib);
    1.85 -
    1.86 -	if (valve_cmdline == NULL)
    1.87 -	{
    1.88 -		mm_LogFatal("Could not locate any command line functionality");
    1.89  		return false;
    1.90  	}
    1.91  
    1.92 @@ -128,10 +81,6 @@
    1.93  		return false;
    1.94  	}
    1.95  
    1.96 -	mm_Format(game_name,
    1.97 -			  sizeof(game_name),
    1.98 -			  "%s",
    1.99 -			  valve_cmdline()->ParmValue("-game", "hl2"));
   1.100  	if (!mm_ResolvePath(game_name, game_path, sizeof(game_path)))
   1.101  	{
   1.102  		mm_LogFatal("Could not resolve path: %s", game_name);
   1.103 @@ -261,7 +210,7 @@
   1.104  						 QueryValveInterface fileSystemFactory, 
   1.105  						 void *pGlobals)
   1.106  	{
   1.107 -		MetamodBackend backend = mm_DetermineBackend(engineFactory);
   1.108 +		MetamodBackend backend = mm_DetermineBackend(engineFactory, game_name);
   1.109  
   1.110  		char error[255];
   1.111  		if (backend == MMBackend_UNKNOWN)