From a75a3b2d8f0848a05b09180d9517a8016cbafdde Mon Sep 17 00:00:00 2001 From: Clyne Sullivan Date: Fri, 30 Oct 2015 08:45:55 -0400 Subject: day/night cycling --- include/common.h | 3 +++ include/inventory.h | 3 ++- include/world.h | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/common.h b/include/common.h index c3b1aed..ce176a6 100644 --- a/include/common.h +++ b/include/common.h @@ -114,4 +114,7 @@ extern vec2 offset; void DEBUG_prints(const char* file, int line, const char *s,...); +void safeSetColor(int r,int g,int b); +void safeSetColorA(int r,int g,int b,int a); + #endif // COMMON_H diff --git a/include/inventory.h b/include/inventory.h index e27391a..d2b4c28 100644 --- a/include/inventory.h +++ b/include/inventory.h @@ -30,7 +30,7 @@ public: int addItem(ITEM_ID id,unsigned char count); // Add 'count' items with an id of 'id' to the inventory int takeItem(ITEM_ID id,unsigned char count); // Take 'count' items with an id of 'id' from the inventory - int useItem(ITEM_ID id); + int useItem(void); bool tossd; int itemToss(void); @@ -42,5 +42,6 @@ public: }; unsigned int initInventorySprites(void); // Loads as many inventory textures as it can find, returns count +void itemUse(void *p); #endif // INVENTORY_H diff --git a/include/world.h b/include/world.h index 5ec01ae..75263e5 100644 --- a/include/world.h +++ b/include/world.h @@ -154,4 +154,6 @@ public: void draw(Player *p); // Draws the world (ignores layers) }; +extern int worldShade; + #endif // WORLD_H -- cgit v1.2.3