From d61a13e4bd4a3bafab46280f65b0364895880a54 Mon Sep 17 00:00:00 2001
From: Brian Savage <savage13@gmail.com>
Date: Tue, 18 Jan 2022 18:52:13 -0500
Subject: Add PlacementMap, stubs: PlacementMapMgr and PlacementMapMgrMapArray

---
 src/KingSystem/Map/mapPlacementMap.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/KingSystem/Map/mapPlacementMap.cpp

(limited to 'src/KingSystem/Map/mapPlacementMap.cpp')

diff --git a/src/KingSystem/Map/mapPlacementMap.cpp b/src/KingSystem/Map/mapPlacementMap.cpp
new file mode 100644
index 00000000..66e4bd48
--- /dev/null
+++ b/src/KingSystem/Map/mapPlacementMap.cpp
@@ -0,0 +1,15 @@
+#include "KingSystem/Map/mapPlacementMap.h"
+
+namespace ksys::map {
+
+SEAD_SINGLETON_DISPOSER_IMPL(PlacementMapMgr)
+
+void PlacementMapMgr::junk() {
+    /*  Here to force the compiler to include PlacementMap */
+    PlacementMap x;
+    auto y = new PlacementMap;
+    (void)(x);
+    (void)(y);
+}
+
+}  // namespace ksys::map
-- 
cgit v1.2.3


From 7d97bb6f4008ae15ab8ca6c94fb09bf03c3d307e Mon Sep 17 00:00:00 2001
From: Brian Savage <savage13@gmail.com>
Date: Wed, 19 Jan 2022 19:21:05 -0500
Subject: Moved functions to correct places/files, formatting

---
 src/KingSystem/Map/mapPlacementMap.cpp | 37 ++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

(limited to 'src/KingSystem/Map/mapPlacementMap.cpp')

diff --git a/src/KingSystem/Map/mapPlacementMap.cpp b/src/KingSystem/Map/mapPlacementMap.cpp
index 66e4bd48..d5b04963 100644
--- a/src/KingSystem/Map/mapPlacementMap.cpp
+++ b/src/KingSystem/Map/mapPlacementMap.cpp
@@ -2,14 +2,35 @@
 
 namespace ksys::map {
 
-SEAD_SINGLETON_DISPOSER_IMPL(PlacementMapMgr)
-
-void PlacementMapMgr::junk() {
-    /*  Here to force the compiler to include PlacementMap */
-    PlacementMap x;
-    auto y = new PlacementMap;
-    (void)(x);
-    (void)(y);
+PlacementMap::PlacementMap() {
+    mInitStatus = InitStatus::None;
+    mParsedNumStaticObjs = 0xFFFFFFFF;
+    mStaticMapLoaded = StaticMap_None;
+    mNumStaticObjs = 0xFFFFFFFF;
+    mMat = sead::Matrix34f::ident;
+    mDistanceToCurrentMapUnit = 0;
+    mSkipLoadStaticMap = 0;
+    _38c = 0xFFFFFFFF;
+    mIdx = 0;
+    _388 = 0;
+    mCol = 0;
+    mRow = 0;
+    mNumRoutes = 0;
+    mP18 = 0;
+    mMgr = 0;
+    mPa = 0;
+    mDynamicGroupIdx = 0xFFFFFFFF;
+    mRes[0].mStatus = HkscRes::Status::_0;
+    mRes[1].mStatus = HkscRes::Status::_0;
+    mRes[2].mStatus = HkscRes::Status::_0;
+    mRes[3].mStatus = HkscRes::Status::_0;
+}
+
+PlacementMap::~PlacementMap() {
+    mRoutes.freeBuffer();
+    for (auto& r : mRes) {
+        r.cleanup();
+    }
 }
 
 }  // namespace ksys::map
-- 
cgit v1.2.3


From 1182f2fd750b66d52054b24db434c3ce4ac58c55 Mon Sep 17 00:00:00 2001
From: Brian Savage <savage13@gmail.com>
Date: Thu, 20 Jan 2022 09:37:30 -0500
Subject: Further fixes to variables types

---
 src/KingSystem/Map/mapPlacementMap.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/KingSystem/Map/mapPlacementMap.cpp')

diff --git a/src/KingSystem/Map/mapPlacementMap.cpp b/src/KingSystem/Map/mapPlacementMap.cpp
index d5b04963..ea3531d1 100644
--- a/src/KingSystem/Map/mapPlacementMap.cpp
+++ b/src/KingSystem/Map/mapPlacementMap.cpp
@@ -5,7 +5,7 @@ namespace ksys::map {
 PlacementMap::PlacementMap() {
     mInitStatus = InitStatus::None;
     mParsedNumStaticObjs = 0xFFFFFFFF;
-    mStaticMapLoaded = StaticMap_None;
+    mStaticMapLoaded = StaticMap::None;
     mNumStaticObjs = 0xFFFFFFFF;
     mMat = sead::Matrix34f::ident;
     mDistanceToCurrentMapUnit = 0;
-- 
cgit v1.2.3