From 215e5ee6ce089c3e0d5be28fd816bc7031b6acab Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Sat, 22 Jul 2017 10:22:35 -0400 Subject: style background is useless --- include/world.hpp | 10 ---------- src/world.cpp | 6 ------ xml/!town.xml | 2 +- xml/!town2.xml | 2 +- xml/bobshouse.xml | 2 +- 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/include/world.hpp b/include/world.hpp index a7096a8..570cc9d 100644 --- a/include/world.hpp +++ b/include/world.hpp @@ -20,14 +20,6 @@ using namespace tinyxml2; #include #include -/** - * The background type enum. - * Used to choose which set of background images should be used. - */ -enum class WorldBGType : unsigned int { - Forest = 0 /**< A forest theme. */ -}; - /** * The line structure. * This structure is used to store the world's ground, stored in vertical @@ -90,9 +82,7 @@ struct WorldData2 { std::string toLeft, toRight; /**< File names of the worlds adjacent to this one. */ // Style variables - WorldBGType style; /**< The style type of the world. */ std::string styleFolder; /**< The folder to get stylized textures from. */ - std::vector sTexLoc; /**< File names of stylized textures for structures. */ // Music std::string bgm; /**< The path to the BGM file. */ diff --git a/src/world.cpp b/src/world.cpp index ecd8ae4..22ffdff 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -262,12 +262,6 @@ void WorldSystem::loader(void) // style tag if (tagName == "style") { world.styleFolder = wxml->StrAttribute("folder"); - - unsigned int styleNo; - if (wxml->QueryUnsignedAttribute("background", &styleNo) != XML_NO_ERROR) - UserError("XML Error: No background given in