X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=fs.c;fp=fs.c;h=f5e67b36519bb7d39cfcc472a2a681162ef166e9;hb=c5ac1f6532e3da1344de5a8405e90538fe0a4289;hp=a925ff3164743ff6ec191f04111fc17adfa7c436;hpb=1d8406cbddb33b72497bf8cbc71c6607204ce8f9;p=xonotic%2Fdarkplaces.git diff --git a/fs.c b/fs.c index a925ff31..f5e67b36 100644 --- a/fs.c +++ b/fs.c @@ -1329,6 +1329,10 @@ const char *FS_FileExtension (const char *in) { const char *separator, *backslash, *colon, *dot; + dot = strrchr(in, '.'); + if (dot == NULL) + return ""; + separator = strrchr(in, '/'); backslash = strrchr(in, '\\'); if (!separator || separator < backslash) @@ -1337,8 +1341,7 @@ const char *FS_FileExtension (const char *in) if (!separator || separator < colon) separator = colon; - dot = strrchr(in, '.'); - if (dot == NULL || (separator && (dot < separator))) + if (separator && (dot < separator)) return ""; return dot + 1; @@ -1563,7 +1566,7 @@ qbool FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qbool compl } } - Host_SaveConfig(); + Host_SaveConfig(CONFIGFILENAME); fs_numgamedirs = numgamedirs; for (i = 0;i < fs_numgamedirs;i++) @@ -1574,7 +1577,7 @@ qbool FS_ChangeGameDirs(int numgamedirs, char gamedirs[][MAX_QPATH], qbool compl if (cls.demoplayback) { - CL_Disconnect_f(cmd_local); + CL_Disconnect(); cls.demonum = 0; } @@ -2517,13 +2520,9 @@ with portable ones in-place, etc) */ void FS_SanitizePath(char *path) { - int i, size; - - for(i = 0, size = strlen(path); i < size; i++) - { - if(path[i] == '\\') - path[i] = '/'; - } + for (; *path; path++) + if (*path == '\\') + *path = '/'; } /*