aboutsummaryrefslogtreecommitdiffstats
path: root/src/world.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/world.cpp')
-rw-r--r--src/world.cpp5
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")){