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 /src/world.cpp | |
| parent | 4bf3665158e71e9b20a2231428d42d400da8332f (diff) | |
| parent | 19ef54b2c5ffcaefdce352c6f195a62c05c42767 (diff) | |
Merge branch 'master' of https://github.com/tcsullivan/gamedev
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/world.cpp b/src/world.cpp index 44d1900..6f31d6d 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -760,8 +760,8 @@ void World::addNPC(float x,float y){ entity.push_back(npc.back()); } -void World::addObject(int i, float x, float y){ - object.push_back(new Object(i)); +void World::addObject(int i, bool q, char *p, float x, float y){ + object.push_back(new Object(i,q, p)); object.back()->spawn(x,y); entity.push_back(object.back()); |