libcommon|SaveInfo: Cleanup

skyjake · Feb 11, 2014 · b477448 · b477448
1 parent 67b7b24
commit b477448
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 21 deletions.
diff --git a/doomsday/plugins/common/include/saveinfo.h b/doomsday/plugins/common/include/saveinfo.h
@@ -27,7 +27,7 @@
 #ifdef __cplusplus
 
 /**
- * Saved game session info.
+ * Represents a saved game session state.
  *
  * @ingroup libcommon
  */
@@ -55,13 +55,6 @@ class SaveInfo
 
     SaveInfo &operator = (SaveInfo const &other);
 
-    /**
-     * Update the metadata associated with the save using values derived from the
-     * current game session. Note that this does @em not affect the copy of this save
-     * on disk.
-     */
-    void applyCurrentSessionMetadata();
-
     /**
      * Determines whether the saved game session is compatibile with the current
      * game session (and @em should therefore be loadable).
@@ -119,6 +112,13 @@ class SaveInfo
     void read_Hx_v9(Reader *reader);
 #endif
 
+    /**
+     * Update the metadata associated with the save using values derived from the
+     * current game session. Note that this does @em not affect the copy of this save
+     * on disk.
+     */
+    void applyCurrentSessionMetadata();
+
 public: /// @todo refactor away:
     int magic() const;
 };

diff --git a/doomsday/plugins/common/src/saveinfo.cpp b/doomsday/plugins/common/src/saveinfo.cpp
@@ -73,29 +73,29 @@ static void translateLegacyGameMode(gamemode_t *mode, int saveVersion)
 #endif
 
 SaveInfo::SaveInfo()
-    : _sessionId  (0)
-    , _magic   (0)
-    , _version (0)
-    , _gameMode(NUM_GAME_MODES)
-    , _mapUri  (Uri_New())
+    : _sessionId(0)
+    , _magic    (0)
+    , _version  (0)
+    , _gameMode (NUM_GAME_MODES)
+    , _mapUri   (Uri_New())
 #if !__JHEXEN__
-    , _mapTime (0)
+    , _mapTime  (0)
 #endif
 {
     Str_InitStd(&_description);
 #if !__JHEXEN__
-    memset(&_players, 0, sizeof(_players));
+    de::zap(_players);
 #endif
-    memset(&_gameRules, 0, sizeof(_gameRules));
+    de::zap(_gameRules);
 }
 
 SaveInfo::SaveInfo(SaveInfo const &other)
-    : _sessionId  (other._sessionId)
-    , _magic   (other._magic)
-    , _version (other._version)
-    , _gameMode(other._gameMode)
+    : _sessionId(other._sessionId)
+    , _magic    (other._magic)
+    , _version  (other._version)
+    , _gameMode (other._gameMode)
 #if !__JHEXEN__
-    , _mapTime (other._mapTime)
+    , _mapTime  (other._mapTime)
 #endif
 {
     Str_Copy(Str_InitStd(&_description), &other._description);