Savegame Tool|Id1Translator: Fix translation of fixed length user sav…

…e descriptions As of this commit, converted vanilla savegames are now listed by the saved session management UI in Doomsday. Plus some cleanup.
skyjake · Mar 19, 2014 · 1eefd0f · 1eefd0f
1 parent d0fe522
commit 1eefd0f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/doomsday/tools/savegametool/src/id1translator.cpp b/doomsday/tools/savegametool/src/id1translator.cpp
@@ -122,9 +122,9 @@ DENG2_PIMPL(Id1Translator)
         {
             Block tmp(24);
             from >> FixedByteArray(tmp);
-            char descBuf[24];
-            tmp.get(0, (Block::Byte *)descBuf, 24);
-            metadata.set("userDescription", String(descBuf, 24));
+            char descBuf[24 + 1];
+            tmp.get(0, (Block::Byte *)descBuf, 24); descBuf[24] = 0;
+            metadata.set("userDescription", descBuf);
         }
 
         {
@@ -152,8 +152,8 @@ DENG2_PIMPL(Id1Translator)
         uint episode, map;
         from.readAs<dchar>(episode);
         from.readAs<dchar>(map);
-        DENG2_ASSERT(episode > 0 && map > 0);
-        metadata.set("mapUri", composeMapUriPath(episode - 1, map - 1).asText());
+        DENG2_ASSERT(map > 0);
+        metadata.set("mapUri", composeMapUriPath(episode, map - 1).asText());
 
         ArrayValue *array = new ArrayValue;
         int idx = 0;

diff --git a/doomsday/tools/savegametool/src/id1translator.h b/doomsday/tools/savegametool/src/id1translator.h
@@ -28,7 +28,7 @@
 class Id1Translator : public PackageFormatter
 {
 public:
-    /// The game identity key of the source data is ambious. @ingroup errors
+    /// The game identity key of the source data is ambigous. @ingroup errors
     DENG2_SUB_ERROR(ReadError, AmbigousGameIdError);
 
     /// Logical identifiers for supported save formats.

diff --git a/doomsday/tools/savegametool/src/main.cpp b/doomsday/tools/savegametool/src/main.cpp
@@ -17,9 +17,7 @@
  * 02110-1301 USA</small>
  */
 
-#include <QDebug>
 #include <QList>
-#include <QMutableListIterator>
 #include <QtAlgorithms>
 #include <de/DirectoryFeed>
 #include <de/TextApp>
@@ -188,7 +186,7 @@ int main(int argc, char **argv)
                     if(i + 1 < args.count() && !args.at(i).compareWithoutCase("-idkey"))
                     {
                         fallbackGameId = args.at(i + 1).strip().toLower();
-                        i += 2;
+                        i += 1;
                     }
                     continue;
                 }

diff --git a/doomsday/tools/savegametool/src/nativetranslator.cpp b/doomsday/tools/savegametool/src/nativetranslator.cpp
@@ -18,6 +18,8 @@
  */
 
 #include "lzss.h"
+#include <QList>
+#include <QMutableListIterator>
 #include <de/TextApp>
 #include <de/ArrayValue>
 #include <de/NativeFile>

diff --git a/doomsday/tools/savegametool/src/nativetranslator.h b/doomsday/tools/savegametool/src/nativetranslator.h
@@ -28,7 +28,7 @@
 class NativeTranslator : public PackageFormatter
 {
 public:
-    /// The game identity key of the source data is ambious. @ingroup errors
+    /// The game identity key of the source data is ambigous. @ingroup errors
     DENG2_SUB_ERROR(ReadError, AmbigousGameIdError);
 
     /// Logical identifiers for supported save formats.