Cleanup|libcommon: acs::System (redundant namespace qualification)

skyjake · Feb 23, 2015 · ba14456 · ba14456
1 parent eca8200
commit ba14456
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/doomsday/plugins/common/src/acs/module.cpp b/doomsday/plugins/common/src/acs/module.cpp
@@ -118,7 +118,7 @@ Module *Module::newFromBytecode(Block const &bytecode)  // static
 
 #undef OPEN_SCRIPTS_BASE
     }
-    // Prepare a ScriptNumber => EntryPoint LUT.
+    // Prepare a script-number => EntryPoint LUT.
     module->d->buildEntryPointLut();
 
     // Read constant (string-)values.

diff --git a/doomsday/plugins/common/src/acs/system.cpp b/doomsday/plugins/common/src/acs/system.cpp
@@ -45,21 +45,16 @@ DENG2_PIMPL(System)
     class ScriptStartTask : public ISerializable
     {
     public:
-        de::Uri mapUri;                ///< Unique identifier of the target map.
-        dint32 scriptNumber;           ///< Script number to execute on the target map.
-        acs::Script::Args scriptArgs;
+        de::Uri mapUri;           ///< Unique identifier of the target map.
+        dint32 scriptNumber;      ///< Script number to execute on the target map.
+        Script::Args scriptArgs;
 
         ScriptStartTask() : scriptNumber(-1) {}
-        ScriptStartTask(de::Uri const &mapUri, dint32 scriptNumber, acs::Script::Args const &scriptArgs)
+        ScriptStartTask(de::Uri const &mapUri, dint32 scriptNumber, Script::Args const &scriptArgs)
             : mapUri      (mapUri)
             , scriptNumber(scriptNumber)
             , scriptArgs  (scriptArgs)
         {}
-        ScriptStartTask(ScriptStartTask const &other)
-            : mapUri      (other.mapUri)
-            , scriptNumber(other.scriptNumber)
-            , scriptArgs  (other.scriptArgs)
-        {}
 
         static ScriptStartTask *newFromReader(de::Reader &from)
         {
@@ -175,8 +170,7 @@ System::System() : d(new Instance(this))
 void System::reset()
 {
     d->clearTasks();
-    d->clearScripts();
-    d->currentModule.release();
+    d->unloadModule();
     mapVars.fill(0);
     worldVars.fill(0);
 }