KOTORBASE: Extract minimap initialization to a separate function

xoreos · Feb 28, 2019 · cfcca34 · cfcca34
1 parent de1671d
commit cfcca34
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/src/engines/kotorbase/module.cpp b/src/engines/kotorbase/module.cpp
@@ -150,24 +150,7 @@ void Module::loadModule(const Common::UString &module, const Common::UString &en
 		throw e;
 	}
 
-	int northAxis;
-	float mapPt1X, mapPt1Y, mapPt2X, mapPt2Y;
-	float worldPt1X, worldPt1Y, worldPt2X, worldPt2Y;
-
-	northAxis = _area->getNorthAxis();
-	_area->getMapPoint1(mapPt1X, mapPt1Y);
-	_area->getMapPoint2(mapPt2X, mapPt2Y);
-	_area->getWorldPoint1(worldPt1X, worldPt1Y);
-	_area->getWorldPoint2(worldPt2X, worldPt2Y);
-
-	Common::UString mapId;
-	if (_module.contains('_'))
-		mapId = _module.substr(++_module.findFirst("_"), _module.end());
-	else
-		mapId = _module.substr(_module.getPosition(3), _module.end());
-	_ingame->setMinimap(mapId, northAxis,
-	                    worldPt1X, worldPt1Y, worldPt2X, worldPt2Y,
-	                    mapPt1X, mapPt1Y, mapPt2X, mapPt2Y);
+	initMinimap();
 
 	_newModule.clear();
 
@@ -670,6 +653,29 @@ void Module::handleEvents() {
 	}
 }
 
+void Module::initMinimap() {
+	int northAxis = _area->getNorthAxis();
+
+	float mapPt1X, mapPt1Y, mapPt2X, mapPt2Y;
+	_area->getMapPoint1(mapPt1X, mapPt1Y);
+	_area->getMapPoint2(mapPt2X, mapPt2Y);
+
+	float worldPt1X, worldPt1Y, worldPt2X, worldPt2Y;
+	_area->getWorldPoint1(worldPt1X, worldPt1Y);
+	_area->getWorldPoint2(worldPt2X, worldPt2Y);
+
+	Common::UString mapId;
+
+	if (_module.contains('_'))
+		mapId = _module.substr(++_module.findFirst("_"), _module.end());
+	else
+		mapId = _module.substr(_module.getPosition(3), _module.end());
+
+	_ingame->setMinimap(mapId, northAxis,
+	                    worldPt1X, worldPt1Y, worldPt2X, worldPt2Y,
+	                    mapPt1X, mapPt1Y, mapPt2X, mapPt2Y);
+}
+
 void Module::updateMinimap() {
 	float x, y, _;
 	_partyController.getPartyLeader()->getPosition(x, y, _);

diff --git a/src/engines/kotorbase/module.h b/src/engines/kotorbase/module.h
@@ -376,10 +376,10 @@ class Module : public Object, public ObjectContainer {
 	void leaveArea();
 
 	void handleEvents();
-
 	void handleActions();
 	void handleHeartbeat();
 
+	void initMinimap();
 	void updateMinimap();
 	void updateSoundListener();
 };