* BugFix: When querying against root with Torque::FS::DumpDirectories, correctly return directories with their path.

* Adjustment: Add commenting to some of the new programming.
* Adjustment: Tweak fileCreatedTime and fileModifiedTime functions to use the VFS.

Engine/source/core/util/timeClass.cpp

@@ -195,4 +195,29 @@ void Time::get(S32 *pyear, S32 *pmonth, S32 *pday, S32 *phour, S32 *pminute, S32
       *pmicrosecond = time % OneSecond;
 }
 
+Platform::LocalTime Time::toLocalTime()
+{
+   Platform::LocalTime result;
+   result.isdst = false;
+
+   S32 year;
+   S32 month;
+   S32 day;
+   S32 hour;
+   S32 minute;
+   S32 second;
+   S32 microsecond;
+
+   get(&year, &month, &day, &hour, &minute, &second, &microsecond);
+   result.year = year - 1900;
+   result.month = month - 1;
+   result.yearday = day;
+   result.hour = hour;
+   result.min = minute;
+   result.sec = second;
+   result.monthday = day % 32;
+   result.weekday = day % 7;
+   return result;
+}
+
 } // Namespace

Engine/source/core/util/timeClass.h

@@ -26,7 +26,9 @@
 #ifndef _TORQUE_TYPES_H_
 #include "platform/types.h"
 #endif
-
+#ifndef _PLATFORM_H_
+#include "platform/platform.h"
+#endif
 
 #if defined(TORQUE_COMPILER_VISUALC)
    #define TORQUE_CONSTANT_S64(a) (a##I64)
@@ -105,6 +107,8 @@ public:
    S64 getMicroseconds() const;
    S64 getInternalRepresentation() const;
 
+   Platform::LocalTime toLocalTime();
+
 private:
    class Tester
    {

Engine/source/core/volume.cpp

@@ -600,17 +600,24 @@ bool MountSystem::_dumpDirectories(DirectoryRef directory, Vector<StringTableEnt
       return false;
    }
 
+   // Queries against / will return a directory count of 1, but the code relies on actual directory entries (Eg. /data) so we handle that special case
+   const U32 basePathDirectoryCount = String::compare(basePath.getFullPathWithoutRoot(), "/") == 0 ? basePath.getDirectoryCount() - 1 : basePath.getDirectoryCount();
+
    for (U32 iteration = 0; iteration < directoryPaths.size(); ++iteration)
    {
       const Path& directoryPath = directoryPaths[iteration];
 
+      // Load the full path to the directory unless we're not supposed to include base paths
       String directoryPathString = directoryPath.getFullPath().c_str();
       if (noBasePath)
       {
+         // Build a path representing the directory tree *after* the base path query but excluding the base
+         // So if we queried for data/ and are currently processing data/ExampleModule/datablocks we want to output
+         // ExampleModule/datablocks
          Path newDirectoryPath;
-         for (U32 iteration = basePath.getDirectoryCount(); iteration < directoryPath.getDirectoryCount(); ++iteration)
+         for (U32 iteration = basePathDirectoryCount; iteration < directoryPath.getDirectoryCount(); ++iteration)
          {
-            if (iteration > basePath.getDirectoryCount())
+            if (iteration > basePathDirectoryCount)
             {
                newDirectoryPath.setPath(newDirectoryPath.getPath() + "/");
             }
@@ -622,6 +629,7 @@ bool MountSystem::_dumpDirectories(DirectoryRef directory, Vector<StringTableEnt
          directoryPathString = newDirectoryPath.getFullPathWithoutRoot();
       }
 
+      // Output result and enumerate subdirectories if we're not too deep according to the depth parameter
       directories.push_back(StringTable->insert(directoryPathString, true));
       if (currentDepth <= depth)
       {