aboutsummaryrefslogtreecommitdiffstats
path: root/include/world.h
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-11-30 08:49:20 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-11-30 08:49:20 -0500
commitaf22d85f9a417a94ea75db1878219f8baeba8b73 (patch)
treec0564e39209b3e9acb8b65e98632b04c1828d55e /include/world.h
parent0415b7f0a9305cd43e8fd8c77a8bafd3b8016dd0 (diff)
parent45bca98b792f8ced1a57ef8c5beed2a90a79d47f (diff)
Working on animations
Diffstat (limited to 'include/world.h')
-rw-r--r--include/world.h17
1 files changed, 2 insertions, 15 deletions
diff --git a/include/world.h b/include/world.h
index 4c82b2c..a2414e6 100644
--- a/include/world.h
+++ b/include/world.h
@@ -1,7 +1,7 @@
#ifndef WORLD_H
#define WORLD_H
-#include <common.h> // For HLINE, vec2, OpenGL utilities, etc.
+#include <common.h> // For HLINE, vec2, OpenGL utilities, etc.
#include <entities.h>
#define GEN_INC 10 // Defines at what interval y values should be calculated for the array 'line'.
@@ -102,7 +102,7 @@ public:
void addMob(int t,float x,float y);
void addMob(int t,float x,float y,void (*hey)());
void addNPC(float x,float y);
- void addObject(int, bool, char*, float, float);
+ void addObject(ITEM_ID, bool, const char *, float, float);
void update(Player *p,unsigned int delta);
@@ -176,19 +176,6 @@ public:
int getTheWidth(void);
- /*
- * Stores all of this class's contents in a string for saving to a file. This array should
- * be freed after being written to a file.
- */
-
- char *save(unsigned int *ssize);
-
- /*
- * Loads a previous world's contents (from save()) into this one.
- */
-
- void load(char *buf);
-
};
/*