libcommon|SaveSlots: Updated copying of associated .save packages

Plus some preparations for replacing the map state Reader with a new
version that does not use LZSS.

doomsday/libdeng2/include/de/game/mapstatereader.h

@@ -34,9 +34,6 @@ namespace game {
 class DENG2_PUBLIC MapStateReader
 {
 public:
-    /// An error occurred attempting to open the input file. @ingroup errors
-    DENG2_ERROR(FileAccessError);
-
     /// Base class for read errors. @ingroup errors
     DENG2_ERROR(ReadError);
 

doomsday/libdeng2/src/game/savedsession.cpp

@@ -362,7 +362,7 @@ PackageFolder &SavedSession::locateFile()
 
 PackageFolder const &SavedSession::locateFile() const
 {
-    return const_cast<PackageFolder &>(const_cast<SavedSession *>(this)->locateFile());
+    return const_cast<SavedSession *>(this)->locateFile();
 }
 
 bool SavedSession::recognizeFile()

doomsday/plugins/common/src/g_game.cpp

@@ -3246,15 +3246,15 @@ void G_DoLoadSession(de::String slotId)
     // Attempt to recognize and load the saved game state.
     try
     {
-        de::game::SavedSession &session   = G_SaveSlots()[logicalSlot].savedSession();
-        de::PackageFolder const &saveFile = session.locateFile();
+        de::game::SavedSession &session = G_SaveSlots()[logicalSlot].savedSession();
+        de::PackageFolder const &pack   = session.locateFile();
 
         App_Log(DE2_LOG_VERBOSE, "Attempting load save game from \"%s\"",
-                de::NativePath(saveFile.path()).pretty().toLatin1().constData());
+                de::NativePath(pack.path()).pretty().toLatin1().constData());
 
 #if __JHEXEN__
         // Deserialize the world ACS data.
-        if(de::File *file = saveFile.tryLocateFile("ACScript"))
+        if(de::File *file = pack.tryLocateFile("ACScript"))
         {
             Game_ACScriptInterpreter().readWorldScriptData(de::Reader(*file));
         }

doomsday/plugins/common/src/mapstatereader.cpp

@@ -737,16 +737,12 @@ game::MapStateReader *MapStateReader::make(game::SavedSession const &session) //
 
 void MapStateReader::read(String const &mapUriStr)
 {
+    PackageFolder const &pack             = session().locateFile();
     game::SessionMetadata const &metadata = session().metadata();
-    Path const &filePath = Path(mapUriStr);
-
-    if(!SV_OpenFile(filePath, false/*for read*/))
-    {
-        throw FileAccessError("MapStateReader", "Failed opening \"" + NativePath(filePath).pretty() + "\"");
-    }
 
+    File const &mapStateFile = pack.locate<File>(Path("maps") / mapUriStr);
+    //SV_OpenFile(mapStateFile);
     d->reader = SV_NewReader();
-    DENG2_ASSERT(d->reader != 0);
 
     d->saveVersion = metadata.geti("version");
     d->mapVersion  = d->saveVersion; // Default: mapVersion == saveVersion

doomsday/plugins/common/src/saveslots.cpp

@@ -27,6 +27,7 @@
 #include <de/game/SavedSessionRepository>
 #include <de/NativePath>
 #include <de/Observers>
+#include <de/Writer>
 #include <map>
 
 static int cvarLastSlot  = -1; ///< @c -1= Not yet loaded/saved in this game session.
@@ -248,9 +249,6 @@ void SaveSlots::copySlot(String sourceSlotId, String destSlotId)
 {
     LOG_AS("SaveSlots::copySlot");
 
-    SavedSessionRepository &saveRepo = G_SavedSessionRepository();
-    saveRepo.folder().verifyWriteAccess();
-
     Slot &sourceSlot = slot(sourceSlotId);
     Slot &destSlot   = slot(destSlotId);
 
@@ -260,14 +258,20 @@ void SaveSlots::copySlot(String sourceSlotId, String destSlotId)
         return;
     }
 
-    // Clear all save files at destination slot.
+    // Clear the saved file package for the destination slot.
     destSlot.clear();
 
-    SV_CopyFile(sourceSlot.savedSession().filePath(), destSlot.savedSession().filePath());
+    // Copy the saved file package to the destination slot.
+    if(sourceSlot.savedSession().hasFile())
+    {
+        Folder &destFolder = destSlot.savedSession().repository().folder();
+        de::Writer(destFolder.replaceFile(destSlot.savedSession().fileName()))
+                << sourceSlot.savedSession().locateFile().archive();
+    }
 
-    // Copy save info too.
+    // Copy the session too.
     destSlot.replaceSavedSession(new SavedSession(sourceSlot.savedSession()));
-    // Update the file path associated with the copied save info.
+    // Update the file path associated with the copied session.
     destSlot.savedSession().setFileName(destSlot.fileName());
 }
 

doomsday/plugins/doom/src/doomv9mapstatereader.cpp

@@ -813,13 +813,11 @@ game::MapStateReader *DoomV9MapStateReader::make(game::SavedSession const &sessi
 
 void DoomV9MapStateReader::read(String const &mapUriStr)
 {
-    Path const &filePath = Path(mapUriStr);
-
-    if(!SV_OpenFile_Dm_v19(filePath))
-    {
-        throw FileAccessError("DoomV9GameStateReader", "Failed opening \"" + NativePath(filePath).pretty() + "\"");
-    }
+    PackageFolder const &pack             = session().locateFile();
+    //game::SessionMetadata const &metadata = session().metadata();
 
+    File const &mapStateFile = pack.locate<File>(Path("maps") / mapUriStr);
+    //SV_OpenFile(mapStateFile);
     d->reader = SV_NewReader_Dm_v19();
 
     d->readPlayers();

doomsday/plugins/heretic/src/hereticv13mapstatereader.cpp

@@ -823,13 +823,11 @@ game::MapStateReader *HereticV13MapStateReader::make(game::SavedSession const &s
 
 void HereticV13MapStateReader::read(String const &mapUriStr)
 {
-    Path const &filePath = Path(mapUriStr);
-
-    if(!SV_OpenFile_Hr_v13(filePath))
-    {
-        throw FileAccessError("HereticV13GameStateReader", "Failed opening \"" + NativePath(filePath).pretty() + "\"");
-    }
+    PackageFolder const &pack             = session().locateFile();
+    //game::SessionMetadata const &metadata = session().metadata();
 
+    File const &mapStateFile = pack.locate<File>(Path("maps") / mapUriStr);
+    //SV_OpenFile(mapStateFile);
     d->reader = SV_NewReader_Hr_v13();
 
     d->readPlayers();