diff options
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 57 |
1 files changed, 52 insertions, 5 deletions
diff --git a/src/world.cpp b/src/world.cpp index 4b5bb2d..508e2ac 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -18,6 +18,7 @@ #include <render.hpp> #include <engine.hpp> #include <components.hpp> +#include <player.hpp> // local library headers #include <tinyxml2.h> @@ -236,6 +237,8 @@ void WorldSystem::load(const std::string& file) } } + world.toLeft = world.toRight = ""; + // iterate through tags while (wxml) { std::string tagName = wxml->Name(); @@ -299,6 +302,27 @@ void WorldSystem::load(const std::string& file) game::time::setTickCount(std::stoi(wxml->GetText())); } + else if (tagName == "entity") { + auto str2coord = [](std::string s) -> vec2 { + auto cpos = s.find(','); + s[cpos] = '\0'; + return vec2 (std::stof(s), std::stof(s.substr(cpos + 1))); + }; + + auto entity = game::entities.create(); + + auto loc = wxml->Attribute("loc"); + if (loc != nullptr) { + auto locVec = str2coord(loc); + float locDat[2] = {locVec.x, locVec.y}; + entity.assign<Position>(locDat[0], locDat[1]); + } + + unsigned int health; + if (wxml->QueryUnsignedAttribute("health", &health) != XML_NO_ERROR) + entity.assign<Health>(health, health); + } + // hill creation /*else if (tagName == "hill") { addHill(ivec2 { wxml->IntAttribute("peakx"), wxml->IntAttribute("peaky") }, wxml->UnsignedAttribute("width")); @@ -930,13 +954,12 @@ void WorldSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, void WorldSystem::detect(entityx::TimeDelta dt) { - game::entities.each<Position, Direction, Health, Solid>( - [&](entityx::Entity e, Position &loc, Direction &vel, Health &health, Solid &dim) { - + game::entities.each<Position, Direction, Solid>( + [&](entityx::Entity e, Position &loc, Direction &vel, Solid &dim) { (void)e; - if (health.health <= 0) - UserError("die mofo"); + //if (health.health <= 0) + // UserError("die mofo"); // get the line the entity is on int line = std::clamp(static_cast<int>((loc.x + dim.width / 2 - world.startX) / game::HLINE), @@ -973,3 +996,27 @@ void WorldSystem::detect(entityx::TimeDelta dt) } }); } + +void WorldSystem::goWorldRight(Position& p) +{ + if (!(world.toRight.empty()) && (p.x > world.startX * -1 - HLINES(10))) { + ui::toggleBlack(); + ui::waitForCover(); + auto file = world.toRight; + load(file); + p.x = world.startX + HLINES(15); + ui::toggleBlack(); + } +} + +void WorldSystem::goWorldLeft(Position& p) +{ + if (!(world.toLeft.empty()) && (p.x < world.startX + HLINES(10))) { + ui::toggleBlack(); + ui::waitForCover(); + auto file = world.toLeft; + load(file); + p.x = world.startX * -1 - HLINES(15); + ui::toggleBlack(); + } +} |