Move ScLitter to its own files

src/openrct2/libopenrct2.vcxproj

@@ -406,6 +406,7 @@
     <ClInclude Include="scenario\ScenarioRepository.h" />
     <ClInclude Include="scenario\ScenarioSources.h" />
     <ClInclude Include="scripting\bindings\entity\ScGuest.hpp" />
+    <ClInclude Include="scripting\bindings\entity\ScLitter.hpp" />
     <ClInclude Include="scripting\bindings\entity\ScPeep.hpp" />
     <ClInclude Include="scripting\bindings\entity\ScStaff.hpp" />
     <ClInclude Include="scripting\bindings\entity\ScVehicle.hpp" />
@@ -854,6 +855,7 @@
     <ClCompile Include="scenario\ScenarioRepository.cpp" />
     <ClCompile Include="scenario\ScenarioSources.cpp" />
     <ClCompile Include="scripting\bindings\entity\ScGuest.cpp" />
+    <ClCompile Include="scripting\bindings\entity\ScLitter.cpp" />
     <ClCompile Include="scripting\bindings\entity\ScStaff.cpp" />
     <ClCompile Include="scripting\bindings\entity\ScVehicle.cpp" />
     <ClCompile Include="scripting\HookEngine.cpp" />

src/openrct2/scripting/ScriptEngine.cpp

@@ -26,6 +26,7 @@
 #    include "Duktape.hpp"
 #    include "bindings/entity/ScEntity.hpp"
 #    include "bindings/entity/ScGuest.hpp"
+#    include "bindings/entity/ScLitter.hpp"
 #    include "bindings/entity/ScPeep.hpp"
 #    include "bindings/entity/ScStaff.hpp"
 #    include "bindings/game/ScCheats.hpp"

src/openrct2/scripting/bindings/entity/ScEntity.hpp

@@ -14,14 +14,11 @@
 #    include "../../../Context.h"
 #    include "../../../common.h"
 #    include "../../../peep/Peep.h"
-#    include "../../../peep/Staff.h"
 #    include "../../../util/Util.h"
 #    include "../../../world/EntityList.h"
-#    include "../../../world/Litter.h"
 #    include "../../../world/Sprite.h"
 #    include "../../Duktape.hpp"
 #    include "../../ScriptEngine.h"
-#    include "../ride/ScRide.hpp"
 
 #    include <algorithm>
 #    include <string_view>
@@ -210,71 +207,6 @@ namespace OpenRCT2::Scripting
         }
     };
 
-    static const DukEnumMap<Litter::Type> LitterTypeMap({
-        { "vomit", Litter::Type::Vomit },
-        { "vomit_alt", Litter::Type::VomitAlt },
-        { "empty_can", Litter::Type::EmptyCan },
-        { "rubbish", Litter::Type::Rubbish },
-        { "burger_box", Litter::Type::BurgerBox },
-        { "empty_cup", Litter::Type::EmptyCup },
-        { "empty_box", Litter::Type::EmptyBox },
-        { "empty_bottle", Litter::Type::EmptyBottle },
-        { "empty_bowl_red", Litter::Type::EmptyBowlRed },
-        { "empty_drink_carton", Litter::Type::EmptyDrinkCarton },
-        { "empty_juice_cup", Litter::Type::EmptyJuiceCup },
-        { "empty_bowl_blue", Litter::Type::EmptyBowlBlue },
-    });
-
-    class ScLitter : public ScEntity
-    {
-    public:
-        ScLitter(uint16_t Id)
-            : ScEntity(Id)
-        {
-        }
-
-        static void Register(duk_context* ctx)
-        {
-            dukglue_set_base_class<ScEntity, ScLitter>(ctx);
-            dukglue_register_property(ctx, &ScLitter::litterType_get, &ScLitter::litterType_set, "litterType");
-            dukglue_register_property(ctx, &ScLitter::creationTick_get, nullptr, "creationTick");
-        }
-
-    private:
-        Litter* GetLitter() const
-        {
-            return ::GetEntity<Litter>(_id);
-        }
-
-        std::string litterType_get() const
-        {
-            auto* litter = GetLitter();
-            auto it = LitterTypeMap.find(litter->SubType);
-            if (it == LitterTypeMap.end())
-                return "";
-            return std::string{ it->first };
-        }
-
-        void litterType_set(const std::string& litterType)
-        {
-            ThrowIfGameStateNotMutable();
-
-            auto it = LitterTypeMap.find(litterType);
-            if (it == LitterTypeMap.end())
-                return;
-            auto* litter = GetLitter();
-            litter->SubType = it->second;
-        }
-
-        uint32_t creationTick_get() const
-        {
-            auto* litter = GetLitter();
-            if (litter == nullptr)
-                return 0;
-            return litter->creationTick;
-        }
-    };
-
 } // namespace OpenRCT2::Scripting
 
 #endif

