diff options
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index 6049d2c..1747915 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -86,11 +86,18 @@ int main(int argc, char *argv[]){ //************************************************************************// // Make a world - World *test =new World(SCREEN_WIDTH/2); + World *test=new World(); + test->generate(SCREEN_WIDTH/2); test->addLayer(400); test->addLayer(100); currentWorld=test; + IndoorWorld *iw=new IndoorWorld(); + iw->generate(200); + + test->toRight=iw; + iw->toLeft=test; + // Make the player player=new Player(); player->spawn(0,100); @@ -105,13 +112,6 @@ int main(int argc, char *argv[]){ for(i=0;i<entity.size()+1;i++){ entity[i]->inWorld=test; } - for(i=0;i<entity.size();i++){ - std::cout<<(unsigned)&*entity[i]<<std::endl; - } - std::cout<<std::endl; - for(i=0;i<npc.size();i++){ - std::cout<<(unsigned)&npc[i]<<std::endl; - } //************************************************************************// // END WORLD GENERATION STUFF // |