From b2ea70a36ba2249383c9b5cb3c2c784c28311938 Mon Sep 17 00:00:00 2001
From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Mon, 4 Apr 2016 07:42:19 -0400
Subject: Scrub

---
 assets/items/FOOD_CHICKEN_FRIED.png | Bin 0 -> 228 bytes
 assets/style/classic/bg/bagels.jpg  | Bin 0 -> 259847 bytes
 assets/style/classic/bg/bagels.png  | Bin 0 -> 1252347 bytes
 assets/style/classic/bg/bgb.png     | Bin 0 -> 2899454 bytes
 src/entities.cpp                    |   4 +++-
 src/world.cpp                       |   2 +-
 storyXML/0000_SpawnHill.xml         |  10 ++++++++++
 storyXML/0000_SpawnHill.xml.dat     |   1 +
 8 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 assets/items/FOOD_CHICKEN_FRIED.png
 create mode 100644 assets/style/classic/bg/bagels.jpg
 create mode 100644 assets/style/classic/bg/bagels.png
 create mode 100644 assets/style/classic/bg/bgb.png
 create mode 100644 storyXML/0000_SpawnHill.xml
 create mode 100644 storyXML/0000_SpawnHill.xml.dat

diff --git a/assets/items/FOOD_CHICKEN_FRIED.png b/assets/items/FOOD_CHICKEN_FRIED.png
new file mode 100644
index 0000000..d086400
Binary files /dev/null and b/assets/items/FOOD_CHICKEN_FRIED.png differ
diff --git a/assets/style/classic/bg/bagels.jpg b/assets/style/classic/bg/bagels.jpg
new file mode 100644
index 0000000..fb68d2e
Binary files /dev/null and b/assets/style/classic/bg/bagels.jpg differ
diff --git a/assets/style/classic/bg/bagels.png b/assets/style/classic/bg/bagels.png
new file mode 100644
index 0000000..2ee843b
Binary files /dev/null and b/assets/style/classic/bg/bagels.png differ
diff --git a/assets/style/classic/bg/bgb.png b/assets/style/classic/bg/bgb.png
new file mode 100644
index 0000000..278e9b0
Binary files /dev/null and b/assets/style/classic/bg/bgb.png differ
diff --git a/src/entities.cpp b/src/entities.cpp
index f4e2dd7..a10649f 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -10,6 +10,8 @@ extern World *currentWorld;		// main.cpp
 extern unsigned int loops;		// main.cpp
 extern unsigned int tickCount;	// main.cpp
 
+extern std::string xmlFolder;
+
 GLuint waterTex;
 
 std::vector<int (*)(NPC *)> AIpreload;	// A dynamic array of AI functions that are being preloaded
@@ -697,7 +699,7 @@ void Player::save(void){
 void Player::sspawn(float x,float y){
 	unsigned int i;
 	uint count;
-	std::ifstream in ("storyXML/main.dat",std::ios::in | std::ios::binary);
+	std::ifstream in (std::string(xmlFolder + "main.dat"),std::ios::in | std::ios::binary);
 	spawn(x,y);
 
 	if(in.good()){
diff --git a/src/world.cpp b/src/world.cpp
index 8a46e8d..bcd4f7a 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -1505,7 +1505,7 @@ loadWorldFromXMLNoSave( std::string path ) {
         return NULL;
 
     std::cout << "File path: " << path << std::endl;
-	currentXML = std::string("storyXML/" + path);
+	currentXML = std::string(xmlFolder + path);
     std::cout << "Full file path: " << currentXML << std::endl;
 
 	xml.LoadFile(currentXML.c_str());
diff --git a/storyXML/0000_SpawnHill.xml b/storyXML/0000_SpawnHill.xml
new file mode 100644
index 0000000..0a41197
--- /dev/null
+++ b/storyXML/0000_SpawnHill.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<World>
+
+	<style background="0" bgm="assets/music/embark.wav" folder="assets/style/classic/" />
+	<generation type="Random" width="500" />
+	<time>12000</time>
+
+	<hill peakx="0" peaky="1000" width="50" />
+
+</World>
diff --git a/storyXML/0000_SpawnHill.xml.dat b/storyXML/0000_SpawnHill.xml.dat
new file mode 100644
index 0000000..45a3a9f
--- /dev/null
+++ b/storyXML/0000_SpawnHill.xml.dat
@@ -0,0 +1 @@
+dOnE
\ No newline at end of file
-- 
cgit v1.2.3