diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Texture.h | 6 | ||||
| -rw-r--r-- | include/entities.h | 7 | ||||
| -rw-r--r-- | include/inventory.h | 1 | ||||
| -rw-r--r-- | include/ui.h | 3 | ||||
| -rw-r--r-- | include/world.h | 6 |
5 files changed, 19 insertions, 4 deletions
diff --git a/include/Texture.h b/include/Texture.h index c590f6a..1a32aae 100644 --- a/include/Texture.h +++ b/include/Texture.h @@ -13,13 +13,15 @@ class Texturec{ private: unsigned int texState; public: + GLuint *image; + Texturec(uint amt, ...); + ~Texturec(); + void bindNext(); void bindPrev(); void bind(unsigned int); void walk(); - - GLuint *image; }; #endif //TEXTURE_H diff --git a/include/entities.h b/include/entities.h index 0bdadb7..c593710 100644 --- a/include/entities.h +++ b/include/entities.h @@ -95,6 +95,7 @@ public: bool light = false; Player(); + ~Player(); void interact(); }; @@ -103,6 +104,7 @@ public: std::vector<int (*)(NPC *)>aiFunc; NPC(); + ~NPC(); void addAIFunc(int (*func)(NPC *),bool preload); void interact(); @@ -115,6 +117,8 @@ public: void *inside; Structures(); + ~Structures(); + unsigned int spawn(_TYPE, float, float); }; @@ -125,6 +129,8 @@ public: Mob(int); Mob(int,unsigned int); + ~Mob(); + void wander(int); }; @@ -136,6 +142,7 @@ public: bool questObject = false; Object(ITEM_ID id, bool qo, const char *pd); + ~Object(); void interact(void); std::thread runInteract() { diff --git a/include/inventory.h b/include/inventory.h index 8567b8b..cde8d2a 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -3,7 +3,6 @@ #include <common.h> #include <string.h> -#include <boost/range/adaptor/reversed.hpp> #define DEBUG diff --git a/include/ui.h b/include/ui.h index 51b5c19..4d30b9b 100644 --- a/include/ui.h +++ b/include/ui.h @@ -59,7 +59,8 @@ namespace ui { * limited until a right click is given, closing the box. */ - void dialogBox(const char *name,char *opt,const char *text,...); + void dialogBox(const char *name,const char *opt,const char *text,...); + void waitForDialog(void); /* * Draws a larger string in the center of the screen. Drawing is done inside this function. diff --git a/include/world.h b/include/world.h index 4e4c28d..6c0395d 100644 --- a/include/world.h +++ b/include/world.h @@ -63,6 +63,12 @@ protected: void singleDetect(Entity *e); /* + * Deletes all entities in the world. + */ + + void deleteEntities(void); + + /* * The size of the line array. This is set once by World->generate(). */ |