aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClyne Sullivan <tullivan99@gmail.com>2016-06-26 11:50:15 -0400
committerClyne Sullivan <tullivan99@gmail.com>2016-06-26 11:50:15 -0400
commitb61e4e5b140278705c79674c02de6886b2189f71 (patch)
tree2e77fa22db804334efd5a3b8dacf8d8167a387bd
parentf4177a77ceff0e1cffb7e968f3d48497fcd2d45c (diff)
fixing everything that's apparently broken...
Diffstat
-rw-r--r--brice.dat4
-rw-r--r--include/texture.hpp3
-rw-r--r--main.cpp5
-rw-r--r--src/ui.cpp6
-rw-r--r--src/world.cpp6
-rw-r--r--xml/bobshouse.xml39
-rw-r--r--xml/playerSpawnHill1.xml6
-rw-r--r--xml/playerSpawnHill1_Building1.xml6
-rw-r--r--xml/town.xml8
9 files changed, 32 insertions, 51 deletions
diff --git a/brice.dat b/brice.dat
index 3b090ad..2033bae 100644
--- a/brice.dat
+++ b/brice.dat
@@ -1,7 +1,7 @@
3
canSprint
-0
+1
canJump
0
Slow
-1
+0
diff --git a/include/texture.hpp b/include/texture.hpp
index 95bd73b..0ee3e2c 100644
--- a/include/texture.hpp
+++ b/include/texture.hpp
@@ -47,8 +47,9 @@ public:
position = std::begin(textures);
}
TextureIterator(const std::vector<std::string> &l) {
- for (const auto &s : l)
+ for (const auto &s : l) {
textures.emplace_back(Texture::loadTexture(s), s);
+ }
position = std::begin(textures);
}
void operator++(int) noexcept {
diff --git a/main.cpp b/main.cpp
index 3b98b94..72987a3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -470,7 +470,7 @@ void render() {
if(ui::debug){
ui::putText(offset.x-SCREEN_WIDTH/2, (offset.y+SCREEN_HEIGHT/2)-ui::fontSize,
- "fps: %d\ngrounded:%d\nresolution: %ux%u\nentity cnt: %d\nloc: (%+.2f, %+.2f)\nticks: %u\nvolume: %f\nweather: %s",
+ "fps: %d\ngrounded:%d\nresolution: %ux%u\nentity cnt: %d\nloc: (%+.2f, %+.2f)\nticks: %u\nvolume: %f\nweather: %s\nxml: %s",
fps,
player->ground,
SCREEN_WIDTH, // Window dimensions
@@ -480,7 +480,8 @@ void render() {
debugY, // The player's y coordinate
game::time::getTickCount(),
game::config::VOLUME_MASTER,
- currentWorld->getWeatherStr().c_str()
+ currentWorld->getWeatherStr().c_str(),
+ currentXML.c_str()
);
static GLuint tracerText = Texture::genColor(Color(100,100,255));
diff --git a/src/ui.cpp b/src/ui.cpp
index 14df95e..037ba89 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -629,6 +629,11 @@ namespace ui {
while (fadeIntensity < 255);
fadeIntensity = 255;
}
+
+ void waitForUncover(void) {
+ while (fadeIntensity > 0);
+ fadeIntensity = 0;
+ }
void waitForNothing(unsigned int ms) {
unsigned int target = millis() + ms;
@@ -1301,6 +1306,7 @@ EXIT:
wsi.first->bgmPlay(currentWorld);
std::tie(currentWorld, player->loc) = wsi;
toggleBlackFast();
+ waitForUncover();
player->canMove = true;
};
diff --git a/src/world.cpp b/src/world.cpp
index 7c62739..2f1a8a6 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1154,7 +1154,7 @@ void World::save(const std::string& s)
{
for (const auto &e : entity)
e->saveToXML();
- currentXMLDoc.SaveFile((xmlFolder + (s.empty() ? currentXML : s)).c_str(), false);
+ currentXMLDoc.SaveFile((s.empty() ? currentXML : xmlFolder + s).c_str(), false);
}
/**
@@ -1844,7 +1844,7 @@ static bool loadedRight = false;
World *loadWorldFromXML(std::string path) {
if (!currentXML.empty())
- currentWorld->save(path);
+ currentWorld->save();
return loadWorldFromXMLNoSave(path);
}
@@ -1994,7 +1994,7 @@ loadWorldFromXMLNoSave(std::string path) {
tmp->generate(wxml->UnsignedAttribute("width") / game::HLINE);
else {
if (Indoor)
- UserError("XML Error: <generation> tags can't be in <IndoorWorld> tags (in " + _currentXML + ")!");
+ UserError("XML Error: <generation> tags can't be in <IndoorWorld> tags, use <floor> instead (in " + _currentXML + ")!");
else
UserError("XML Error: Invalid <generation> tag in " + _currentXML + "!");
}
diff --git a/xml/bobshouse.xml b/xml/bobshouse.xml
index 32e6a95..243063d 100644
--- a/xml/bobshouse.xml
+++ b/xml/bobshouse.xml
@@ -1,34 +1,7 @@
<?xml version="1.0"?>
-<World>
- <style background="0" bgm="assets/music/embark.wav" folder="assets/style/classic/"/>
- <generation type="Random" width="1600"/>
- <time>6000</time>
- <spawnx>-300</spawnx>
- <npc name="Sanc" hasDialog="true"/>
- <npc name="Bob" hasDialog="true" spawnx="30"/>
- <structure type="1" spawnx="300"/>
- <structure inside="bobshouse.xml" type="1" spawnx="10"/>
-</World>
-
-<Dialog name="Bob">
- <text id="0" nextid="1" pause="true">
- <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">
- <quest assign="Check out m&apos;swag, man!">
- No description
- </quest>
- <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.
- </content>
- </text>
-</Dialog>
-
-<Dialog name="Sanc">
- <text id="0">
- <set id="Slow" value="0"/>
- <set id="canSprint" value="1"/>
- </text>
-</Dialog>
+<IndoorWorld>
+ <style background="1" bgm="assets/music/embark.wav" folder="assets/style/classic/"/>
+ <floor width="1600"/>
+ <link outside="town.xml"/>
+ <npc name="Bob" hasDialog="false" spawnx="30"/>
+</IndoorWorld>
diff --git a/xml/playerSpawnHill1.xml b/xml/playerSpawnHill1.xml
index e052c50..e197f2e 100644
--- a/xml/playerSpawnHill1.xml
+++ b/xml/playerSpawnHill1.xml
@@ -16,11 +16,11 @@
<Dialog name="Guy">
<text id="0" nextid="1">
Hello there! My name is Ralph.
- <gotox>300</gotox>
+ <gotox>300</gotox>
</text>
<text id="1">
...
- <gotox>1000</gotox>
+ <gotox>1000</gotox>
<set id="Slow" value="0"/>
<set id="canSprint" value="1"/>
</text>
@@ -33,5 +33,5 @@
<text id="0" stop="true">
Hey friend! It's dangerous out there, here take these!
Wait, promise you'll stop by my stand in the local market!
- <give id="Wood Sword" count="1"/> <give id="Hunters Bow" count="1"/> <give id="Crude Arrow" count="110"/> <give id="Fried Chicken" count="1"/> <give id="Mossy Torch" count="1"/></text>
+ <give id="Wood Sword" count="1"/> <give id="Hunters Bow" count="1"/> <give id="Crude Arrow" count="110"/> <give id="Fried Chicken" count="1"/> <give id="Mossy Torch" count="1"/></text>
</Dialog>
diff --git a/xml/playerSpawnHill1_Building1.xml b/xml/playerSpawnHill1_Building1.xml
index 28add1f..5c5dfdc 100644
--- a/xml/playerSpawnHill1_Building1.xml
+++ b/xml/playerSpawnHill1_Building1.xml
@@ -10,17 +10,17 @@
<Dialog name="Bob">
<text id="0" nextid="1" pause="true">
Hey. Have a Dank MayMay :)
- <give id="Dank MayMay" count="1"/></text>
+ <give id="Dank MayMay" count="1"/></text>
<text id="1" nextid="2">
What? You want another Dank MayMay?
</text>
<text id="2" nextid="3" pause="true">
K.
- <give id="Dank MayMay" count="1"/></text>
+ <give id="Dank MayMay" count="1"/></text>
<text id="3" nextid="4">
Well... I'm out of Dank MayMays.
</text>
<text id="4">
Have a sword though.
- <give id="Wood Sword" count="1"/></text>
+ <give id="Wood Sword" count="1"/></text>
</Dialog>
diff --git a/xml/town.xml b/xml/town.xml
index 32e6a95..8d0a0a4 100644
--- a/xml/town.xml
+++ b/xml/town.xml
@@ -4,10 +4,10 @@
<generation type="Random" width="1600"/>
<time>6000</time>
<spawnx>-300</spawnx>
- <npc name="Sanc" hasDialog="true"/>
- <npc name="Bob" hasDialog="true" spawnx="30"/>
- <structure type="1" spawnx="300"/>
- <structure inside="bobshouse.xml" type="1" spawnx="10"/>
+ <npc name="Sanc" hasDialog="true" health="1" x="-316.38254" y="62.999008" dindex="9999"/>
+ <npc name="Bob" hasDialog="true" spawnx="30" health="1" x="262.3949" y="66.698959" dindex="0"/>
+ <structure type="1" spawnx="300" alive="1"/>
+ <structure inside="bobshouse.xml" type="1" spawnx="10" alive="1"/>
</World>
<Dialog name="Bob">
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 06:22:51 +0000