thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge filesrch.c

Browse source
This commit is contained in:
SteelT 2020-08-02 18:03:59 -04:00
parent 7417e95dcb
commit fa4fc40dd6
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/filesrch.c
View file

@ -16,12 +16,16 @@
#ifdef __GNUC__ #ifdef __GNUC__
#include <dirent.h> #include <dirent.h>
#endif #endif
#ifdef _WIN32 #if defined (_WIN32) && !defined (_XBOX)
//#define WIN32_LEAN_AND_MEAN //#define WIN32_LEAN_AND_MEAN
#define RPC_NO_WINDOWS_H #define RPC_NO_WINDOWS_H
#include <windows.h> #include <windows.h>
#endif #endif
#ifdef _WIN32_WCE
#include "sdl12/SRB2CE/cehelp.h"
#else
#include <sys/stat.h> #include <sys/stat.h>
#endif
#include <string.h> #include <string.h>
#include "filesrch.h" #include "filesrch.h"
@ -30,7 +34,7 @@
#include "z_zone.h" #include "z_zone.h"
#include "m_menu.h" // Addons_option_Onchange #include "m_menu.h" // Addons_option_Onchange
#if defined (_WIN32) && defined (_MSC_VER) #if (defined (_WIN32) && !defined (_WIN32_WCE)) && defined (_MSC_VER) && !defined (_XBOX)
#include <errno.h> #include <errno.h>
#include <io.h> #include <io.h>
@ -338,7 +342,6 @@ UINT8 refreshdirmenu = 0;
char *refreshdirname = NULL; char *refreshdirname = NULL;
<<<<<<< HEAD
#if defined (_XBOX) && defined (_MSC_VER) #if defined (_XBOX) && defined (_MSC_VER)
filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum,
boolean completepath, int maxsearchdepth) boolean completepath, int maxsearchdepth)
@ -442,8 +445,6 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
#else #else
=======
>>>>>>> srb2/next
filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, boolean completepath, int maxsearchdepth) filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *wantedmd5sum, boolean completepath, int maxsearchdepth)
{ {
filestatus_t retval = FS_NOTFOUND; filestatus_t retval = FS_NOTFOUND;
@ -472,9 +473,9 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
return FS_NOTFOUND; return FS_NOTFOUND;
} }
if (searchpath[searchpathindex[depthleft]-2] != PATHSEP[0]) if (searchpath[searchpathindex[depthleft]-2] != '/')
{ {
searchpath[searchpathindex[depthleft]-1] = PATHSEP[0]; searchpath[searchpathindex[depthleft]-1] = '/';
searchpath[searchpathindex[depthleft]] = 0; searchpath[searchpathindex[depthleft]] = 0;
} }
else else
@ -516,7 +517,7 @@ filestatus_t filesearch(char *filename, const char *startpath, const UINT8 *want
depthleft++; depthleft++;
} }
searchpath[searchpathindex[depthleft]-1]=PATHSEP[0]; searchpath[searchpathindex[depthleft]-1]='/';
searchpath[searchpathindex[depthleft]]=0; searchpath[searchpathindex[depthleft]]=0;
} }
else if (!strcasecmp(searchname, dent->d_name)) else if (!strcasecmp(searchname, dent->d_name))
@ -865,20 +866,13 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
ext |= EXT_LOADED; ext |= EXT_LOADED;
} }
} }
<<<<<<< HEAD
else if (ext == EXT_TXT) else if (ext == EXT_TXT)
{ {
if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt")) if (!strcmp(dent->d_name, "log.txt") || !strcmp(dent->d_name, "errorlog.txt"))
ext |= EXT_LOADED; ext |= EXT_LOADED;
} }
if (!strcmp(dent->d_name, configfile)) if (!strcmp(dent->d_name, configfile))
=======
}
else if (ext == EXT_TXT)
{
if (!strncmp(dent->d_name, "log-", 4) || !strcmp(dent->d_name, "errorlog.txt"))
>>>>>>> srb2/next
ext |= EXT_LOADED; ext |= EXT_LOADED;
} }
@ -927,3 +921,5 @@ boolean preparefilemenu(boolean samedepth, boolean replayhut)
return true; return true;
} }
#endif