fix: getting the project in a compilable state

Peronium-Online · Nov 15, 2023 · 138e8c8 · 138e8c8
1 parent 46191d1
commit 138e8c8
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 3 deletions.
diff --git a/include/libs/item/ItemAttributes.h b/include/libs/item/ItemAttributes.h
@@ -5,6 +5,7 @@
 #include "libs/item/itemenums.h"
 #include "libs/util/datastructures/CustomLuaAttribute.h"
 
+#include <map>
 #include <unordered_map>
 
 typedef std::unordered_map<std::string, CustomLuaAttribute> CustomAttributeMap;
@@ -95,6 +96,8 @@ class ItemAttributes
 	                                             ITEM_ATTRIBUTE_WRITER | ITEM_ATTRIBUTE_NAME | ITEM_ATTRIBUTE_ARTICLE |
 	                                             ITEM_ATTRIBUTE_PLURALNAME;
 
+	const static std::string& EMPTY_STRING;
+
 public:
 	ItemAttributes() = default;
 

diff --git a/include/libs/item/ReflectAttribute.h b/include/libs/item/ReflectAttribute.h
@@ -19,7 +19,7 @@ struct Reflect
 	uint16_t percent = 0;
 	uint16_t chance = 0;
 
-	static Reflect UNDEFINED;
+	static const Reflect UNDEFINED;
 };
 
 #endif
diff --git a/include/libs/util/tools/pugicast.h b/include/libs/util/tools/pugicast.h
@@ -76,6 +76,12 @@ inline unsigned int cast(const char* str)
 	return static_cast<unsigned int>(cast<unsigned long>(str));
 }
 
+template <>
+inline bool cast(const char* str)
+{
+	return cast<int>(str) == 1 || strcmp(str, "true") == 1;
+}
+
 } // namespace pugi
 
 #endif // FS_PUGICAST_H
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -75,6 +75,7 @@ set(peronium_SRC
 	${CMAKE_CURRENT_LIST_DIR}/libs/util/tools/random.cpp
 	${CMAKE_CURRENT_LIST_DIR}/libs/util/tools/strings.cpp
 	${CMAKE_CURRENT_LIST_DIR}/libs/util/tools/xml.cpp
+	${CMAKE_CURRENT_LIST_DIR}/libs/util/otb/OTBLoadable.cpp
 	${CMAKE_CURRENT_LIST_DIR}/libs/item/itemmaps.cpp
 	${CMAKE_CURRENT_LIST_DIR}/libs/item/Item.cpp
 	${CMAKE_CURRENT_LIST_DIR}/libs/item/ItemAttributes.cpp

diff --git a/src/libs/item/ItemAttributes.cpp b/src/libs/item/ItemAttributes.cpp
@@ -2,6 +2,10 @@
 
 #include <iostream>
 
+const Reflect Reflect::UNDEFINED;
+
+const std::string& ItemAttributes::EMPTY_STRING = "";
+
 bool ItemAttributes::equals(const ItemAttributes& other) const
 {
 	if (attributeBits != other.attributeBits) {
@@ -87,12 +91,12 @@ const std::string& ItemAttributes::getStrAttr(ItemAttrTypes type) const
 	if (!isStrAttrType(type)) {
 		std::cout << "Warning: trying to get non-string attribute: " << type << std::endl;
 
-		return "";
+		return EMPTY_STRING;
 	}
 
 	const Attribute* attr = getExistingAttr(type);
 	if (!attr) {
-		return "";
+		return EMPTY_STRING;
 	}
 	return *attr->value.string;
 }

diff --git a/src/libs/item/ItemType.cpp b/src/libs/item/ItemType.cpp
@@ -417,6 +417,8 @@ ItemType* ItemType::loadFromXMLNode(pugi::xml_node node, bool reloading)
 			return Items::getInstance().getItemType(fromId);
 		}
 	}
+
+	return this;
 }
 
 void ItemType::setField(const std::string& element, ConditionDamage* cd)
@@ -526,6 +528,8 @@ ConditionDamage* ConditionDamageBuilder::loadFromXMLNode(pugi::xml_node node, bo
 
 		return this->conditionDamage.release();
 	}
+
+	return this->conditionDamage.release();
 }
 
 void ItemType::setWorth(uint64_t amount)

diff --git a/src/libs/item/Items.cpp b/src/libs/item/Items.cpp
@@ -9,6 +9,8 @@
 extern MoveEvents* g_moveEvents;
 extern Weapons* g_weapons;
 
+CurrencyMap Items::currencyItems = {};
+
 bool Items::load(const OTBNode& node, PropStream stream)
 {
 	uint32_t flags;