From 7a4bc1d9e6b73471cb2e20d2ab0611a507979f30 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Thu, 20 Oct 2016 09:23:52 -0400
Subject: ortho follows cat, bobshouse can be opened

---
 src/world.cpp | 46 +---------------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

(limited to 'src')

diff --git a/src/world.cpp b/src/world.cpp
index 15fde50..6405382 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -330,51 +330,7 @@ loadWorldFromXMLNoSave(std::string path) {
 		newEntity = nullptr;
 		name = wxml->Name();
 
-        // world linkage
-		if (name == "link") {
-
-            // links world to the left
-			if ((ptr = wxml->Attribute("left"))) {
-				tmp->setToLeft(ptr);
-
-                // load the left world if it isn't
-                if (!loadedLeft) {
-                    loadedRight = true;
-                    currentWorldToLeft = loadWorldFromXMLNoSave(ptr);
-                    loadedRight = false;
-                } else {
-					currentWorldToLeft = nullptr;
-				}
-			}
-
-            // links world to the right
-            else if ((ptr = wxml->Attribute("right"))) {
-				tmp->setToRight(ptr);
-
-                // load the right world if it isn't
-                if (!loadedRight) {
-					loadedLeft = true;
-                    currentWorldToRight = loadWorldFromXMLNoSave(ptr);
-                    loadedLeft = false;
-				} else {
-					currentWorldToRight = nullptr;
-				}
-			}
-
-			// tells what world is outside, if in a structure
-			else if (Indoor && (ptr = wxml->Attribute("outside"))) {
-//				if (!loadedLeft && !loadedRight)
-//					inside.push_back(ptr);
-			}
-
-            // error, invalid link tag
-            else {
-                UserError("XML Error: Invalid <link> tag in " + _currentXML + "!");
-			}
-
-		}
-
-		// set spawn x for player
+   		// set spawn x for player
 		else if (name == "spawnx" && !(loadedLeft | loadedRight)) {
 			player->loc.x = std::stoi(wxml->GetText());
 		}
-- 
cgit v1.2.3