1 files changed, 91 insertions, 249 deletions

diff --git a/src/gameplay.cpp b/src/gameplay.cpp
index 6626811..486c16e 100644
--- a/src/gameplay.cpp
+++ b/src/gameplay.cpp
@@ -10,301 +10,143 @@ using namespace tinyxml2;
 extern World	*currentWorld;
 extern Player	*player;
 
-/*
- *	new world 
- *	gen
- * 	setbackground
- * 	setbgm
- * 	add...
- * 
- */
-
-/*
- *	World definitions
- */
-
-/*
- *	initEverything() start
- */
-
-typedef struct {
-	World *ptr;
-	char *file;
-} WorldXML;
-
-typedef struct {
-	char *name;
-	World *ptr;
-} WorldLink;
-
 typedef struct {
 	NPC *npc;
 	unsigned int index;
 } NPCDialog;
 
-std::vector<NPCDialog>			npcd;
-std::vector<WorldXML>			earthxml;
-static std::vector<WorldLink>	earthlnk;
-std::vector<World *>			earth;
 std::vector<XMLElement *>		dopt;
 
 int commonAIFunc(NPC *speaker){
 	XMLDocument xml;
 	XMLElement *exml,*oxml;
-	unsigned int idx;
+	const char *name;
+	unsigned int idx = 0;
 	bool stop = false;
 	
-	for(auto &n : npcd){
-		if(n.npc == speaker){
-			idx = n.index;
-			break;
-		}
-	}
+	xml.LoadFile(currentXML);
+	exml = xml.FirstChildElement("Dialog");
 	
-	for(auto &e : earthxml){
-		if(e.ptr == currentWorld){
-			xml.LoadFile(e.file);
-			
-			exml = xml.FirstChildElement("Dialog");
-			while(strcmp(exml->Attribute("name"),speaker->name))
-				exml = exml->NextSiblingElement();
-			
-			exml = exml->FirstChildElement();
-			
-			do{
-				if(!strcmp(exml->Name(),"text")){
-					if(exml->UnsignedAttribute("id") == idx){
+	while(strcmp(exml->Attribute("name"),speaker->name))
+		exml = exml->NextSiblingElement();
+	
+	exml = exml->FirstChildElement();
+	
+	do{
+		if(!strcmp(exml->Name(),"text")){
+			if(exml->UnsignedAttribute("id") == speaker->dialogIndex){
+				
+				if((oxml = exml->FirstChildElement("give"))){
+					while(oxml){
+						player->inv->addItem((ITEM_ID)oxml->UnsignedAttribute("id"),oxml->UnsignedAttribute("count"));
+						oxml = oxml->NextSiblingElement();
+					}
+				}
+				
+				if((oxml = exml->FirstChildElement("option"))){
+					const char *op;
+					char *bp1 = new char[1],*bp2,*tmp;
+					bp1[0] = '\0';
+					while(oxml){
+						op = oxml->Attribute("text");
 						
-						if((oxml = exml->FirstChildElement("give"))){
-							while(oxml){
-								player->inv->addItem((ITEM_ID)oxml->UnsignedAttribute("id"),oxml->UnsignedAttribute("count"));
-								oxml = oxml->NextSiblingElement();
-							}
-						}
+						bp2 = new char[strlen(bp1) + strlen(op) + 2];
+						strcpy(bp2,bp1);
 						
-						if((oxml = exml->FirstChildElement("option"))){
-							const char *op;
-							char *bp1 = new char[1],*bp2,*tmp;
-							unsigned int idx = 0;
-							bp1[0] = '\0';
-							while(oxml){
-								op = oxml->Attribute("text");
-								
-								bp2 = new char[strlen(bp1) + strlen(op) + 2];
-								strcpy(bp2,bp1);
-								
-								bp2[idx++] = ':';
-								strcpy(bp2+idx,op);
-								idx += strlen(op);
-								
-								tmp = bp1;
-								bp1 = bp2;
-								delete[] tmp;
-								
-								dopt.push_back(oxml);
-								
-								oxml = oxml->NextSiblingElement();
-							}
-							ui::dialogBox(speaker->name,bp1,false,exml->GetText());
-							ui::waitForDialog();
-							if(ui::dialogOptChosen){
-								exml = dopt[ui::dialogOptChosen-1];
-							}
-							while(!dopt.empty())
-								dopt.pop_back();
-						}else{
-							ui::dialogBox(speaker->name,"",false,exml->GetText());
-							ui::waitForDialog();
-						}
-						if(exml->Attribute("call")){
-							for(auto &n : currentWorld->npc){
-								if(!strcmp(n->name,exml->Attribute("call"))){
-									if(exml->QueryUnsignedAttribute("callid",&idx) == XML_NO_ERROR){
-										for(auto &n2 : npcd){
-											if(n2.npc == n){
-												n2.index = idx;
-												break;
-											}
-										}
-									}
-									n->addAIFunc(commonAIFunc,false);
-									break;
-								}
-							}
-						}
-						if(exml->QueryUnsignedAttribute("nextid",&idx) == XML_NO_ERROR){
-							for(auto &n : npcd){
-								if(n.npc == speaker){
-									n.index = idx;
-									break;
-								}
+						bp2[idx++] = ':';
+						strcpy(bp2+idx,op);
+						idx += strlen(op);
+						
+						tmp = bp1;
+						bp1 = bp2;
+						delete[] tmp;
+						
+						dopt.push_back(oxml);
+						
+						oxml = oxml->NextSiblingElement();
+					}
+					
+					ui::dialogBox(speaker->name,bp1,false,exml->GetText());
+					ui::waitForDialog();
+					if(ui::dialogOptChosen){
+						exml = dopt[ui::dialogOptChosen-1];
+					}
+					while(!dopt.empty())
+						dopt.pop_back();
+				}else{
+					ui::dialogBox(speaker->name,"",false,exml->GetText());
+					ui::waitForDialog();
+				}
+				if((name = exml->Attribute("call"))){
+					for(auto &n : currentWorld->npc){
+						if(!strcmp(n->name,name)){
+							if(exml->QueryUnsignedAttribute("callid",&idx) == XML_NO_ERROR){
+								n->dialogIndex = idx;
 							}
-							if(exml->QueryBoolAttribute("stop",&stop) == XML_NO_ERROR && stop)
-								return 0;
-							else if(exml->QueryBoolAttribute("pause",&stop) == XML_NO_ERROR && stop)
-								return 1;
-							else return commonAIFunc(speaker);
+							n->addAIFunc(commonAIFunc,false);
+							break;
 						}
-						return 0;
 					}
 				}
-				exml = exml->NextSiblingElement();
-			}while(exml);
+				if(exml->QueryUnsignedAttribute("nextid",&idx) == XML_NO_ERROR){
+					speaker->dialogIndex = idx;
+					if(exml->QueryBoolAttribute("stop",&stop) == XML_NO_ERROR && stop)
+						return 0;
+					else if(exml->QueryBoolAttribute("pause",&stop) == XML_NO_ERROR && stop)
+						return 1;
+					else return commonAIFunc(speaker);
+				}
+				return 0;
+			}
 		}
-	}
+		exml = exml->NextSiblingElement();
+	}while(exml);
 	return 0;
 }
 
 void destroyEverything(void);
 void initEverything(void){
-	const char *name;
 	std::vector<std::string> xmlFiles;
-	static char *file;
-	
-	static bool Indoor = false;
-	bool dialog;
-	float spawnx;
-	World **yoyo;//,**yoyo2;
-	
 	XMLDocument xml;
-	XMLElement *wxml;
+	
+	/*
+	 * Read the XML directory into an array.
+	 */
 	
 	if(getdir("./xml/",xmlFiles)){
 		std::cout<<"Error reading XML files!!!1"<<std::endl;
 		abort();
 	}
 	
+	/*
+	 * Sort the files alphabetically.
+	 */
+	
 	strVectorSortAlpha(&xmlFiles);
 	
-	for(unsigned int i=0;i<xmlFiles.size();i++){
-		if(strncmp(xmlFiles[i].c_str(),".",1) && strncmp(xmlFiles[i].c_str(),"..",2)){
-			earthlnk.push_back((WorldLink){new char[strlen(xmlFiles[i].c_str() + 1)],NULL});
-			strcpy(earthlnk.back().name,xmlFiles[i].c_str());
-		}
-	}
+	/*
+	 * Load the first file found as currentWorld.
+	 */
 	
 	for(unsigned int i=0;i<xmlFiles.size();i++){
 		if(strncmp(xmlFiles[i].c_str(),".",1) && strncmp(xmlFiles[i].c_str(),"..",2)){
-			file = new char[5 + xmlFiles[i].size()];
-			memset(file,0,5 + xmlFiles[i].size());
-			strncpy(file,"xml/",4);
-			strcpy(file+4,xmlFiles[i].c_str());
-			std::cout<<std::endl<<"Loading "<<file<<" ..."<<std::endl<<std::endl;
-			xml.LoadFile(file);
-
-			wxml = xml.FirstChildElement("World");//->FirstChildElement();
-
-			if(wxml){
-				wxml = wxml->FirstChildElement();
-				earth.push_back(new World());
-				Indoor = false;
-			}else if((wxml = xml.FirstChildElement("IndoorWorld"))){
-				wxml = wxml->FirstChildElement();
-				earth.push_back(new IndoorWorld());
-				Indoor = true;
-			}
 			
-			for(auto &l : earthlnk){
-				if(!strcmp(file+4,l.name)){
-					l.ptr = earth.back();
-					break;
-				}
-			}
+			/*
+			 * Read in the XML file.
+			 */
 			
-			while(wxml){
-				name = wxml->Name();
-
-				if(!strcmp(name,"link") && wxml->Attribute("left")){
-					for(auto &l : earthlnk){
-						if(!strcmp(l.name,wxml->Attribute("left"))){
-							earth.back()->toLeft = &l.ptr;
-							break;
-						}
-					}
-				}else if(!strcmp(name,"link") && wxml->Attribute("right")){
-					for(auto &l : earthlnk){
-						if(!strcmp(l.name,wxml->Attribute("right"))){
-							earth.back()->toRight = &l.ptr;
-							break;
-						}
-					}
-				}else if(Indoor && !strcmp(name,"link") && wxml->Attribute("outside")){
-					for(auto &l : earthlnk){
-						if(!strcmp(l.name,wxml->Attribute("outside"))){
-							for(auto &b : l.ptr->build){
-								if(*b->inside == earth.back()){
-									((IndoorWorld *)*b->inside)->outside = &l.ptr;
-								}
-							}
-							break;
-						}
-					}
-				}else if(!strcmp(name,"style")){
-					earth.back()->setBackground((WORLD_BG_TYPE)wxml->UnsignedAttribute("background"));
-					earth.back()->setBGM(wxml->Attribute("bgm"));
-				}else if(!strcmp(name,"generation")){
-					if(!strcmp(wxml->Attribute("type"),"Random")){
-						if(Indoor)
-							((IndoorWorld *)earth.back())->generate(wxml->UnsignedAttribute("width"));
-						else
-							earth.back()->generate(wxml->UnsignedAttribute("width"));
-					}else if(Indoor){
-						abort();
-					}
-				}else if(!strcmp(name,"mob")){
-					if(wxml->QueryFloatAttribute("x",&spawnx) != XML_NO_ERROR)
-						earth.back()->addMob(wxml->UnsignedAttribute("type"),getRand() % earth.back()->getTheWidth() / 2,100);
-					else
-						earth.back()->addMob(wxml->UnsignedAttribute("type"),wxml->FloatAttribute("x"),wxml->FloatAttribute("y"));
-				}else if(!strcmp(name,"npc")){
-					if(wxml->QueryFloatAttribute("x",&spawnx) != XML_NO_ERROR)
-						earth.back()->addNPC(getRand() % earth.back()->getTheWidth() / 2.0f,100);
-					else
-						earth.back()->addNPC(wxml->FloatAttribute("x"),wxml->FloatAttribute("y"));
-					
-					if(wxml->Attribute("name")){
-						delete[] earth.back()->npc.back()->name;
-						earth.back()->npc.back()->name = new char[strlen(wxml->Attribute("name"))+1];
-						strcpy(earth.back()->npc.back()->name,wxml->Attribute("name"));
-					}
-					dialog = false;
-					if(wxml->QueryBoolAttribute("hasDialog",&dialog) == XML_NO_ERROR && dialog){
-						for(auto &ex : earthxml){
-							if(ex.ptr == earth.back())
-								goto SKIP;
-						}
-						earthxml.push_back((WorldXML){earth.back(),new char[64]});
-						strcpy(earthxml.back().file,file);
-SKIP:
-						earth.back()->npc.back()->addAIFunc(commonAIFunc,false);
-						npcd.push_back((NPCDialog){earth.back()->npc.back(),0});
-					}
-				}else if(!strcmp(name,"structure")){
-					if(wxml->Attribute("inside")){
-						for(auto &l : earthlnk){
-							if(!strcmp(l.name,wxml->Attribute("inside"))){
-								yoyo = &l.ptr;
-								break;
-							}
-						}	
-					}
-					if(wxml->QueryFloatAttribute("x",&spawnx) != XML_NO_ERROR)
-						earth.back()->addStructure((BUILD_SUB)wxml->UnsignedAttribute("type"),getRand() % earth.back()->getTheWidth() / 2.0f,100,yoyo);//,yoyo2);
-					else
-						earth.back()->addStructure((BUILD_SUB)wxml->UnsignedAttribute("type"),spawnx,wxml->FloatAttribute("y"),yoyo);//,yoyo2);
-				}
-				
-				wxml = wxml->NextSiblingElement();
-			}
-			
-			delete[] file;
+			currentWorld = loadWorldFromXML(xmlFiles[i].c_str());
+			break;
 		}
 	}
+
+	/*
+	 * Spawn the player and begin the game.
+	 */
 	
 	player = new Player();
 	player->spawn(200,100);
 
-	currentWorld = earth.front();
 	currentWorld->bgmPlay(NULL);
 	atexit(destroyEverything);
 }