Consolidate FileExists usage in logic bin (bug 5931, r=asherkin).
authorNicholas Hastings <skamonkey@gmail.com>
Tue Jan 07 14:24:41 2014 -0500 (2014-01-07)
changeset 4198d6f90552ca85
parent 4197 bc5ebfdd07f9
child 4199 6e0c63e83c8a
Consolidate FileExists usage in logic bin (bug 5931, r=asherkin).
core/logic/intercom.h
core/logic/smn_filesystem.cpp
core/logic_bridge.cpp
     1.1 --- a/core/logic/intercom.h	Tue Jan 07 10:24:44 2014 -0500
     1.2 +++ b/core/logic/intercom.h	Tue Jan 07 14:24:41 2014 -0500
     1.3 @@ -251,7 +251,6 @@
     1.4  	void			(*Log)(const char*, ...);
     1.5  	void			(*LogToFile)(FILE *fp, const char*, ...);
     1.6  	void			(*LogToGame)(const char *message);
     1.7 -	bool			(*FileExists)(const char *path);
     1.8  	const char *	(*GetCvarString)(ConVar*);
     1.9  	size_t			(*Format)(char*, size_t, const char*, ...);
    1.10  	size_t			(*FormatArgs)(char*, size_t, const char*,va_list ap);
     2.1 --- a/core/logic/smn_filesystem.cpp	Tue Jan 07 10:24:44 2014 -0500
     2.2 +++ b/core/logic/smn_filesystem.cpp	Tue Jan 07 14:24:41 2014 -0500
     2.3 @@ -322,7 +322,7 @@
     2.4  
     2.5  	if (params[0] >= 2 && params[2] == 1)
     2.6  	{
     2.7 -		return smcore.FileExists(name) ? 1 : 0;
     2.8 +		return smcore.filesystem->FileExists(name) ? 1 : 0;
     2.9  	}
    2.10  
    2.11  	char realpath[PLATFORM_MAX_PATH];
     3.1 --- a/core/logic_bridge.cpp	Tue Jan 07 10:24:44 2014 -0500
     3.2 +++ b/core/logic_bridge.cpp	Tue Jan 07 14:24:41 2014 -0500
     3.3 @@ -187,11 +187,6 @@
     3.4  	Engine_LogPrintWrapper(message);
     3.5  }
     3.6  
     3.7 -static bool file_exists(const char *path)
     3.8 -{
     3.9 -	return basefilesystem->FileExists(path);
    3.10 -}
    3.11 -
    3.12  static const char *get_cvar_string(ConVar* cvar)
    3.13  {
    3.14  	return cvar->GetString();
    3.15 @@ -431,7 +426,6 @@
    3.16  	log_message,
    3.17  	log_to_file,
    3.18  	log_to_game,
    3.19 -	file_exists,
    3.20  	get_cvar_string,
    3.21  	UTIL_Format,
    3.22  	UTIL_FormatArgs,