XML folder changing

6 files changed, 59 insertions, 17 deletions

diff --git a/src/common.cpp b/src/common.cpp
index 10ff64e..50678f1 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -20,6 +20,14 @@ unsigned int millis(void){
 
 #endif // __WIN32__
 
+void C(std::string m){
+	#ifdef SEGFAULT
+		std::cout << m << std::endl;
+	#else
+		(void)m;
+	#endif
+}
+
 void DEBUG_prints(const char* file, int line, const char *s,...){
 	va_list args;
 	printf("%s:%d: ",file,line);
diff --git a/src/config.cpp b/src/config.cpp
index 4f4ad89..2ee13d4 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -13,6 +13,8 @@ extern float VOLUME_MASTER;
 extern float VOLUME_MUSIC;
 extern float VOLUME_SFX;
 
+extern std::string xmlFolder;
+
 XMLDocument xml;
 XMLElement *scr;
 XMLElement *vol;
@@ -52,6 +54,10 @@ namespace config {
 			VOLUME_SFX = fval;
 		else VOLUME_SFX = 50;
 
+		xmlFolder = xml.FirstChildElement("world")->Attribute("start");
+		if(xmlFolder=="\0")xmlFolder = "xml/";
+		std::cout << "Folder: " << xmlFolder << std::endl;
+
 		ui::initFonts();
 		ui::setFontFace(xml.FirstChildElement("font")->Attribute("path"));
 		config::update();
diff --git a/src/entities.cpp b/src/entities.cpp
index 6476755..f4e2dd7 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -102,7 +102,7 @@ void Entity::spawn(float x, float y){	//spawns the entity you pass to it based o
 
 Player::Player(){ //sets all of the player specific traits on object creation
 	width = HLINE * 10;
-	height = HLINE * 15;
+	height = HLINE * 16;
 
 	type = PLAYERT; //set type to player
 	subtype = 0;
@@ -697,7 +697,7 @@ void Player::save(void){
 void Player::sspawn(float x,float y){
 	unsigned int i;
 	uint count;
-	std::ifstream in ("xml/main.dat",std::ios::in | std::ios::binary);
+	std::ifstream in ("storyXML/main.dat",std::ios::in | std::ios::binary);
 	spawn(x,y);
 
 	if(in.good()){
diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index f398ca0..4aa751f 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -13,6 +13,8 @@ extern Menu  *currentMenu;
 extern Menu   pauseMenu;
 extern Menu   optionsMenu;
 
+extern std::string xmlFolder;
+
 extern void mainLoop(void);						// main.cpp
 
 extern std::vector<NPC *> AIpreaddr;			// entities.cpp
@@ -209,8 +211,7 @@ CONT:
 	return 0;
 }
 
-void commonPageFunc( Mob *callee )
-{
+void commonPageFunc( Mob *callee ){
 	static bool lock = false;
 
 	if ( !lock ) {
@@ -272,16 +273,21 @@ void initEverything(void){
 	 * Read the XML directory into an array.
 	 */
 
-	if(getdir("./xml/",xmlFiles)){
+	C("Scanning XML directory");
+	if(getdir(std::string("./"+xmlFolder).c_str(),xmlFiles)){
 		std::cout<<"Error reading XML files!!!1"<<std::endl;
 		abort();
 	}
+	C("Done scanning XML directory");
 
 	/*
 	 * Sort the files alphabetically.
 	 */
 
+	C("Sorting XML files alphabetically");
 	strVectorSortAlpha(&xmlFiles);
+	C("Dpne sorting XML files alphabetically");
+
 
 	/*
 	 * Load the first file found as currentWorld.
@@ -293,8 +299,10 @@ void initEverything(void){
 			/*
 			 * Read in the XML file.
 			 */
-
+			C("Setting current XML file");
+			std::cout << "File to load: " << xmlFiles[i] << std::endl;
 			currentWorld = loadWorldFromXML(xmlFiles[i]);
+			C("Done setting current XML file");
 			break;
 		}
 	}
diff --git a/src/inventory.cpp b/src/inventory.cpp
index a2723fb..474a941 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -10,7 +10,7 @@ extern GLuint invUI;
 static float hangle = 0.0f;
 static bool swing = false;
 static vec2 itemLoc;
-static const unsigned int numSlot = 2000;
+static const unsigned char numSlot = 7;
 Mix_Chunk* swordSwing;
 
 static std::vector<Item *> itemMap;
@@ -25,9 +25,12 @@ void items(void){
 	while(exml){
 
 		itemMap.push_back(new Item());
+
 		itemMap.back()->width  = exml->FloatAttribute("width") * HLINE;
 		itemMap.back()->height = exml->FloatAttribute("height") * HLINE;
 		itemMap.back()->maxStackSize = exml->UnsignedAttribute("maxstack");
+		itemMap.back()->attribValue = exml->FloatAttribute("value");
+
 
 		itemMap.back()->name = exml->Attribute("name");
 		itemMap.back()->type = exml->Attribute("type");
@@ -188,6 +191,7 @@ void Inventory::setSelectionDown(){
 }
 
 void Inventory::draw(void){
+	C("Inventory Start Draw");
 	static unsigned int lop = 0;
 	static std::vector<int>dfp(numSlot);
 	static std::vector<Ray>iray(numSlot);
@@ -211,6 +215,7 @@ void Inventory::draw(void){
 	unsigned int a = 0;
 	static bool end = false;
 	static vec2 mouseStart = {0,0};
+	C("End define");
 
 	for(auto &r : iray){
 		r.start.x = player->loc.x + (player->width/2);
@@ -302,6 +307,7 @@ void Inventory::draw(void){
 	 * 	a = 0
 	 */
 
+	 C("Start drawing inventory");
 	if(invOpen){
 
 		for(auto &mr : massRay){
@@ -427,6 +433,7 @@ void Inventory::draw(void){
 			}
 			a++;
 		}
+		C("Done drawing standard inv");
 	}else if(invHover){
 		static unsigned int highlight = 0;
 		static unsigned int thing = 0;
@@ -545,6 +552,10 @@ void itemDraw(Player *p,uint id){
 			}
 		}
 	}else hangle = 0.0f;
+	if(p->inv->usingi){
+		p->inv->useItem();
+		std::cout << "using" << std::endl;
+	}
 
 	glUseProgram(shaderProgram);
 	glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0);
@@ -586,6 +597,9 @@ int Inventory::useItem(void){
 				swing=true;
 				Mix_PlayChannel(2,swordSwing,0);
 			}
+		}else if(itemMap[items[sel].id]->type == "Cooked Food"){
+			player->health += itemMap[items[sel].id]->attribValue;
+			usingi = false;
 		}
 	}
 	return 0;
@@ -606,12 +620,6 @@ bool Inventory::detectCollision(vec2 one, vec2 two){
 			xc += float(i) * cos((hangle+90)*PI/180);
 			yc += float(i) * sin((hangle+90)*PI/180);
 
-			/*glColor4f(1.0f,1.0f,1.0f,1.0f);
-			glBegin(GL_LINES);
-				glVertex2f(player->loc.x,player->loc.y+player->height/3);
-				glVertex2f(xc,yc);
-			glEnd();*/
-
 			if(xc >= one.x && xc <= two.x){
 				if(yc >= one.y && yc <= two.y){
 					return true;
diff --git a/src/world.cpp b/src/world.cpp
index f03606f..8a46e8d 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -37,6 +37,8 @@ extern bool    inBattle;
 
 extern unsigned int tickCount;				// main.cpp
 
+extern std::string xmlFolder;
+
 int worldShade = 0;
 
 std::string currentXML;
@@ -1086,7 +1088,7 @@ goInsideStructure( Player *p )
         if ( b->inside.empty() )
           return this;
 
-				inside.push_back(currentXML.c_str() + 4);
+				inside.push_back(currentXML.c_str() + xmlFolder.size());
 
 				tmp = loadWorldFromXML( b->inside );
 
@@ -1098,7 +1100,7 @@ goInsideStructure( Player *p )
 			}
 		}
 	} else {
-    current = currentXML.c_str() + 4;
+    current = currentXML.c_str() + xmlFolder.size();
 		tmp = loadWorldFromXML( inside.back() );
 		for ( auto &b : tmp->build ) {
 			if ( current == b->inside ) {
@@ -1191,7 +1193,9 @@ void World::load(void){
 	std::string save,data,line;
 	const char *filedata;
 
-	save = (std::string)currentXML + ".dat";
+    //std::cout << "Loading from: " << std::string(currentXML + ".dat") << std::endl;
+	save = std::string(currentXML + ".dat");
+    //std::cout << "save file: " << save << std::endl;
 	filedata = readFile(save.c_str());
 	data = filedata;
 	std::istringstream iss (data);
@@ -1453,8 +1457,12 @@ static bool loadedLeft = false;
 static bool loadedRight = false;
 
 World *loadWorldFromXML(std::string path){
+    C("Scanning for save file");
+    std::cout << "Scanning: " << path << std::endl;
 	if ( !currentXML.empty() )
 		currentWorld->save();
+    std::cout << "After Scanning: " << path << std::endl;
+    C("Done scanning for save file");
 
 	return loadWorldFromXMLNoSave(path);
 }
@@ -1496,7 +1504,9 @@ loadWorldFromXMLNoSave( std::string path ) {
     if ( path.empty() )
         return NULL;
 
-	currentXML = (std::string)"xml/" + path;
+    std::cout << "File path: " << path << std::endl;
+	currentXML = std::string("storyXML/" + path);
+    std::cout << "Full file path: " << currentXML << std::endl;
 
 	xml.LoadFile(currentXML.c_str());
 	wxml = xml.FirstChildElement("World");
@@ -1678,6 +1688,8 @@ loadWorldFromXMLNoSave( std::string path ) {
 		tmp->load();
 	}
 
+    std::cout << "adadadadasdsa" << std::endl;
+
 	return tmp;
 
 }