q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-22 10:20:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a mismerge.

Browse Source
This commit is contained in:
Ryan C. Gordon 2016-03-31 12:25:40 -04:00
parent 75b824ddf8
commit fbfef87ce0
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Sources/Engine/Base/Stream.cpp
View File

@ -161,22 +161,9 @@ void InitStreams(void)
CPrintF(TRANSV("Loading group files...\n")); CPrintF(TRANSV("Loading group files...\n"));
CDynamicArray<CTString> *files = NULL;
// for each group file in base directory // for each group file in base directory
struct _finddata_t c_file;
long hFile;
hFile = _findfirst(_fnmApplicationPath+"*.gro", &c_file);
BOOL bOK = (hFile!=-1);
while(bOK) {
if (CTString(c_file.name).Matches("*.gro")) {
// add it to active set
UNZIPAddArchive(_fnmApplicationPath+c_file.name);
}
bOK = _findnext(hFile, &c_file)==0;
}
_findclose( hFile );
CDynamicArray<CTString> *files;
files = _pFileSystem->FindFiles(_fnmApplicationPath, "*.gro"); files = _pFileSystem->FindFiles(_fnmApplicationPath, "*.gro");
int max = files->Count(); int max = files->Count();
int i; int i;