TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-20 04:34:48 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #412 from Areloch/LinuxBugfixes

Browse source 
Fixes a few bugs/issues on Linux
This commit is contained in:
Brian Roberts 2020-12-15 12:06:59 -06:00 committed by GitHub
parent 484ad73719 533ff28814
commit b2495fe957
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Engine/source/cinterface/c_controlInterface.cpp
View file

@ -35,6 +35,9 @@ extern void createFontInit(void);
extern void createFontShutdown(void);
#endif
#if defined(TORQUE_SDL)
#include "SDL.h"
#endif
#if defined( TORQUE_MINIDUMP ) && defined( TORQUE_RELEASE )
extern S32 CreateMiniDump(LPEXCEPTION_POINTERS ExceptionInfo);
@ -227,7 +230,11 @@ extern "C" {
const char* torque_getexecutablepath()
{
#if defined(TORQUE_SDL)
return gExecutablePath ? gExecutablePath : SDL_GetBasePath();
#elif
return gExecutablePath;
#endif
}
void torque_setexecutablepath(const char* directory)
@ -236,4 +243,4 @@ extern "C" {
gExecutablePath = new char[pathLen];
dStrcpy(gExecutablePath, directory, pathLen);
}
}
}

9
Engine/source/platformX86UNIX/x86UNIXFileio.cpp
View file

@ -332,7 +332,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
}
//-----------------------------------------------------------------------------
static bool RecurseDumpPath(const char *path, const char* relativePath, const char *pattern, Vector<Platform::FileInfo> &fileVector)
static bool RecurseDumpPath(const char *path, const char* relativePath, const char *pattern, Vector<Platform::FileInfo> &fileVector, S32 currentDepth = 0, S32 recurseDepth = -1)
{
char search[1024];
@ -382,7 +382,8 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
relativePath, fEntry->d_name);
childRelative = childRelativeBuf;
}
RecurseDumpPath(child, childRelative, pattern, fileVector);
if (currentDepth < recurseDepth || recurseDepth == -1 )
RecurseDumpPath(child, childRelative, pattern, fileVector, currentDepth+1, recurseDepth);
}
else
{
@ -908,7 +909,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
{
char prefPathName[MaxPath];
MungePath(prefPathName, MaxPath, path, GetPrefDir());
RecurseDumpPath(prefPathName, path, pattern, fileVector);
RecurseDumpPath(prefPathName, path, pattern, fileVector, 0, depth);
}
// munge the requested path and dump it
@ -916,7 +917,7 @@ bool dPathCopy(const char *fromName, const char *toName, bool nooverwrite)
char cwd[MaxPath];
getcwd(cwd, MaxPath);
MungePath(mungedPath, MaxPath, path, cwd);
return RecurseDumpPath(mungedPath, path, pattern, fileVector);
return RecurseDumpPath(mungedPath, path, pattern, fileVector, 0, depth);
}
//-----------------------------------------------------------------------------