merge fix

6 files changed, 16 insertions, 14 deletions

diff --git a/brice.dat b/brice.dat
index bda8adc..61d57c2 100644
--- a/brice.dat
+++ b/brice.dat
@@ -1,5 +1,5 @@
 2
-canSprint
-1
 canJump
-1
+0
+canSprint
+0
diff --git a/main.cpp b/main.cpp
index 4cf0475..538ab16 100644
--- a/main.cpp
+++ b/main.cpp
@@ -295,8 +295,10 @@ int main(int argc, char *argv[]){
 		}
 	}).detach();
 
-	while (gameRunning)
+	while (gameRunning) {
 		render();
+		ui::handleEvents();
+	}
 
 	// put away the brice for later
 	game::briceSave();
@@ -327,7 +329,7 @@ void mainLoop(void){
 		return;
 	} else {
 		// handle keypresses - currentWorld could change here
-		ui::handleEvents();
+		//ui::handleEvents();
 
 		if (game::time::tickHasPassed())
 			logic();
diff --git a/src/ui.cpp b/src/ui.cpp
index 5a7ada1..ae47234 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1152,7 +1152,7 @@ EXIT:
 			toggleBlackFast();
 			player->canMove = true;
 		};
-
+		
 		while(SDL_PollEvent(&e)) {
 			switch(e.type) {
 
diff --git a/src/ui_action.cpp b/src/ui_action.cpp
index ebdc705..9029907 100644
--- a/src/ui_action.cpp
+++ b/src/ui_action.cpp
@@ -124,7 +124,7 @@ void actionAttack(void)
             ui::toggleWhiteFast();
         }
     } else {
-        ui::dialogBox(player->name, "", false, "%s doesn't appear to be in the mood for fighting...", m->name);
+        ui::dialogBox(player->name, "", false, "%s doesn't appear to be in the mood for fighting...", m->name.c_str());
     }
 
     ACTION_EPILOUGE;
diff --git a/src/world.cpp b/src/world.cpp
index b096180..11bd671 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -718,7 +718,7 @@ void World::draw(Player *p)
 	
 	std::vector<GLfloat> partVec(pss);
 	GLfloat *pIndex = &partVec[0];
-
+  
 	for (const auto &p : particles) {
         pc += 30;
 		if (pc > pss) {
@@ -2193,15 +2193,15 @@ loadWorldFromXMLNoSave(std::string path) {
 		vil = vil->NextSiblingElement();
 	}
 
-	std::ifstream dat ((_currentXML + ".dat").data());
-	if (dat.good()) {
-		dat.close();
-		tmp->load();
-	}
-
 	if (!loadedLeft && !loadedRight) {
 		currentXML = _currentXML;
 		currentXMLRaw = _currentXMLRaw;
+		
+		std::ifstream dat ((_currentXML + ".dat").data());
+		if (dat.good()) {
+			dat.close();
+			tmp->load();
+		}
 	} else {
 		delete _currentXMLDoc;
 	}
diff --git a/win32/main.exe b/win32/main.exe
index f77663e..1e00343 100755
--- a/win32/main.exe
+++ b/win32/main.exe