diff options
| author | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-28 08:26:06 -0400 |
|---|---|---|
| committer | drumsetmonkey <abelleisle@roadrunner.com> | 2016-03-28 08:26:06 -0400 |
| commit | 82c178d797b9a23c31d7dad1cc8cac29d27c6eb1 (patch) | |
| tree | c96240b1cc6ab185cce1da3929a436cb8f8077bb /src/world.cpp | |
| parent | 38bf2365e31745a5d6bfcea8f547b6263017f113 (diff) | |
Merchants have to stay inside the stalls
Diffstat (limited to 'src/world.cpp')
| -rw-r--r-- | src/world.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/world.cpp b/src/world.cpp index cdd945b..d8fd2d3 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -401,9 +401,7 @@ bgmPlay( World *prev ) const * screen. */ -void World:: -draw( Player *p ) -{ +void World::draw(Player *p){ // iterators int i, iStart, iEnd; @@ -1631,6 +1629,7 @@ loadWorldFromXMLNoSave( std::string path ) { vil->StrAttribute("texture"), vil->StrAttribute("inside")); tmp->addMerchant(0,100); + tmp->merchant.back()->inside = tmp->build.back(); if(vil->FirstChildElement("buy")){ std::cout << "Buy" << std::endl; }if(vil->FirstChildElement("sell")){ |