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 | |
| parent | a7bbe5cc18fe5b24f5d97d4acce164998d8d5517 (diff) | |
| parent | b2ea70a36ba2249383c9b5cb3c2c784c28311938 (diff) | |
merge
| -rw-r--r-- | assets/items/FOOD_CHICKEN_FRIED.png | bin | 0 -> 228 bytes | |||
| -rw-r--r-- | assets/style/classic/bg/bagels.jpg | bin | 0 -> 259847 bytes | |||
| -rw-r--r-- | assets/style/classic/bg/bagels.png | bin | 0 -> 1252347 bytes | |||
| -rw-r--r-- | assets/style/classic/bg/bgb.png | bin | 0 -> 2899454 bytes | |||
| -rw-r--r-- | src/entities.cpp | 4 | ||||
| -rw-r--r-- | src/world.cpp | 2 | ||||
| -rw-r--r-- | storyXML/0000_SpawnHill.xml | 10 |
7 files changed, 14 insertions, 2 deletions
diff --git a/assets/items/FOOD_CHICKEN_FRIED.png b/assets/items/FOOD_CHICKEN_FRIED.png Binary files differnew file mode 100644 index 0000000..d086400 --- /dev/null +++ b/assets/items/FOOD_CHICKEN_FRIED.png diff --git a/assets/style/classic/bg/bagels.jpg b/assets/style/classic/bg/bagels.jpg Binary files differnew file mode 100644 index 0000000..fb68d2e --- /dev/null +++ b/assets/style/classic/bg/bagels.jpg diff --git a/assets/style/classic/bg/bagels.png b/assets/style/classic/bg/bagels.png Binary files differnew file mode 100644 index 0000000..2ee843b --- /dev/null +++ b/assets/style/classic/bg/bagels.png diff --git a/assets/style/classic/bg/bgb.png b/assets/style/classic/bg/bgb.png Binary files differnew file mode 100644 index 0000000..278e9b0 --- /dev/null +++ b/assets/style/classic/bg/bgb.png 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 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> |
