Merge pull request #7919 from ZehMatt/gameaction-paused

Fix #7910: Allow game actions while paused if requested from callee.

src/openrct2/actions/GameAction.h

@@ -119,12 +119,19 @@ public:
     virtual uint16_t GetActionFlags() const
     {
         // Make sure we execute some things only on the client.
+        uint16_t flags = 0;
+
         if ((GetFlags() & GAME_COMMAND_FLAG_GHOST) != 0 || (GetFlags() & GAME_COMMAND_FLAG_5) != 0)
         {
-            return GA_FLAGS::CLIENT_ONLY;
+            flags |= GA_FLAGS::CLIENT_ONLY;
         }
 
-        return 0;
+        if (GetFlags() & GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED)
+        {
+            flags |= GA_FLAGS::ALLOW_WHILE_PAUSED;
+        }
+
+        return flags;
     }
 
     /**

src/openrct2/actions/MazeSetTrackAction.hpp

@@ -75,15 +75,6 @@ public:
     {
     }
 
-    uint16_t GetActionFlags() const override
-    {
-        uint16_t flags = GameAction::GetActionFlags();
-        if (GetFlags() & GAME_COMMAND_FLAG_ALLOW_DURING_PAUSED)
-            flags |= GA_FLAGS::ALLOW_WHILE_PAUSED;
-
-        return flags;
-    }
-
     void Serialise(DataSerialiser& stream) override
     {
         GameAction::Serialise(stream);

src/openrct2/actions/RideDemolishAction.hpp

@@ -43,11 +43,6 @@ public:
     {
     }
 
-    uint16_t GetActionFlags() const override
-    {
-        return GameAction::GetActionFlags();
-    }
-
     void Serialise(DataSerialiser& stream) override
     {
         GameAction::Serialise(stream);

src/openrct2/actions/WallRemoveAction.hpp

@@ -31,11 +31,6 @@ public:
     {
     }
 
-    uint16_t GetActionFlags() const override
-    {
-        return GameAction::GetActionFlags();
-    }
-
     void Serialise(DataSerialiser& stream) override
     {
         GameAction::Serialise(stream);

src/openrct2/network/Network.cpp

@@ -28,7 +28,7 @@
 // This string specifies which version of network stream current build uses.
 // It is used for making sure only compatible builds get connected, even within
 // single OpenRCT2 version.
-#define NETWORK_STREAM_VERSION "5"
+#define NETWORK_STREAM_VERSION "6"
 #define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
 
 static rct_peep* _pickup_peep = nullptr;