added script variables to map object

Robosturm · Oct 3, 2023 · 9ff3616 · 9ff3616
1 parent 6234656
commit 9ff3616
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/game/gamemap.cpp b/game/gamemap.cpp
@@ -1498,6 +1498,7 @@ void GameMap::serializeObject(QDataStream& pStream, bool forHash) const
         pStream << m_recordFile;
         pStream << m_replayActionCount;
     }
+    m_Variables.serializeObject(pStream, forHash);
 }
 
 void GameMap::updateMapFlags() const
@@ -1768,6 +1769,10 @@ void GameMap::deserializer(QDataStream& pStream, bool fast)
             pStream >> m_recordFile;
             pStream >> m_replayActionCount;
         }
+        if (m_headerInfo.m_Version > 13)
+        {
+            m_Variables.deserializeObject(pStream);
+        }
     }
     if (showLoadingScreen)
     {

diff --git a/game/gamemap.h b/game/gamemap.h
@@ -174,7 +174,7 @@ class GameMap final : public QObject, public FileSerializable, public oxygine::A
      */
     inline virtual qint32 getVersion() const override
     {
-        return 13;
+        return 14;
     }
     /**
      * @brief clearMap
@@ -917,6 +917,14 @@ class GameMap final : public QObject, public FileSerializable, public oxygine::A
      * @brief showDamageCalculator
      */
     Q_INVOKABLE void showDamageCalculator();
+    /**
+     * @brief getVariables
+     * @return
+     */
+    Q_INVOKABLE inline ScriptVariables* getVariables()
+    {
+        return &m_Variables;
+    }
 private slots:
     void zoomChanged();
 private:
@@ -954,6 +962,7 @@ private slots:
     spCampaign m_Campaign;
     spGameRecorder m_Recorder{MemoryManagement::create<GameRecorder>(this)};
     spGameScript m_GameScript{MemoryManagement::create<GameScript>(this)};
+    ScriptVariables m_Variables;
     static const char* const m_GameAnimationFactory;
     bool m_loaded{false};
     QString m_mapMusic;