Scripting|Definitions: Added "On setup" script to Map Info

The "On setup" script will be executed after the map has been fully set up.
skyjake · Nov 11, 2020 · 902bb02 · 902bb02
1 parent f04eb68
commit 902bb02
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/doomsday/apps/client/src/world/base/clientserverworld.cpp b/doomsday/apps/client/src/world/base/clientserverworld.cpp
@@ -31,7 +31,9 @@
 #include <de/Error>
 #include <de/Log>
 #include <de/Scheduler>
+#include <de/Script>
 #include <de/ScriptSystem>
+#include <de/Process>
 #include <de/Time>
 #include <doomsday/doomsdayapp.h>
 #include <doomsday/console/cmd.h>
@@ -680,6 +682,15 @@ DENG2_PIMPL(ClientServerWorld)
             }
         }
 
+        // Script to run after setup.
+        if (const String onSetupSrc = mapInfo.gets("onSetup"))
+        {
+            Script script(onSetupSrc);
+            Process proc;
+            proc.run(script);
+            proc.execute();
+        }
+
         // Reset world time.
         time = 0;
 

diff --git a/doomsday/apps/libdoomsday/src/defs/dedparser.cpp b/doomsday/apps/libdoomsday/src/defs/dedparser.cpp
@@ -2082,6 +2082,7 @@ DENG2_PIMPL(DEDParser)
                     RV_FLT("Ambient light", (*mi)["ambient"])
                     RV_FLT("Gravity", (*mi)["gravity"])
                     RV_STR("Execute", (*mi)["execute"])
+                    RV_STR("On setup", (*mi)["onSetup"]) // script function
                     RV_STR("Sky", (*mi)["skyId"])
                     RV_FLT("Sky height", sky["height"])
                     RV_FLT("Horizon offset", sky["horizonOffset"])

diff --git a/doomsday/apps/libdoomsday/src/defs/mapinfo.cpp b/doomsday/apps/libdoomsday/src/defs/mapinfo.cpp
@@ -48,6 +48,7 @@ void MapInfo::resetToDefaults()
     def().addNumber("gravity", 1);
     def().addText  ("skyId", "");
     def().addText  ("execute", "");
+    def().addText  ("onSetup", "");
     def().addText  (QStringLiteral("intermissionBg"), "");
 
     QScopedPointer<Record> sky(new Record);