diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2017-07-22 10:22:35 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2017-07-22 10:22:35 -0400 |
| commit | 215e5ee6ce089c3e0d5be28fd816bc7031b6acab (patch) | |
| tree | ae8560c73d6e8e164bc45d5d96421c106aaa6b07 | |
| parent | 132172601e249327d30b3756c9dbfc73cb2b6b0c (diff) | |
style background is useless
| -rw-r--r-- | include/world.hpp | 10 | ||||
| -rw-r--r-- | src/world.cpp | 6 | ||||
| -rw-r--r-- | xml/!town.xml | 2 | ||||
| -rw-r--r-- | xml/!town2.xml | 2 | ||||
| -rw-r--r-- | 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 @@ -21,14 +21,6 @@ using namespace tinyxml2; #include <vector2.hpp> /** - * 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 * lines. Dirt color and grass properties are also kept track of here. @@ -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<std::string> 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 <style> in " + xmlPath); - - world.style = static_cast<WorldBGType>(styleNo); world.bgm = wxml->StrAttribute("bgm"); std::vector<std::string> bgFiles; diff --git a/xml/!town.xml b/xml/!town.xml index 1b8054d..9f5bd0a 100644 --- a/xml/!town.xml +++ b/xml/!town.xml @@ -2,7 +2,7 @@ <include file="entities.xml"/> <World> - <style background="0" bgm="assets/music/town.ogg" folder="assets/style/classic/"> + <style bgm="assets/music/town.ogg" folder="assets/style/classic/"> <layer path="bg/bg.png"/> <layer path="bg/bgFarMountain.png"/> <layer path="bg/forestTileFar.png"/> diff --git a/xml/!town2.xml b/xml/!town2.xml index bea6538..8df73a4 100644 --- a/xml/!town2.xml +++ b/xml/!town2.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <World> - <style background="0" bgm="assets/music/embark.wav" folder="assets/style/classic/"> + <style bgm="assets/music/embark.wav" folder="assets/style/classic/"> <layer path="bg/bg.png"/> <layer path="bg/bgFarMountain.png"/> <layer path="bg/forestTileFar.png"/> diff --git a/xml/bobshouse.xml b/xml/bobshouse.xml index e6b87e5..0b287b6 100644 --- a/xml/bobshouse.xml +++ b/xml/bobshouse.xml @@ -2,7 +2,7 @@ <include file="entities.xml"/> <IndoorWorld> - <style background="0" bgm="assets/music/theme_jazz.wav" folder="assets/style/classic/"> + <style bgm="assets/music/theme_jazz.wav" folder="assets/style/classic/"> <layer path="bg/bg.png"/> <layer path="bg/bgFarMountain.png"/> <layer path="bg/forestTileFar.png"/> |