diff options
| author | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-04 08:47:03 -0500 |
|---|---|---|
| committer | Clyne Sullivan <tullivan99@gmail.com> | 2016-03-04 08:47:03 -0500 |
| commit | 0a06697db87063b77b71388278933807899568ef (patch) | |
| tree | bb8d876e266761c7aac8656c2d75793855826bd0 /src/world.cpp | |
| parent | 5fadac5d0f37f574ca160107d832d11b421ad559 (diff) | |
| parent | 30dd8efe8d71648bea7604ebee5afc4d55b25a6b (diff) | |
merge
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/world.cpp b/src/world.cpp index 5dbbe21..a0ae0f3 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -325,7 +325,7 @@ update( Player *p, unsigned int delta ) } // iterate through particles - particles.erase( std::remove_if( particles.begin(), particles.end(), [&delta](Particles part){ return part.kill( delta ); }), particles.end()); + particles.erase( std::remove_if( particles.begin(), particles.end(), [&delta](Particles &part){return part.kill(delta);}), particles.end()); for ( auto part = particles.begin(); part != particles.end(); part++ ) { if ( (*part).canMove ) { (*part).loc.y += (*part).vely * delta; @@ -1411,6 +1411,7 @@ loadWorldFromXMLNoSave( std::string path ) { while(vil){ name = vil->Name(); randx = 0; + //static BuySell bs; /** * READS DATA ABOUT STRUCTURE CONTAINED IN VILLAGE @@ -1432,10 +1433,18 @@ loadWorldFromXMLNoSave( std::string path ) { vil->StrAttribute("texture"), vil->StrAttribute("inside")); 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; + //Trade goodMeme(1,"Dank MayMay",1,"Sword"); + //tmp->merchant.back()->trade.push_back(Trade()); + }if(vil->FirstChildElement("sell")){ + std::cout << "Sell" << std::endl; + }if(vil->FirstChildElement("trade")){ + std::cout << "Trade" << std::endl; + tmp->merchant.back()->trade.push_back(Trade(vil->FirstChildElement("trade")->IntAttribute("quantity"), + vil->FirstChildElement("trade")->Attribute("item"), + vil->FirstChildElement("trade")->IntAttribute("quantity1"), + vil->FirstChildElement("trade")->Attribute("item1"))); } strcpy(tmp->merchant.back()->name,"meme"); |