aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/components.hpp21
-rw-r--r--include/events.hpp9
-rw-r--r--include/world.hpp3
-rw-r--r--src/components.cpp56
-rw-r--r--src/engine.cpp3
-rw-r--r--src/ui.cpp1
-rw-r--r--src/world.cpp47
-rw-r--r--xml/!town.xml4
-rw-r--r--xml/entities.xml1
9 files changed, 97 insertions, 48 deletions
diff --git a/include/components.hpp b/include/components.hpp
index 507aa33..f2e040d 100644
--- a/include/components.hpp
+++ b/include/components.hpp
@@ -12,6 +12,7 @@
#include <entityx/entityx.h>
#include <common.hpp>
#include <texture.hpp>
+#include <events.hpp>
/**
* @struct Position
@@ -229,25 +230,37 @@ struct Visible {
float z; /**< The value along the z axis the entity will be drawn on */
};
+struct Dialog {
+ Dialog(int idx = 0)
+ : index(idx) {}
+
+ int index;
+};
+
/**
* SYSTEMS
*/
class MovementSystem : public entityx::System<MovementSystem> {
-private:
public:
void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
};
class PhysicsSystem : public entityx::System<PhysicsSystem> {
-private:
public:
- void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt);
+ void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
};
+
class RenderSystem : public entityx::System<RenderSystem> {
-private:
public:
void update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt) override;
};
+class DialogSystem : public entityx::System<DialogSystem>, public entityx::Receiver<DialogSystem> {
+public:
+ void configure(entityx::EventManager&);
+ void receive(const MouseClickEvent&);
+ void update(entityx::EntityManager&, entityx::EventManager&, entityx::TimeDelta) override;
+};
+
#endif //COMPONENTS_HPP
diff --git a/include/events.hpp b/include/events.hpp
index 6a9bd8c..8a09638 100644
--- a/include/events.hpp
+++ b/include/events.hpp
@@ -8,6 +8,7 @@
#include <SDL2/SDL.h>
#include <string>
+#include <common.hpp>
class World;
@@ -18,6 +19,14 @@ struct MouseScrollEvent {
int scrollDistance;
};
+struct MouseClickEvent {
+ MouseClickEvent(vec2 pos, int b)
+ : position(pos), button(b) {}
+
+ vec2 position;
+ int button;
+};
+
struct KeyDownEvent {
KeyDownEvent(SDL_Keycode kc = 0)
: keycode(kc) {}
diff --git a/include/world.hpp b/include/world.hpp
index 421031c..8d88e5a 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -144,6 +144,9 @@ public:
ev.subscribe<BGMToggleEvent>(*this);
}
+ inline XMLDocument* getXML(void)
+ { return &xmlDoc; }
+
inline float getWidth(void) const
{ return world.startX * -2.0f; }
diff --git a/src/components.cpp b/src/components.cpp
index 609b5f4..c7069ce 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -6,6 +6,7 @@
#include <render.hpp>
#include <ui.hpp>
#include <engine.hpp>
+#include <world.hpp>
void MovementSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
{
@@ -246,3 +247,58 @@ if (health != maxHealth) {
Render::worldShader.disable();
Render::worldShader.unuse();
}*/
+
+void DialogSystem::configure(entityx::EventManager &ev)
+{
+ ev.subscribe<MouseClickEvent>(*this);
+}
+
+void DialogSystem::receive(const MouseClickEvent &mce)
+{
+ game::entities.each<Position, Solid, Dialog, Name>(
+ [&](entityx::Entity e, Position &pos, Solid &dim, Dialog &d, Name &name) {
+ (void)e;
+ (void)d;
+
+ if (((mce.position.x > pos.x) & (mce.position.x < pos.x + dim.width)) &&
+ ((mce.position.y > pos.y) & (mce.position.y < pos.y + dim.height))) {
+
+ std::thread([&] {
+ auto exml = game::engine.getSystem<WorldSystem>()->getXML()->FirstChildElement("Dialog");
+ int newIndex;
+
+ if (exml != nullptr) {
+ while (exml->StrAttribute("name") != name.name)
+ exml = exml->NextSiblingElement();
+
+ exml = exml->FirstChildElement("text");
+ while (exml->IntAttribute("id") != d.index)
+ exml = exml->NextSiblingElement();
+
+ auto cxml = exml->FirstChildElement("content");
+ if (cxml == nullptr)
+ return;
+
+ auto content = cxml->GetText() - 1;
+ while (*++content && isspace(*content));
+
+ ui::dialogBox(name.name, "", false, content);
+ ui::waitForDialog();
+
+ if (exml->QueryIntAttribute("nextid", &newIndex) == XML_NO_ERROR)
+ d.index = newIndex;
+ }
+ }).detach();
+
+ }
+ }
+ );
+}
+
+void DialogSystem::update(entityx::EntityManager &en, entityx::EventManager &ev, entityx::TimeDelta dt)
+{
+ (void)en;
+ (void)ev;
+ (void)dt;
+}
+
diff --git a/src/engine.cpp b/src/engine.cpp
index 148c496..152e3a4 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -25,8 +25,10 @@ void Engine::init(void) {
systems.add<InventorySystem>();
systems.add<WorldSystem>();
systems.add<PlayerSystem>();
+
systems.add<PhysicsSystem>();
systems.add<MovementSystem>();
+ systems.add<DialogSystem>();
systems.configure();
@@ -47,6 +49,7 @@ void Engine::update(entityx::TimeDelta dt)
{
systems.update<InputSystem>(dt);
systems.update<MovementSystem>(dt);
+ //systems.update<DialogSystem>(dt);
systems.update<WorldSystem>(dt);
systems.update<PlayerSystem>(dt);
}
diff --git a/src/ui.cpp b/src/ui.cpp
index 41e8186..e9738cf 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1272,6 +1272,7 @@ void InputSystem::update(entityx::EntityManager &en, entityx::EventManager &ev,
//case SDL_MOUSEBUTTONUP:
case SDL_MOUSEBUTTONDOWN:
+ ev.emit<MouseClickEvent>(mouse, e.button.button);
// run actions?
//if ((action::make = e.button.button & SDL_BUTTON_RIGHT))
diff --git a/src/world.cpp b/src/world.cpp
index 7c53ee4..8f67d8b 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -164,45 +164,6 @@ bool WorldSystem::save(const std::string& s)
return false;
}
-/*static bool loadedLeft = false;
-static bool loadedRight = false;
-
-World *loadWorldFromXML(std::string path) {
- if (!currentXML.empty())
- currentWorld->save();
-
- return loadWorldFromXMLNoSave(path);
-}
-
-World *loadWorldFromPtr(World *ptr)
-{
- currentWorld->save(); // save the current world to the current xml path
-
- if (ptr->getToLeft() == currentXML) {
- currentWorldToLeft = currentWorld;
- loadedRight = true;
- currentWorldToRight = loadWorldFromXMLNoSave(ptr->getToRight());
- loadedRight = false;
- } else if (ptr->getToRight() == currentXML) {
- currentWorldToRight = currentWorld;
- loadedLeft = true;
- currentWorldToLeft = loadWorldFromXMLNoSave(ptr->getToLeft());
- loadedLeft = false;
- }
-
- return ptr;
-}
-
-World *
-loadWorldFromXMLNoTakeover(std::string path)
-{
- loadedLeft = true, loadedRight = true;
- auto ret = loadWorldFromXMLNoSave(path);
- loadedLeft = false, loadedRight = false;
- return ret;
-}
-*/
-
void WorldSystem::load(const std::string& file)
{
auto str2coord = [](std::string s) -> vec2 {
@@ -400,6 +361,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")));
+ } else if (tname == "Dialog") {
+ entity.assign<Dialog>();
} else if (tname == "Grounded") {
entity.assign<Grounded>();
}
@@ -1118,7 +1081,7 @@ void WorldSystem::goWorldRight(Position& p, Solid &d)
ui::waitForCover();
auto file = world.toRight;
load(file);
- game::engine.getSystem<PlayerSystem>()->setX(world.startX + HLINES(15));
+ //game::engine.getSystem<PlayerSystem>()->setX(world.startX + HLINES(15));
ui::toggleBlack();
}
}
@@ -1129,7 +1092,7 @@ void WorldSystem::goWorldLeft(Position& p)
ui::toggleBlack();
ui::waitForCover();
load(world.toLeft);
- game::engine.getSystem<PlayerSystem>()->setX(world.startX * -1 - HLINES(15));
+ //game::engine.getSystem<PlayerSystem>()->setX(world.startX * -1 - HLINES(15));
ui::toggleBlack();
}
}
@@ -1141,7 +1104,7 @@ void WorldSystem::goWorldPortal(Position& p)
(void)entity;
auto& size = sprite.sprite.front().first.size;
- if (p.x > loc.x && p.x < loc.x + size.x) {
+ if (!(portal.toFile.empty()) && p.x > loc.x && p.x < loc.x + size.x) {
ui::toggleBlack();
ui::waitForCover();
load(portal.toFile);
diff --git a/xml/!town.xml b/xml/!town.xml
index 4a64ee0..20b5ca4 100644
--- a/xml/!town.xml
+++ b/xml/!town.xml
@@ -18,11 +18,11 @@
<Dialog name="Bob">
<text id="0" nextid="1" pause="true">
<give id="Dank MayMay" count="10"/>
- <content alive="1">
+ <content>
Hey there! The name's Bob. Good to see you've finally woken up from your nap by the cliff there... lol
</content>
</text>
- <text id="1" pause="true" alive="1">
+ <text id="1" pause="true">
<quest assign="Check out m&apos;swag, man!" desc="Go inside Bob&apos;s house and check out the stuff he has."/>
<content>
Looks like you've got yourself pretty empty handed... you know, I have a simple solution for that. Come on inside, I have somethin' to show you.
diff --git a/xml/entities.xml b/xml/entities.xml
index 2bcd1bf..ad5009c 100644
--- a/xml/entities.xml
+++ b/xml/entities.xml
@@ -8,6 +8,7 @@
<Solid />
<Physics />
<Name value="Daddy" />
+ <Dialog />
</npc>
<structure>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 13:31:58 +0000