aboutsummaryrefslogtreecommitdiffstats
path: root/src/gameplay.cpp
diff options
context:
space:
mode:
authordrumsetmonkey <abelleisle@roadrunner.com>2015-11-13 08:26:31 -0500
committerdrumsetmonkey <abelleisle@roadrunner.com>2015-11-13 08:26:31 -0500
commit613ab3be6ee76595c04b89992e62c41b52bc1a2f (patch)
tree1265eeb4238d04e4a6bf95df439e61c348342eb0 /src/gameplay.cpp
parentac52ecab5df8382b51d48a9431f672bfc502a400 (diff)
Added object class, and added quest listing
Diffstat (limited to 'src/gameplay.cpp')
-rw-r--r--src/gameplay.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index c170511..bfc2bdb 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -5,7 +5,6 @@
extern World *currentWorld;
extern Player *player;
-
extern void mainLoop(void);
int compTestQuest(NPC *speaker){
@@ -32,7 +31,6 @@ void initEverything(void){
/*
* World creation:
*/
-
World *test=new World();
World *playerSpawnHill=new World();
@@ -89,8 +87,10 @@ void initEverything(void){
* Spawn a mob.
*/
- currentWorld->addMob(MS_RABBIT,200,100);
- currentWorld->addMob(MS_BIRD,-500,500);
+ test->addMob(MS_RABBIT,200,100);
+ test->addMob(MS_BIRD,-500,500);
+
+ currentWorld->addObject(2, 500,200);
/*
* Link all the entities that were just created to the initial world, and setup a test AI function.