diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/Texture.h | 3 | ||||
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/entities.h | 15 | ||||
| -rw-r--r-- | include/inventory.h | 3 | ||||
| -rw-r--r-- | include/ui.h | 2 | ||||
| -rw-r--r-- | include/world.h | 3 |
6 files changed, 18 insertions, 10 deletions
diff --git a/include/Texture.h b/include/Texture.h index 7160d37..50681bf 100644 --- a/include/Texture.h +++ b/include/Texture.h @@ -28,6 +28,9 @@ namespace Texture{ */ GLuint loadTexture(const char *fileName); + + void freeTextures(void); + void initColorIndex(); vec2 getIndex(Color c); } diff --git a/include/common.h b/include/common.h index f5952eb..0df6533 100644 --- a/include/common.h +++ b/include/common.h @@ -215,6 +215,8 @@ unsigned int millis(void); int getdir(const char *dir, std::vector<std::string> &files); void strVectorSortAlpha(std::vector<std::string> *v); +const char *readFile(const char *path); + int strCreateFunc(const char *equ); extern void *NULLPTR; diff --git a/include/entities.h b/include/entities.h index edf7022..fa98285 100644 --- a/include/entities.h +++ b/include/entities.h @@ -65,15 +65,13 @@ public: bool gravity; bool behind; Particles(float x, float y, float w, float h, float vx, float vy, Color c, float d){ - loc.x = (x); - loc.y = (y); - width = (w); - height = (h); + loc.x = x; + loc.y = y; + width = w; + height = h; velx = vx; vely = vy; - color.red = (c.red); - color.green = (c.green); - color.blue = (c.blue); + color = c; duration = d; fountain = false; gravity = true; @@ -186,7 +184,7 @@ public: class NPC : public Entity{ public: std::vector<int (*)(NPC *)>aiFunc; - unsigned int dialogIndex; + int dialogIndex; NPC(); ~NPC(); @@ -200,7 +198,6 @@ class Structures : public Entity{ public: BUILD_SUB bsubtype; char *inside; - //char *outside; Structures(); ~Structures(); diff --git a/include/inventory.h b/include/inventory.h index b035f91..a08954a 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -106,8 +106,9 @@ public: } }; -void itemUse(void *p); void initInventorySprites(void); +void destroyInventory(void); + char *getItemTexturePath(ITEM_ID id); int getItemWidth(ITEM_ID); int getItemHeight(ITEM_ID); diff --git a/include/ui.h b/include/ui.h index b769bbf..c018008 100644 --- a/include/ui.h +++ b/include/ui.h @@ -41,6 +41,8 @@ namespace ui { void initFonts(void); + void destroyFonts(void); + /* * Sets the current font/font size. */ diff --git a/include/world.h b/include/world.h index a1cc870..3209284 100644 --- a/include/world.h +++ b/include/world.h @@ -272,6 +272,9 @@ public: */ int getTheWidth(void); + + void save(void); + void load(void); }; /* |