diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-04 07:42:19 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-04-04 07:42:19 -0400 |
| commit | b2ea70a36ba2249383c9b5cb3c2c784c28311938 (patch) | |
| tree | a1f88f257a0b718137d29547179a553f711d1096 /src/entities.cpp | |
| parent | a45daeda3633bdf25267a0186b39618269dca970 (diff) | |
Scrub
Diffstat (limited to 'src/entities.cpp')
| -rw-r--r-- | src/entities.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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()){ |