Refactor|libdoom: Renamed DoomV9GameStateReader as DoomV9MapStateReader

skyjake · Mar 11, 2014 · 838165f · 838165f
1 parent 719647e
commit 838165f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/doomsday/plugins/doom/doom.pro b/doomsday/plugins/doom/doom.pro
@@ -45,7 +45,7 @@ HEADERS += \
     include/doomdata.h \
     include/doomdef.h \
     include/doomtype.h \
-    include/doomv9gamestatereader.h \
+    include/doomv9mapstatereader.h \
     include/dstrings.h \
     include/g_game.h \
     include/info.h \
@@ -77,7 +77,7 @@ SOURCES += \
     src/d_items.c \
     src/d_main.cpp \
     src/d_refresh.cpp \
-    src/doomv9gamestatereader.cpp \
+    src/doomv9mapstatereader.cpp \
     src/m_cheat.cpp \
     src/m_random.c \
     src/p_enemy.c \

diff --git a/...gins/doom/include/doomv9gamestatereader.h → ...ugins/doom/include/doomv9mapstatereader.h b/...gins/doom/include/doomv9gamestatereader.h → ...ugins/doom/include/doomv9mapstatereader.h
@@ -1,4 +1,4 @@
-/** @file doomv9gamestatereader.h  Doom ver 1.9 saved game map state reader.
+/** @file doomv9mapstatereader.h  Doom ver 1.9 saved game map state reader.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2006-2013 Daniel Swanson <danij@dengine.net>
@@ -19,8 +19,8 @@
  * 02110-1301 USA</small>
  */
 
-#ifndef LIBDOOM_DOOMV9_GAMESTATEREADER
-#define LIBDOOM_DOOMV9_GAMESTATEREADER
+#ifndef LIBDOOM_DOOMV9_MAPSTATEREADER
+#define LIBDOOM_DOOMV9_MAPSTATEREADER
 
 #ifndef __JDOOM__
 #  error "Using jDoom headers without __JDOOM__"
@@ -33,19 +33,18 @@
  *
  * @ingroup libdoom
  */
-class DoomV9GameStateReader : public de::game::IMapStateReader
+class DoomV9MapStateReader : public de::game::IMapStateReader
 {
 public:
-    DoomV9GameStateReader();
-    ~DoomV9GameStateReader();
+    DoomV9MapStateReader();
+    ~DoomV9MapStateReader();
 
     static de::game::IMapStateReader *make();
-    //static bool recognize(de::Path const &stateFilePath, de::game::SessionMetadata &metadata);
 
     void read(de::Path const &filePath, de::game::SessionMetadata const &metadata);
 
 private:
     DENG2_PRIVATE(d)
 };
 
-#endif // LIBDOOM_DOOMV9_GAMESTATEREADER
+#endif // LIBDOOM_DOOMV9_MAPSTATEREADER
diff --git a/doomsday/plugins/doom/src/d_main.cpp b/doomsday/plugins/doom/src/d_main.cpp
@@ -26,7 +26,7 @@
 #include "m_argv.h"
 #include "p_map.h"
 #include "p_saveg.h"
-#include "doomv9gamestatereader.h"
+#include "doomv9mapstatereader.h"
 #include "am_map.h"
 #include "g_defs.h"
 #include "saveslots.h"
@@ -383,7 +383,7 @@ void D_PreInit()
 
     // Declare the Doom V9 game state reader/interpreter.
     de::game::SavedSessionRepository &saveRepo = G_SavedSessionRepository();
-    saveRepo.declareReader("DoomV9", &DoomV9GameStateReader::make);
+    saveRepo.declareReader("DoomV9", &DoomV9MapStateReader::make);
 
     G_InitSpecialFilter();
 }

diff --git a/...lugins/doom/src/doomv9gamestatereader.cpp → ...plugins/doom/src/doomv9mapstatereader.cpp b/...lugins/doom/src/doomv9gamestatereader.cpp → ...plugins/doom/src/doomv9mapstatereader.cpp
@@ -1,4 +1,4 @@
-/** @file doomv9gamestatereader.cpp  Doom ver 1.9 save game reader.
+/** @file doomv9mapstatereader.cpp  Doom ver 1.9 save game reader.
  *
  * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
  * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
@@ -20,7 +20,7 @@
  */
 
 #include "jdoom.h"
-#include "doomv9gamestatereader.h"
+#include "doomv9mapstatereader.h"
 
 #include "am_map.h"
 #include "dmu_lib.h"
@@ -635,7 +635,7 @@ static Reader *SV_NewReader_Dm_v19()
     return Reader_NewWithCallbacks(sri8, sri16, sri32, 0, srd);
 }
 
-DENG2_PIMPL(DoomV9GameStateReader)
+DENG2_PIMPL(DoomV9MapStateReader)
 {
     Reader *reader;
 
@@ -791,18 +791,18 @@ DENG2_PIMPL(DoomV9GameStateReader)
     }
 };
 
-DoomV9GameStateReader::DoomV9GameStateReader() : d(new Instance(this))
+DoomV9MapStateReader::DoomV9MapStateReader() : d(new Instance(this))
 {}
 
-DoomV9GameStateReader::~DoomV9GameStateReader()
+DoomV9MapStateReader::~DoomV9MapStateReader()
 {}
 
-de::game::IMapStateReader *DoomV9GameStateReader::make()
+de::game::IMapStateReader *DoomV9MapStateReader::make()
 {
-    return new DoomV9GameStateReader;
+    return new DoomV9MapStateReader;
 }
 
-void DoomV9GameStateReader::read(de::Path const &filePath, de::game::SessionMetadata const &metadata)
+void DoomV9MapStateReader::read(de::Path const &filePath, de::game::SessionMetadata const &metadata)
 {
     if(!SV_OpenFile_Dm_v19(filePath))
     {