diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-04 14:56:43 -0400 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-04-04 14:56:43 -0400 |
| commit | 4ea7b19bf2d4c64719471a53e6223aac7c250585 (patch) | |
| tree | 2485cbcd3ad191115016e996549fd4b7be4a2d24 /src/entities.cpp | |
| parent | a7bbe5cc18fe5b24f5d97d4acce164998d8d5517 (diff) | |
| parent | b2ea70a36ba2249383c9b5cb3c2c784c28311938 (diff) | |
merge
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 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()){ |