TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-24 22:59:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into console-func-refactor

Browse source 
Conflicts:
	Engine/source/app/net/net.cpp
	Engine/source/console/astNodes.cpp
	Engine/source/console/compiledEval.cpp
	Engine/source/console/console.h
	Engine/source/console/consoleInternal.h
	Engine/source/console/engineAPI.h
This commit is contained in:
Daniel Buckmaster 2014-10-14 14:40:17 +11:00
commit b507dc9555
6487 changed files with 315149 additions and 609761 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/platformMac/macCarbFileio.mm
View file

@ -49,6 +49,8 @@
#include "platform/profiler.h"
#include "cinterface/cinterface.h";
#include "core/volume.h"
//TODO: file io still needs some work...
#define MAX_MAC_PATH_LONG 2048
@ -634,7 +636,10 @@ bool Platform::isFile(const char *path)
// make sure we can stat the file
struct stat statData;
if( stat(path, &statData) < 0 )
return false;
{
// Since file does not exist on disk see if it exists in a zip file loaded
return Torque::FS::IsFile(path);
}
// now see if it's a regular file
if( (statData.st_mode & S_IFMT) == S_IFREG)

5
Engine/source/platformMac/macCocoaPlatform.mm
View file

@ -70,6 +70,11 @@ bool Platform::displaySplashWindow()
return false;
}
bool Platform::closeSplashWindow()
{
return false;
}
#pragma mark ---- File IO ----
//-----------------------------------------------------------------------------
bool dPathCopy(const char* source, const char* dest, bool nooverwrite)