src/openrct2/scripting/bindings/entity/ScLitter.cpp

@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2021 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#pragma once
+
+#ifdef ENABLE_SCRIPTING
+
+#    include "ScLitter.hpp"
+
+namespace OpenRCT2::Scripting
+{
+    static const DukEnumMap<Litter::Type> LitterTypeMap({
+        { "vomit", Litter::Type::Vomit },
+        { "vomit_alt", Litter::Type::VomitAlt },
+        { "empty_can", Litter::Type::EmptyCan },
+        { "rubbish", Litter::Type::Rubbish },
+        { "burger_box", Litter::Type::BurgerBox },
+        { "empty_cup", Litter::Type::EmptyCup },
+        { "empty_box", Litter::Type::EmptyBox },
+        { "empty_bottle", Litter::Type::EmptyBottle },
+        { "empty_bowl_red", Litter::Type::EmptyBowlRed },
+        { "empty_drink_carton", Litter::Type::EmptyDrinkCarton },
+        { "empty_juice_cup", Litter::Type::EmptyJuiceCup },
+        { "empty_bowl_blue", Litter::Type::EmptyBowlBlue },
+    });
+
+    ScLitter::ScLitter(uint16_t Id)
+        : ScEntity(Id)
+    {
+    }
+
+    void ScLitter::Register(duk_context* ctx)
+    {
+        dukglue_set_base_class<ScEntity, ScLitter>(ctx);
+        dukglue_register_property(ctx, &ScLitter::litterType_get, &ScLitter::litterType_set, "litterType");
+        dukglue_register_property(ctx, &ScLitter::creationTick_get, nullptr, "creationTick");
+    }
+
+    Litter* ScLitter::GetLitter() const
+    {
+        return ::GetEntity<Litter>(_id);
+    }
+
+    std::string ScLitter::litterType_get() const
+    {
+        auto* litter = GetLitter();
+        auto it = LitterTypeMap.find(litter->SubType);
+        if (it == LitterTypeMap.end())
+            return "";
+        return std::string{ it->first };
+    }
+
+    void ScLitter::litterType_set(const std::string& litterType)
+    {
+        ThrowIfGameStateNotMutable();
+
+        auto it = LitterTypeMap.find(litterType);
+        if (it == LitterTypeMap.end())
+            return;
+        auto* litter = GetLitter();
+        litter->SubType = it->second;
+    }
+
+    uint32_t ScLitter::creationTick_get() const
+    {
+        auto* litter = GetLitter();
+        if (litter == nullptr)
+            return 0;
+        return litter->creationTick;
+    }
+
+} // namespace OpenRCT2::Scripting
+
+#endif

src/openrct2/scripting/bindings/entity/ScLitter.hpp

@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Copyright (c) 2014-2021 OpenRCT2 developers
+ *
+ * For a complete list of all authors, please refer to contributors.md
+ * Interested in contributing? Visit https://github.com/OpenRCT2/OpenRCT2
+ *
+ * OpenRCT2 is licensed under the GNU General Public License version 3.
+ *****************************************************************************/
+
+#pragma once
+
+#ifdef ENABLE_SCRIPTING
+
+#    include "ScEntity.hpp"
+
+namespace OpenRCT2::Scripting
+{
+    class ScLitter : public ScEntity
+    {
+    public:
+        ScLitter(uint16_t Id);
+
+        static void Register(duk_context* ctx);
+
+    private:
+        Litter* GetLitter() const;
+
+        std::string litterType_get() const;
+        void litterType_set(const std::string& litterType);
+
+        uint32_t creationTick_get() const;
+    };
+
+} // namespace OpenRCT2::Scripting
+
+#endif