diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-04 07:32:15 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-04 07:32:15 -0400 |
| commit | a45daeda3633bdf25267a0186b39618269dca970 (patch) | |
| tree | dea5bfdbadadc6d7cbd51fb0c760e5a5760959fb /include | |
| parent | ba627aebb20e19b800133abe24fb7d9e650055c3 (diff) | |
XML folder changing
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.hpp | 7 | ||||
| -rw-r--r-- | include/inventory.hpp | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/common.hpp b/include/common.hpp index 5159c88..2abd9db 100644 --- a/include/common.hpp +++ b/include/common.hpp @@ -35,6 +35,8 @@ typedef unsigned int uint; #undef near #endif +//#define SEGFAULT + /** * This flag lets the compiler know that we want to use shaders. */ @@ -157,6 +159,8 @@ extern float VOLUME_SFX; #define initRand(s) srand(s) + + /** * A 'wrapper' for libc's rand(), as we hope to eventually have our own random number * generator. @@ -176,8 +180,7 @@ extern float VOLUME_SFX; */ #define DEBUG_printf( message, ...) DEBUG_prints(__FILE__, __LINE__, message, __VA_ARGS__ ) -#define C(x) std::cout << x << std::endl; - +void C(std::string m); /** * Defines pi for calculations that need it. */ diff --git a/include/inventory.hpp b/include/inventory.hpp index 5336cee..e38f89a 100644 --- a/include/inventory.hpp +++ b/include/inventory.hpp @@ -15,6 +15,7 @@ public: float width; float height; int maxStackSize; + float attribValue; std::string texloc; Texturec *tex; |