diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities.cpp | 5 | ||||
| -rw-r--r-- | src/gameplay.cpp | 1 | ||||
| -rw-r--r-- | src/world.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index 7ebe744..0df6b17 100644 --- a/src/entities.cpp +++ b/src/entities.cpp @@ -157,7 +157,7 @@ Mob::Mob(int sub){ tex = new Texturec(0); case MS_DOOR: width = HLINE * 12; - height = HLINE * 19; + height = HLINE * 20; tex = new Texturec(1,"assets/door.png"); break; } @@ -417,7 +417,10 @@ unsigned int Structures::spawn(_TYPE t, BUILD_SUB sub, float x, float y){ * with type NPC. */ + //((World*)(inWorld))->addNPC(loc.x + i * HLINE ,100); + //inWorld->addNPC(loc.x + i * HLINE, 100); currentWorld->addNPC(loc.x + i * HLINE ,100); + } diff --git a/src/gameplay.cpp b/src/gameplay.cpp index 6cfc91e..284bd78 100644 --- a/src/gameplay.cpp +++ b/src/gameplay.cpp @@ -143,6 +143,7 @@ void initEverything(void){ currentWorld = worldSpawnHill1; worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2); + worldSpawnHill2->addStructure(STRUCTURET,HOUSE,(rand()%120*HLINE),100,worldSpawnHill1,worldSpawnHill2); player = new Player(); player->spawn(200,100); diff --git a/src/world.cpp b/src/world.cpp index 9a2b6d3..1e205d1 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -909,7 +909,7 @@ void World::addStructure(_TYPE t,BUILD_SUB sub, float x,float y,World *outside,W build.push_back(new Structures()); build.back()->spawn(t,sub,x,y); build.back()->inWorld=outside; - build.back()->inside=(void *)inside; + build.back()->inside=inside; entity.push_back(build.back()); } |