tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small fix for a crash that I added at the last moment... 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5056 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2017-02-11 17:16:51 +00:00
parent 3061ed448f
commit 7bfb3b56fa
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/client/cl_main.c
View File

@ -5660,6 +5660,9 @@ void Host_FinishLoading(void)
r_blockvidrestart = 2;
Menu_Download_Update();
IPLog_Merge_File("iplog.txt");
IPLog_Merge_File("iplog.dat"); //legacy crap, for compat with proquake
}
#ifdef ANDROID

2
engine/common/fs.c
View File

@ -1666,7 +1666,7 @@ qboolean FS_NativePath(const char *fname, enum fs_relative relativeto, char *out
last = NULL;
for (i = 0; i < sizeof(fs_manifest->gamepath)/sizeof(fs_manifest->gamepath[0]); i++)
{
if (fs_manifest->gamepath[i].base && fs_manifest->gamepath[i].path)
if (fs_manifest && fs_manifest->gamepath[i].base && fs_manifest->gamepath[i].path)
{
if (*fs_manifest->gamepath[i].path == '*')
continue;

3
engine/common/log.c
View File

@ -638,9 +638,6 @@ void Log_Init(void)
Cmd_AddCommand("ipmerge", IPLog_Merge_f);
Cmd_AddCommand("ipdump", IPLog_Dump_f);
IPLog_Merge_File("iplog.txt");
IPLog_Merge_File("iplog.dat"); //legacy crap, for compat with proquake
// cmd line options, debug options
#ifdef CRAZYDEBUGGING
Cvar_ForceSet(&log_enable[LOG_CONSOLE], "1");

3
engine/server/sv_main.c
View File

@ -5439,6 +5439,9 @@ void SV_Init (quakeparms_t *parms)
}
#endif
IPLog_Merge_File("iplog.txt");
IPLog_Merge_File("iplog.dat"); //legacy crap, for compat with proquake
// if a map wasn't specified on the command line, spawn start.map
//aliases require that we flush the cbuf in order to actually see the results.
if (sv.state == ss_dead && Cmd_AliasExist("startmap_dm", RESTRICT_LOCAL))