merge fix

1 files changed, 7 insertions, 7 deletions

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;
 	}