diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-10-27 20:50:29 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-10-27 20:50:29 -0400 |
| commit | 816bedbd011b6729e8be0a4b40213f48fd9d73ca (patch) | |
| tree | b42d7dc277c415db4b826182ecd26b10b714697e /src/world.cpp | |
| parent | 0fa2320e978926db6781a2bdcdf5a9b6f0317e93 (diff) | |
names, jumping
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/world.cpp b/src/world.cpp index 8e2d60b..3ff819b 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -260,8 +260,11 @@ void WorldSystem::load(const std::string& file) world.toLeft = world.toRight = ""; currentXMLFile = file; + std::cout << "ka" << std::endl; game::entities.reset(); + std::cout << "CHOW!!!" << std::endl; game::engine.getSystem<PlayerSystem>()->create(); + std::cout << "chow cow" << std::endl; // iterate through tags while (wxml) { @@ -395,6 +398,8 @@ void WorldSystem::load(const std::string& file) } entity.assign<Physics>(g); + } else if (tname == "Name") { + entity.assign<Name>(coalesce(wxml->Attribute("name"), abcd->Attribute("value"))); } abcd = abcd->NextSiblingElement(); @@ -1085,14 +1090,14 @@ void WorldSystem::detect(entityx::TimeDelta dt) }); } -void WorldSystem::goWorldRight(Position& p) +void WorldSystem::goWorldRight(Position& p, Solid &d) { - if (!(world.toRight.empty()) && (p.x > world.startX * -1 - HLINES(10))) { + if (!(world.toRight.empty()) && (p.x + d.width > world.startX * -1 - HLINES(15))) { ui::toggleBlack(); ui::waitForCover(); auto file = world.toRight; load(file); - p.x = world.startX + HLINES(15); + game::engine.getSystem<PlayerSystem>()->setX(world.startX + HLINES(15)); ui::toggleBlack(); } } @@ -1103,7 +1108,7 @@ void WorldSystem::goWorldLeft(Position& p) ui::toggleBlack(); ui::waitForCover(); load(world.toLeft); - p.x = world.startX * -1 - HLINES(15); + game::engine.getSystem<PlayerSystem>()->setX(world.startX * -1 - HLINES(15)); ui::toggleBlack(); } } @@ -1119,7 +1124,6 @@ void WorldSystem::goWorldPortal(Position& p) ui::toggleBlack(); ui::waitForCover(); load(portal.toFile); - p.x = 0; ui::toggleBlack(); return; } |