diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-24 07:34:00 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2015-11-24 07:34:00 -0500 |
| commit | 5c1be9978e4c9b18c400c051fc2b083a02b74b7a (patch) | |
| tree | 2c8dbf3aea3539d2f4c6db3ef56eb1880fd14786 /include/world.h | |
| parent | 4bf3665158e71e9b20a2231428d42d400da8332f (diff) | |
| parent | 19ef54b2c5ffcaefdce352c6f195a62c05c42767 (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'include/world.h')
| -rw-r--r-- | include/world.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/world.h b/include/world.h index 1a96252..4c82b2c 100644 --- a/include/world.h +++ b/include/world.h @@ -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, float, float); + void addObject(int, bool, char*, float, float); void update(Player *p,unsigned int delta); |