From 0d8508aa2464e1e7e4aacd8f11ec90fc62dd5504 Mon Sep 17 00:00:00 2001 From: drumsetmonkey Date: Wed, 2 Mar 2016 10:11:54 -0500 Subject: Clyne is gay --- src/world.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/world.cpp') diff --git a/src/world.cpp b/src/world.cpp index 80ddc5a..32a3153 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -1446,6 +1446,7 @@ World *loadWorldFromXMLNoSave(const char *path){ while(vil){ name = vil->Name(); randx = 0; + //static BuySell bs; /** * READS DATA ABOUT STRUCTURE CONTAINED IN VILLAGE @@ -1469,10 +1470,17 @@ World *loadWorldFromXMLNoSave(const char *path){ (char*)vil->Attribute("texture"), ptr); tmp->addMerchant(0,100); - if(!strcmp(name,"buy")){ - std::cout << "Buying"; - }else if(!strcmp(name,"sell")){ - std::cout << "Selling"; + if(vil->FirstChildElement("buy")){ + std::cout << "Buy" << std::endl; + /*bs.member = 0; + bs.cost.type = 0; + bs.cost.item = vil->FirstChildElement("buy")->Attribute("item"); + bs.cost.price =vil->FirstChildElement("buy")->IntAttribute("cost");*/ + tmp->merchant.back()->bsinv.push_back({0,"Dank MayMay",420}); + }if(vil->FirstChildElement("sell")){ + std::cout << "Sell" << std::endl; + }if(vil->FirstChildElement("trade")){ + std::cout << "Trade" << std::endl; } strcpy(tmp->merchant.back()->name,"meme"); -- cgit v1.2.3