fix maps with no rooms crashing on room add

Author: Astral-C

include/DOM/MapDOMNode.hpp

@@ -16,6 +16,7 @@ class LRoomDOMNode;
 // DOM node representing an entire map, including rooms and objects.
 class LMapDOMNode : public LDOMNodeBase
 {
+	uint32_t mMapNum;
 	std::shared_ptr<Archive::Rarc> mMapArchive;
 	LJmpIO JmpIOManagers[LEntityType_Max];
 	LStaticMapDataIO mStaticMapIO;
@@ -42,6 +43,7 @@ class LMapDOMNode : public LDOMNodeBase
 	std::shared_ptr<LRoomDOMNode> GetRoomByIndex(int32_t index);
 	std::weak_ptr<Archive::Rarc> GetArchive() { return mMapArchive; };
 	void SetArchive(std::shared_ptr<Archive::Rarc> arc) { mMapArchive = arc; };
+	uint32_t GetMapNumber() { return mMapNum; }
 
 /*=== Type operations ===*/
 	// Returns whether this node is of the given type, or derives from a node of that type.

src/DOM/MapDOMNode.cpp

@@ -70,6 +70,9 @@ bool LMapDOMNode::LoadMap(std::filesystem::path file_path)
 
 	mMapArchive = Archive::Rarc::Create();
 
+	char mapname[5];
+	std::sscanf(file_path.string().c_str(), "%3s%d", &mapname[0], &mMapNum);
+
 	// Make sure file path is valid
 	if (!std::filesystem::exists(file_path))
 	{
@@ -113,10 +116,10 @@ bool LMapDOMNode::LoadMap(std::filesystem::path file_path)
 				std::string eventName = archive.path().stem().string();
 				std::string csvName = eventName;
 
-				char* eventNm[5];
+				char eventNm[5];
 				int eventNo = 0;
 
-				std::sscanf(eventName.c_str(), "%5s%3d", &eventNm, &eventNo);
+				std::sscanf(eventName.c_str(), "%5s%3d", &eventNm[0], &eventNo);
 				csvName = std::format("message{}", eventNo);
 				std::shared_ptr<LEventDataDOMNode> eventData =  std::make_shared<LEventDataDOMNode>(eventName);
 
@@ -155,6 +158,19 @@ bool LMapDOMNode::LoadMap(std::filesystem::path file_path)
 		}
 	}
 
+	// Load Collision
+	LGenUtility::Log << "[MapDOMNode] Loading Map Collision" << std::endl;
+	std::shared_ptr<LMapCollisionDOMNode> collision = std::make_shared<LMapCollisionDOMNode>("Collision");
+
+	std::shared_ptr<Archive::File> collisionFile = mMapArchive->GetFile("col.mp");
+
+	if (collisionFile != nullptr)
+	{
+		bStream::CMemoryStream collisionMemStream(collisionFile->GetData(), collisionFile->GetSize(), bStream::Endianess::Big, bStream::OpenMode::In);
+		collision->Load(&collisionMemStream);
+		AddChild(collision);
+	}
+
 	if (!ReadStaticData(roomsMap))
 	{
 		LGenUtility::Log << std::format("[MapDOMNode]: Failed to open static data from {0}", roomsMap.string()) << std::endl;
@@ -208,18 +224,6 @@ bool LMapDOMNode::LoadMap(std::filesystem::path file_path)
 	LoadStaticData(rooms);
 
 
-	// Load Collision
-	LGenUtility::Log << "[MapDOMNode] Loading Map Collision" << std::endl;
-	std::shared_ptr<LMapCollisionDOMNode> collision = std::make_shared<LMapCollisionDOMNode>("Collision");
-
-	std::shared_ptr<Archive::File> collisionFile = mMapArchive->GetFile("col.mp");
-
-	if (collisionFile != nullptr)
-	{
-		bStream::CMemoryStream collisionMemStream(collisionFile->GetData(), collisionFile->GetSize(), bStream::Endianess::Big, bStream::OpenMode::In);
-		collision->Load(&collisionMemStream);
-		AddChild(collision);
-	}
 
 	LGenUtility::Log << "[MapDOMNode] Loading JMP Files" << std::endl;
 

src/modes/ActorMode.cpp

@@ -68,7 +68,12 @@ void LActorMode::RenderSceneHierarchy(std::shared_ptr<LMapDOMNode> current_map,
 		std::shared_ptr<LRoomDOMNode> newRoom = std::make_shared<LRoomDOMNode>(std::format("Room {}", rooms.size() + 1));
 		std::shared_ptr<LRoomDataDOMNode> newRoomData = std::make_shared<LRoomDataDOMNode>(std::format("Room {}", rooms.size() + 1));
 
-		std::string resourcePathRoot = std::filesystem::path(rooms[0]->GetChildrenOfType<LRoomDataDOMNode>(EDOMNodeType::RoomData)[0]->GetResourcePath()).parent_path().string();
+		std::string resourcePathRoot = "";
+		if(rooms.size() == 0){
+			resourcePathRoot = std::filesystem::path("Iwamoto") / std::format("map{}", current_map->GetMapNumber());
+		} else {
+			resourcePathRoot = std::filesystem::path(rooms[0]->GetChildrenOfType<LRoomDataDOMNode>(EDOMNodeType::RoomData)[0]->GetResourcePath()).parent_path().string();
+		}
 
 		newRoomData->SetRoomResourcePath(std::format("{}/room_{:02}.arc", resourcePathRoot, rooms.size() + 1));