From dd6d1e79df7d48e93ba22551b8858d77d041c197 Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Thu, 3 Dec 2015 15:50:07 -0500 Subject: enabled werror, wall and wextra (\!) --- include/entities.h | 2 ++ include/inventory.h | 1 - include/world.h | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/entities.h b/include/entities.h index 19dd492..77ca347 100644 --- a/include/entities.h +++ b/include/entities.h @@ -87,6 +87,8 @@ public: virtual void wander(int){} virtual void interact(){} + + virtual ~Entity(){} }; class Player : public Entity { diff --git a/include/inventory.h b/include/inventory.h index 1ad46d0..e71e76a 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -48,7 +48,6 @@ public: char* textureLoc; Texturec *tex; GLuint text; - int count; Item(ITEM_ID i, const char *n, ITEM_TYPE t, float w, float h, int m, const char *tl); GLuint rtex(){ diff --git a/include/world.h b/include/world.h index 57ea091..952c2e5 100644 --- a/include/world.h +++ b/include/world.h @@ -118,7 +118,7 @@ public: */ World(void); - ~World(void); // Frees the 'line' array. + virtual ~World(void); // Frees the 'line' array. /* * Generate a world of width `width`. This function is virtual so that other world @@ -183,6 +183,8 @@ public: int getTheWidth(void); + void save(FILE *); + void load(FILE *); }; /* -- cgit v1.2.3