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

---
 src/entities.cpp | 4 +++-
 src/world.cpp    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

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());
-- 
cgit v1.2.3