diff options
| author | Andy <drumsetmonkey@gmail.com> | 2016-10-19 10:48:05 -0400 |
|---|---|---|
| committer | Andy <drumsetmonkey@gmail.com> | 2016-10-19 10:48:05 -0400 |
| commit | 87bc18a63541c6e325170fbfacde2d7610a3b852 (patch) | |
| tree | 237c8ade452c64ca5bb97be85421ce9ad90a8894 /include | |
| parent | aff1681f6638f591e2c8281f63847550115a2a19 (diff) | |
| parent | 4f838cdf582f0ace6d7de8cb376dfce7100fbea3 (diff) | |
CATATATATATATATTTTT (basic entities)
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.hpp | 2 | ||||
| -rw-r--r-- | include/entities.hpp | 2 | ||||
| -rw-r--r-- | include/world.hpp | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/include/common.hpp b/include/common.hpp index e7ed8e1..0364b8b 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -56,6 +56,8 @@ typedef unsigned int uint; */ #define DEBUG_printf(message, ...) DEBUG_prints(__FILE__, __LINE__, message, __VA_ARGS__) +#define BREAKPOINT __asm__("int $3") + /** * Creates a coordinate of integers. */ diff --git a/include/entities.hpp b/include/entities.hpp index 95cbff7..e460a27 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 4b25e85..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. */ }; /** @@ -198,6 +197,9 @@ private: public: + float HouseWidth; + GLuint houseTex; + inline bool isIndoor(void) const { return m_Indoor; } |