From 6e6a59bd71f9556330351bd98a20daa2cebaffc3 Mon Sep 17 00:00:00 2001 From: Nicholas Stearns Date: Sun, 22 Mar 2026 17:55:36 +0000 Subject: [PATCH 1/2] Match on PollutionEvent --- configure.py | 2 +- include/Map/TPollutionTest.hpp | 12 ++++++++++++ src/Map/PollutionEvent.cpp | 8 ++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 include/Map/TPollutionTest.hpp diff --git a/configure.py b/configure.py index eadc86ba..8ea8870d 100644 --- a/configure.py +++ b/configure.py @@ -1072,7 +1072,7 @@ def MatchingFor(*versions): Object(NonMatching, "Map/Sky.cpp"), Object(NonMatching, "Map/MapEventSirena.cpp"), Object(NonMatching, "Map/PollutionLayer.cpp"), - Object(NonMatching, "Map/PollutionEvent.cpp"), + Object(Matching, "Map/PollutionEvent.cpp"), Object(NonMatching, "Map/MapCollisionPlane.cpp"), Object(NonMatching, "Map/MarineSnow.cpp"), Object(Matching, "Map/MapData.cpp"), diff --git a/include/Map/TPollutionTest.hpp b/include/Map/TPollutionTest.hpp new file mode 100644 index 00000000..b023a7e2 --- /dev/null +++ b/include/Map/TPollutionTest.hpp @@ -0,0 +1,12 @@ +#ifndef MAP_TPOLLUTIONTEST_HPP +#define MAP_TPOLUTTIONTEST_HPP + +#include + +class TPollutionTest : public JDrama::TViewObj { +public: + virtual void perform(u32, JDrama::TGraphics*); + virtual void loadAfter(); +}; + +#endif diff --git a/src/Map/PollutionEvent.cpp b/src/Map/PollutionEvent.cpp index 8b137891..b1149192 100644 --- a/src/Map/PollutionEvent.cpp +++ b/src/Map/PollutionEvent.cpp @@ -1 +1,9 @@ +#include +// rogue includes needed for matching sinit & bss +#include +#include + +void TPollutionTest::perform(u32, JDrama::TGraphics*) { } + +void TPollutionTest::loadAfter() { TNameRef::loadAfter(); } From 0fe07fe092e7e7e1b3efdcf87e55c005aa4b904f Mon Sep 17 00:00:00 2001 From: Nicholas Stearns Date: Sun, 22 Mar 2026 18:39:14 +0000 Subject: [PATCH 2/2] Fix ordering of functions in PollutionEvent --- include/Map/TPollutionTest.hpp | 1 + src/Map/PollutionEvent.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/include/Map/TPollutionTest.hpp b/include/Map/TPollutionTest.hpp index b023a7e2..29b83d6e 100644 --- a/include/Map/TPollutionTest.hpp +++ b/include/Map/TPollutionTest.hpp @@ -5,6 +5,7 @@ class TPollutionTest : public JDrama::TViewObj { public: + virtual ~TPollutionTest(); virtual void perform(u32, JDrama::TGraphics*); virtual void loadAfter(); }; diff --git a/src/Map/PollutionEvent.cpp b/src/Map/PollutionEvent.cpp index b1149192..b2ff38b9 100644 --- a/src/Map/PollutionEvent.cpp +++ b/src/Map/PollutionEvent.cpp @@ -6,4 +6,6 @@ void TPollutionTest::perform(u32, JDrama::TGraphics*) { } +TPollutionTest::~TPollutionTest() { } + void TPollutionTest::loadAfter() { TNameRef::loadAfter(); }