Changeset 10907

Timestamp:

Jan 14, 2012, 7:46:20 PM (13 years ago)

Author:

philip

Message:

Include *.DELETED files when building archives. See #1110.

Location:

ps/trunk/source

Files:

• lib/file/vfs/vfs.h (modified) (2 diffs)
• lib/file/vfs/vfs_populate.cpp (modified) (3 diffs)
• ps/ArchiveBuilder.cpp (modified) (2 diffs)

ps/trunk/source/lib/file/vfs/vfs.h

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 201 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
@@ -58 +58 @@
      * (the default behavior is to create all real directories in the path)
      **/
-    VFS_MOUNT_MUST_EXIST = 4
+    VFS_MOUNT_MUST_EXIST = 4,
+
+    /**
+     * keep the files named "*.DELETED" visible in the VFS directories.
+     * the standard behavior of hiding the file with the same name minus the
+     * ".DELETED" suffix will still apply.
+     * (the default behavior is to hide both the suffixed and unsuffixed files)
+     **/
+    VFS_MOUNT_KEEP_DELETED = 8
 };
 

ps/trunk/source/lib/file/vfs/vfs_populate.cpp

@@ -1 @@
-/* Copyright (c) 2010 Wildfire Games
+/* Copyright (c) 201 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
@@ -89 +89 @@
         {
             m_directory->RemoveFile(name.Basename());
-            return;
+            if(!(m_realDirectory->Flags() & VFS_MOUNT_KEEP_DELETED))
+                return;
         }
 
@@ -122 +123 @@
         {
             directory->RemoveFile(name.Basename());
-            return;
+            if(!(this_->m_realDirectory->Flags() & VFS_MOUNT_KEEP_DELETED))
+                return;
         }
 

ps/trunk/source/ps/ArchiveBuilder.cpp

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 201 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -44 +44 @@
     m_VFS->Mount(L"cache/", m_TempDir/"_archivecache/");
 
-    m_VFS->Mount(L"", mod/"", VFS_MOUNT_MUST_EXIST);
+    m_VFS->Mount(L"", mod/"", VFS_MOUNT_MUST_EXIST);
 
     // Collect the list of files before loading any base mods