From 90df6de66335841c5f1c2f4dff385b6b9c4b9f2e Mon Sep 17 00:00:00 2001 From: Brandon Date: Sat, 11 Feb 2017 21:45:33 -0600 Subject: [PATCH] Fix compilation errors --- src/ambiance.h | 1 + src/inventory.cpp | 20 -------------------- 2 files changed, 1 insertion(+), 20 deletions(-) diff --git a/src/ambiance.h b/src/ambiance.h index c3f7837a..224906bf 100644 --- a/src/ambiance.h +++ b/src/ambiance.h @@ -9,6 +9,7 @@ #include "gamedef.h" #include "environment.h" +#include "clientenvironment.h" #include "sound.h" #include "settings.h" #include "sound_openal.h" diff --git a/src/inventory.cpp b/src/inventory.cpp index 15a7ff75..6d5b4991 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -247,26 +247,6 @@ void ItemStack::deSerialize(const std::string &str, IItemDefManager *itemdef) deSerialize(is, itemdef); } -std::string ItemStack::getMetadataDescription() -{ - std::string d(""); - std::string m(metadata); - size_t p1; - - if (m.empty()) - return d; - - if (m.substr(0,8).compare("return {") == 0) { - m = m.substr(8, m.length() - 9); - p1 = m.find("[\"description\"] = \""); - if (p1 != std::string::npos) { - size_t p2 = m.find("\"", p1 + 20); - return m.substr(p1 + 21, p2 - p1 - 21); - } - } - return d; -} - std::string ItemStack::getItemString() const { std::ostringstream os(std::ios::binary);