actually, using paths is dumb here when they're already char strings.…

… why bother? silly me.
DarkflameUniverse · Apr 23, 2024 · d8562a0 · d8562a0
1 parent 16412eb
commit d8562a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/dDatabase/CDClientDatabase/CDClientTables/CDTamingBuildPuzzleTable.h b/dDatabase/CDClientDatabase/CDClientTables/CDTamingBuildPuzzleTable.h
@@ -1,8 +1,6 @@
 #pragma once
 #include "CDTable.h"
 
-#include <filesystem>
-
 /**
  * Information for the minigame to be completed
  */
@@ -16,10 +14,10 @@ struct CDTamingBuildPuzzle {
 	UNUSED_COLUMN(LOT npcLot = LOT_NULL;)
 
 	// The .lxfml file that contains the bricks required to build the model
-	std::filesystem::path validPieces{};
+	std::string validPieces{};
 
 	// The .lxfml file that contains the bricks NOT required to build the model
-	UNUSED_COLUMN(std::filesystem::path invalidPieces{};)
+	UNUSED_COLUMN(std::string invalidPieces{};)
 
 	// Difficulty value
 	UNUSED_COLUMN(int32_t difficulty = 1;)
@@ -34,10 +32,10 @@ struct CDTamingBuildPuzzle {
 	UNUSED_COLUMN(int32_t totalNumPieces = 16;)
 
 	// Model name
-	UNUSED_COLUMN(std::filesystem::path modelName{};)
+	UNUSED_COLUMN(std::string modelName{};)
 
 	// The .lxfml file that contains the full model
-	UNUSED_COLUMN(std::filesystem::path fullModel{};)
+	UNUSED_COLUMN(std::string fullModel{};)
 
 	// The duration of the pet taming minigame
 	UNUSED_COLUMN(float duration = 45.0f;)

diff --git a/dGame/dComponents/PetComponent.cpp b/dGame/dComponents/PetComponent.cpp
@@ -182,7 +182,7 @@ void PetComponent::OnUse(Entity* originator) {
 		return;
 	}
 
-	const auto& bricks = BrickDatabase::GetBricks(entry.validPieces.string());
+	const auto& bricks = BrickDatabase::GetBricks(entry.validPieces);
 	if (bricks.empty()) {
 		ChatPackets::SendSystemMessage(originator->GetSystemAddress(), u"Failed to load the puzzle minigame for this pet.");
 		LOG("Couldn't find %s for minigame!", entry.validPieces.c_str());