TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

further conflict resolutions

Browse source
This commit is contained in:
AzaezelX 2023-05-27 19:57:51 -05:00
parent 502f38f227
commit a5f3e70653
1 changed files with 0 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/console/fileSystemFunctions.cpp
View file

@ -576,12 +576,7 @@ DefineEngineFunction( fileCreatedTime, String, ( const char* fileName ),,
{ {
Platform::LocalTime lt = node->getCreatedTime().toLocalTime(); Platform::LocalTime lt = node->getCreatedTime().toLocalTime();
<<<<<<< HEAD
String fileStr = Platform::localTimeToString(lt); String fileStr = Platform::localTimeToString(lt);
=======
Platform::LocalTime lt = {0};
Platform::fileToLocalTime( ft, &lt );
>>>>>>> 2f1d21eea6a3a78b6e91144149879893b4156723
char *buffer = Con::getReturnBuffer(fileStr.size()); char *buffer = Con::getReturnBuffer(fileStr.size());
dStrcpy(buffer, fileStr, fileStr.size()); dStrcpy(buffer, fileStr, fileStr.size());
@ -851,17 +846,7 @@ DefineEngineFunction( pathCopy, bool, ( const char* fromFile, const char* toFile
"@note Only present in a Tools build of Torque.\n" "@note Only present in a Tools build of Torque.\n"
"@ingroup FileSystem") "@ingroup FileSystem")
{ {
<<<<<<< HEAD
return Torque::FS::CopyFile(fromFile, toFile, noOverwrite); return Torque::FS::CopyFile(fromFile, toFile, noOverwrite);
=======
char qualifiedFromFile[ 2048 ];
char qualifiedToFile[ 2048 ];
Platform::makeFullPathName( fromFile, qualifiedFromFile, sizeof( qualifiedFromFile ) );
Platform::makeFullPathName( toFile, qualifiedToFile, sizeof( qualifiedToFile ) );
return dPathCopy( qualifiedFromFile, qualifiedToFile, noOverwrite );
>>>>>>> 2f1d21eea6a3a78b6e91144149879893b4156723
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------