diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/entities.cpp | 4 | ||||
| -rw-r--r-- | src/world.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/entities.cpp b/src/entities.cpp index bea2117..4fd21fd 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 @@ -701,7 +703,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 73d8841..e009f78 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -1549,7 +1549,7 @@ loadWorldFromXMLNoSave( std::string path ) { if ( path.empty() ) return NULL; - currentXML = std::string(xmlFolder + path); + currentXML = std::string(xmlFolder + path); xml.LoadFile( currentXML.c_str() ); // attempt to load a <World> tag |