aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-10-18 20:26:12 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-10-18 20:26:12 -0400
commit4f838cdf582f0ace6d7de8cb376dfce7100fbea3 (patch)
tree1b22a46e0e14bb769434b12c18e41df3c6d0dce8 /include
parent02993cd8697970db97a7dd7a67a893ad8dce45a3 (diff)
indoor world work
Diffstat (limited to 'include')
-rw-r--r--include/entities.hpp2
-rw-r--r--include/world.hpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/include/entities.hpp b/include/entities.hpp
index 49598bd..945e8c8 100644
--- a/include/entities.hpp
+++ b/include/entities.hpp
@@ -343,6 +343,8 @@ public:
std::string inside;
std::string textureLoc;
+ GLuint insideTex;
+
Structures();
~Structures();
diff --git a/include/world.hpp b/include/world.hpp
index 7dccf1b..dc07267 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -17,8 +17,7 @@
* in World::setBackground() to select the appropriate images.
*/
enum class WorldBGType : unsigned int {
- Forest = 0, /**< A forest theme. */
- WoodHouse /**< An indoor wooden house theme. */
+ Forest = 0 /**< A forest theme. */
};
/**
@@ -199,6 +198,7 @@ private:
public:
float HouseWidth;
+ GLuint houseTex;
inline bool isIndoor(void) const
{ return m_Indoor; }