Refactor|libhexen|ACScript: Renamed ACScriptInterpreter methods for c…

…onsistency
skyjake · Mar 25, 2014 · fae6036 · fae6036
1 parent 0696bfe
commit fae6036
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/doomsday/plugins/common/src/g_game.cpp b/doomsday/plugins/common/src/g_game.cpp
@@ -3277,7 +3277,7 @@ void G_DoLoadSession(de::String slotId)
         // Deserialize the world ACS data.
         if(de::File const *file = session.tryLocateStateFile("ACScript"))
         {
-            Game_ACScriptInterpreter().readWorldScriptData(de::Reader(*file));
+            Game_ACScriptInterpreter().readWorldState(de::Reader(*file));
         }
 #endif
 

diff --git a/doomsday/plugins/common/src/gamesessionwriter.cpp b/doomsday/plugins/common/src/gamesessionwriter.cpp
@@ -63,7 +63,7 @@ DENG2_PIMPL_NOREF(GameSessionWriter)
 #if __JHEXEN__
         Block data;
         de::Writer writer(data);
-        Game_ACScriptInterpreter().writeWorldScriptData(writer);
+        Game_ACScriptInterpreter().writeWorldState(writer);
         arch.add("ACScriptState", data);
 #endif
     }

diff --git a/doomsday/plugins/common/src/mapstatereader.cpp b/doomsday/plugins/common/src/mapstatereader.cpp
@@ -668,7 +668,7 @@ DENG2_PIMPL(MapStateReader)
     {
 #if __JHEXEN__
         beginSegment(ASEG_SCRIPTS);
-        Game_ACScriptInterpreter().readMapScriptData(thisPublic);
+        Game_ACScriptInterpreter().readMapState(thisPublic);
         // endSegment();
 #endif
     }

diff --git a/doomsday/plugins/common/src/mapstatewriter.cpp b/doomsday/plugins/common/src/mapstatewriter.cpp
@@ -231,7 +231,7 @@ DENG2_PIMPL(MapStateWriter)
     {
 #if __JHEXEN__
         beginSegment(ASEG_SCRIPTS);
-        Game_ACScriptInterpreter().writeMapScriptData(thisPublic);
+        Game_ACScriptInterpreter().writeMapState(thisPublic);
         // endSegment();
 #endif
     }

diff --git a/doomsday/plugins/hexen/include/acscript.h b/doomsday/plugins/hexen/include/acscript.h
@@ -209,11 +209,11 @@ class ACScriptInterpreter
      */
     AutoStr *scriptDescription(int scriptNumber);
 
-    void writeWorldScriptData(de::Writer &to) const;
-    void readWorldScriptData(de::Reader &from);
+    void writeWorldState(de::Writer &to) const;
+    void readWorldState(de::Reader &from);
 
-    void writeMapScriptData(MapStateWriter *msw);
-    void readMapScriptData(MapStateReader *msr);
+    void writeMapState(MapStateWriter *msw);
+    void readMapState(MapStateReader *msr);
 
 public: /// @todo make private:
     BytecodeScriptInfo &scriptInfoByIndex(int index);

diff --git a/doomsday/plugins/hexen/src/acscript.cpp b/doomsday/plugins/hexen/src/acscript.cpp
@@ -467,7 +467,7 @@ void ACScriptInterpreter::scriptFinished(ACScript *script)
     Thinker_Remove(&script->thinker);
 }
 
-void ACScriptInterpreter::writeWorldScriptData(de::Writer &to) const
+void ACScriptInterpreter::writeWorldState(de::Writer &to) const
 {
     to << byte(4); // Version.
 
@@ -479,14 +479,13 @@ void ACScriptInterpreter::writeWorldScriptData(de::Writer &to) const
 
     // Write the deferred task queue.
     to << _deferredTasksSize;
-
     for(int i = 0; i < _deferredTasksSize; ++i)
     {
         to << _deferredTasks[i];
     }
 }
 
-void ACScriptInterpreter::readWorldScriptData(de::Reader &from)
+void ACScriptInterpreter::readWorldState(de::Reader &from)
 {
     byte ver; from >> ver;
 
@@ -509,7 +508,7 @@ void ACScriptInterpreter::readWorldScriptData(de::Reader &from)
     }
 }
 
-void ACScriptInterpreter::writeMapScriptData(MapStateWriter *msw)
+void ACScriptInterpreter::writeMapState(MapStateWriter *msw)
 {
     Writer *writer = msw->writer();
 
@@ -526,7 +525,7 @@ void ACScriptInterpreter::writeMapScriptData(MapStateWriter *msw)
     }
 }
 
-void ACScriptInterpreter::readMapScriptData(MapStateReader *msr)
+void ACScriptInterpreter::readMapState(MapStateReader *msr)
 {
     Reader *reader = msr->reader();