diff options
| -rw-r--r-- | assets/door.png | bin | 280 -> 0 bytes | |||
| -rw-r--r-- | include/entities.h | 3 | ||||
| -rw-r--r-- | src/entities.cpp | 5 | ||||
| -rw-r--r-- | src/gameplay.cpp | 1 | ||||
| -rw-r--r-- | src/world.cpp | 2 | ||||
| -rw-r--r-- | xcf/door.xcf | bin | 1628 -> 0 bytes |
6 files changed, 7 insertions, 4 deletions
diff --git a/assets/door.png b/assets/door.png Binary files differdeleted file mode 100644 index 582a52d..0000000 --- a/assets/door.png +++ /dev/null diff --git a/include/entities.h b/include/entities.h index 1abe886..7a97200 100644 --- a/include/entities.h +++ b/include/entities.h @@ -138,7 +138,7 @@ public: virtual ~Entity(){} }; -class Player : public Entity { +class Player : public Entity{ public: QuestHandler qh; bool light = false; @@ -147,7 +147,6 @@ public: ~Player(); void interact(); }; - class NPC : public Entity{ public: std::vector<int (*)(NPC *)>aiFunc; 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()); } diff --git a/xcf/door.xcf b/xcf/door.xcf Binary files differdeleted file mode 100644 index ab8e078..0000000 --- a/xcf/door.xcf +++ /dev/null |
