Fixed GetArea fuckery in the laziest way I know how

Author: Causeless

Source/Activities/AreaEditor.cpp

@@ -289,15 +289,15 @@ void AreaEditor::Update() {
 				// Make sure we're not trying to create a noname area
 				if (!m_pNewAreaName->GetText().empty()) {
 					// Check if name is already taken, and if so, select the taken one instead of creating a new
-					if (Scene::Area* pArea = pCurrentScene->GetArea2(m_pNewAreaName->GetText())) {
+					if (Scene::Area* pArea = pCurrentScene->GetArea(m_pNewAreaName->GetText())) {
 						m_pEditorGUI->SetCurrentArea(pArea);
 						m_pEditorGUI->SetEditorGUIMode(AreaEditorGUI::PREADDMOVEBOX);
 					} else {
 						// Make and name new Area
 						Scene::Area newArea(m_pNewAreaName->GetText());
 						pCurrentScene->m_AreaList.push_back(newArea);
 						// Set the new area as the active one in the GUI, note we're getting the correct one from the scene, it's a copy of the one passed in
-						m_pEditorGUI->SetCurrentArea(pCurrentScene->GetArea2(newArea.GetName()));
+						m_pEditorGUI->SetCurrentArea(pCurrentScene->GetArea(newArea.GetName()));
 						// Update teh picker list of the GUI so we can mousewheel between all the Areas, incl the new one
 						m_pEditorGUI->UpdatePickerList(newArea.GetName());
 					}

Source/Activities/GATutorial.cpp

@@ -170,7 +170,7 @@ int GATutorial::Start() {
 			// See if there are specified landing zone areas defined in the scene
 			char str[64];
 			std::snprintf(str, sizeof(str), "LZ Team %d", team + 1);
-			Scene::Area* pArea = g_SceneMan.GetScene()->GetArea1(str);
+			Scene::Area* pArea = g_SceneMan.GetScene()->GetArea(str);
 			//        pArea = pArea ? pArea : g_SceneMan.GetScene()->GetArea("Landing Zone");
 			// If area is defined, save a copy so we can lock the LZ selection to within its boxes
 			if (pArea && !pArea->HasNoArea())

Source/Entities/HDFirearm.cpp

@@ -938,7 +938,7 @@ void HDFirearm::Update() {
 				m_FireSound->Play(m_Pos);
 			}
 			if (m_FireEchoSound) {
-				Scene::Area* noEchoArea = g_SceneMan.GetScene()->GetArea1("IndoorArea");
+				Scene::Area* noEchoArea = g_SceneMan.GetScene()->GetArea("IndoorArea");
 				if (noEchoArea == nullptr || !noEchoArea->IsInside(m_Pos)) {
 					m_FireEchoSound->Play(m_Pos);
 				}

Source/Entities/Scene.cpp

@@ -1848,15 +1848,15 @@ bool Scene::SetArea(Area& newArea) {
 	return false;
 }
 
-bool Scene::HasArea(std::string areaName) {
+bool Scene::HasArea(const std::string& areaName) {
 	for (std::list<Area>::iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
 		if ((*aItr).GetName() == areaName)
 			return true;
 	}
 	return false;
 }
 
-Scene::Area* Scene::GetArea1(const std::string_view& areaName) {
+Scene::Area* Scene::GetArea(const std::string& areaName) {
 	for (Scene::Area& area: m_AreaList) {
 		if (area.GetName() == areaName) {
 			return &area;
@@ -1866,7 +1866,7 @@ Scene::Area* Scene::GetArea1(const std::string_view& areaName) {
 	return nullptr;
 }
 
-bool Scene::RemoveArea(std::string areaName) {
+bool Scene::RemoveArea(const std::string& areaName) {
 	for (std::list<Area>::iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr) {
 		if ((*aItr).GetName() == areaName) {
 			m_AreaList.erase(aItr);
@@ -1876,7 +1876,7 @@ bool Scene::RemoveArea(std::string areaName) {
 	return false;
 }
 
-bool Scene::WithinArea(std::string areaName, const Vector& point) const {
+bool Scene::WithinArea(const std::string& areaName, const Vector& point) const {
 	if (areaName.empty())
 		return false;
 
@@ -2219,7 +2219,7 @@ float Scene::ApplyBuildBudget(int player, int* pObjectsBuilt) {
 					TerrainObject* pTO = dynamic_cast<TerrainObject*>(pObjectToPlace);
 					if (pTO) {
 						if (HasArea(METABASE_AREA_NAME)) {
-							Scene::Area* metaBase = GetArea1(METABASE_AREA_NAME);
+							Scene::Area* metaBase = GetArea(METABASE_AREA_NAME);
 							if (metaBase) {
 								float x1 = pTO->GetPos().m_X + pTO->GetBitmapOffset().m_X;
 								float y1 = pTO->GetPos().m_Y + pTO->GetBitmapOffset().m_Y;
@@ -2447,7 +2447,7 @@ void Scene::Update() {
 
 			for (const std::string& navigableArea: m_NavigableAreas) {
 				if (HasArea(navigableArea)) {
-					for (const Box& navigableBox: GetArea2(navigableArea)->GetBoxes()) {
+					for (const Box& navigableBox: GetArea(navigableArea)->GetBoxes()) {
 						pathFinder.MarkBoxNavigable(navigableBox, true);
 					}
 				}

Source/Entities/Scene.h

@@ -501,17 +501,12 @@ namespace RTE {
 		/// This won't throw any errors to the console if the Area isn't found.
 		/// @param areaName The name of the Area to try to find in this Scene.
 		/// @return Whether the specified area is defined in this Scene.
-		bool HasArea(std::string areaName);
+		bool HasArea(const std::string& areaName);
 
 		/// Gets a specified Area identified by name. Ownership is NOT transferred!
 		/// @param areaName The name of the Area to try to get.
 		/// @return A pointer to the Area asked for, or nullptr if no Area of that name was found.
-		Area* GetArea1(const std::string_view& areaName);
-
-		/// Gets a specified Area identified by name. Ownership is NOT transferred!
-		/// @param areaName The name of the Area to try to get.
-		/// @return A pointer to the Area asked for, or nullptr if no Area of that name was found.
-		Area* GetArea2(const std::string& areaName) { return GetArea1(areaName); }
+		Area* GetArea(const std::string& areaName);
 
 		void AddNavigableArea(const std::string& areaName) {
 			m_NavigableAreas.push_back(areaName);
@@ -525,14 +520,14 @@ namespace RTE {
 		/// Removes a specific Area identified by a name.
 		/// @param areaName The name of the Area to try to remove.
 		/// @return Whether an Area of that name was found, and subsequently removed.
-		bool RemoveArea(std::string areaName);
+		bool RemoveArea(const std::string& areaName);
 
 		/// Checks if a point is within a specific named Area of this Scene. If
 		/// no Area of the name is found, this just returns false without error.
 		/// @param areaName The name of the Area to try to check against.
 		/// @param point The point to see if it's within the specified Area.
 		/// @return Whether any Area of that name was found, AND the point falls within it.
-		bool WithinArea(std::string areaName, const Vector& point) const;
+		bool WithinArea(const std::string& areaName, const Vector& point) const;
 
 		/// Gets the global acceleration (in m/s^2) that is applied to all movable
 		/// objects' velocities during every frame. Typically models gravity.

Source/Lua/LuaBindingsEntities.cpp

@@ -1197,7 +1197,7 @@ LuaBindingRegisterFunctionDefinitionForType(EntityLuaBindings, Scene) {
 	    .def_readwrite("Areas", &Scene::m_AreaList, luabind::return_stl_iterator)
 	    .def("SetArea", &Scene::SetArea)
 	    .def("HasArea", &Scene::HasArea)
-	    .def("GetArea", (Scene::Area * (Scene::*)(const std::string& areaName)) & Scene::GetArea2)
+	    .def("GetArea", &Scene::GetArea)
 	    .def("WithinArea", &Scene::WithinArea)
 	    .def("AddNavigableArea", &Scene::AddNavigableArea)
 	    .def("ClearNavigableAreas", &Scene::ClearNavigableAreas)

Source/Managers/SceneMan.cpp

@@ -2240,7 +2240,7 @@ bool SceneMan::OverAltitude(const Vector& point, int threshold, int accuracy) {
 bool SceneMan::IsPointInNoGravArea(const Vector& point) const {
 	// Todo, instead of a nograv area maybe best to tag certain areas as NoGrav. As otherwise it's tricky to keep track of when things are removed
 	if (m_pCurrentScene) {
-		Scene::Area* noGravArea = m_pCurrentScene->GetArea1("NoGravityArea");
+		Scene::Area* noGravArea = m_pCurrentScene->GetArea("NoGravityArea");
 		if (noGravArea && noGravArea->IsInside(point)) {
 			return true;
 		}
@@ -2648,7 +2648,7 @@ void SceneMan::Draw(BITMAP* targetBitmap, BITMAP* targetGUIBitmap, const Vector&
 
 			static bool s_drawNoGravBoxes = false;
 			if (s_drawNoGravBoxes) {
-				if (Scene::Area* noGravArea = m_pCurrentScene->GetArea1("NoGravityArea")) {
+				if (Scene::Area* noGravArea = m_pCurrentScene->GetArea("NoGravityArea")) {
 					const std::vector<Box>& boxList = noGravArea->GetBoxes();
 					g_FrameMan.SetTransTableFromPreset(TransparencyPreset::MoreTrans);
 					drawing_mode(DRAW_MODE_TRANS, 0, 0, 0);

Source/Menus/AreaPickerGUI.cpp

@@ -173,7 +173,7 @@ Scene::Area* AreaPickerGUI::GetNextArea() {
 	GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 	if (pItem) {
 		g_GUISound.SelectionChangeSound()->Play();
-		return g_SceneMan.GetScene()->GetArea2(pItem->m_Name);
+		return g_SceneMan.GetScene()->GetArea(pItem->m_Name);
 	}
 	return 0;
 }
@@ -189,7 +189,7 @@ Scene::Area* AreaPickerGUI::GetPrevArea() {
 	GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 	if (pItem) {
 		g_GUISound.SelectionChangeSound()->Play();
-		return g_SceneMan.GetScene()->GetArea2(pItem->m_Name);
+		return g_SceneMan.GetScene()->GetArea(pItem->m_Name);
 	}
 	return 0;
 }
@@ -215,7 +215,7 @@ void AreaPickerGUI::UpdateAreasList(std::string selectAreaName) {
 		// Set the picked area to be the one now selected at the top
 		GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 		if (pItem)
-			m_pPickedArea = pScene->GetArea2(pItem->m_Name);
+			m_pPickedArea = pScene->GetArea(pItem->m_Name);
 	}
 }
 
@@ -329,7 +329,7 @@ void AreaPickerGUI::Update() {
 		// Report the newly selected item as being 'picked', but don't close the picker
 		GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 		if (pItem)
-			m_pPickedArea = g_SceneMan.GetScene()->GetArea2(pItem->m_Name);
+			m_pPickedArea = g_SceneMan.GetScene()->GetArea(pItem->m_Name);
 		g_GUISound.SelectionChangeSound()->Play();
 	} else if (pressUp) {
 		m_SelectedAreaIndex--;
@@ -341,7 +341,7 @@ void AreaPickerGUI::Update() {
 		// Report the newly selected item as being 'picked', but don't close the picker
 		GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 		if (pItem)
-			m_pPickedArea = g_SceneMan.GetScene()->GetArea2(pItem->m_Name);
+			m_pPickedArea = g_SceneMan.GetScene()->GetArea(pItem->m_Name);
 
 		g_GUISound.SelectionChangeSound()->Play();
 	}
@@ -351,7 +351,7 @@ void AreaPickerGUI::Update() {
 		GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 		if (pItem) {
 			// User has made final selection, so close the Picker
-			if (m_pPickedArea = g_SceneMan.GetScene()->GetArea2(pItem->m_Name)) {
+			if (m_pPickedArea = g_SceneMan.GetScene()->GetArea(pItem->m_Name)) {
 				g_GUISound.AreaPickedSound()->Play();
 				SetEnabled(false);
 			}
@@ -363,7 +363,7 @@ void AreaPickerGUI::Update() {
 		GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 		if (pItem) {
 			// User has made final selection, so close the Picker
-			if (m_pPickedArea = g_SceneMan.GetScene()->GetArea2(pItem->m_Name)) {
+			if (m_pPickedArea = g_SceneMan.GetScene()->GetArea(pItem->m_Name)) {
 				g_GUISound.AreaPickedSound()->Play();
 				SetEnabled(false);
 			}
@@ -412,7 +412,7 @@ void AreaPickerGUI::Update() {
 					if (pItem) {
 						m_SelectedAreaIndex = m_pAreasList->GetSelectedIndex();
 						// User has made final selection, so close the Picker
-						if (m_pPickedArea = g_SceneMan.GetScene()->GetArea2(pItem->m_Name)) {
+						if (m_pPickedArea = g_SceneMan.GetScene()->GetArea(pItem->m_Name)) {
 							g_GUISound.AreaPickedSound()->Play();
 							SetEnabled(false);
 						}
@@ -429,7 +429,7 @@ void AreaPickerGUI::Update() {
 			GUIListPanel::Item* pItem = m_pAreasList->GetSelected();
 			if (pItem) {
 				// User has made final selection, so close the Picker
-				if (m_pPickedArea = g_SceneMan.GetScene()->GetArea2(pItem->m_Name)) {
+				if (m_pPickedArea = g_SceneMan.GetScene()->GetArea(pItem->m_Name)) {
 					g_GUISound.AreaPickedSound()->Play();
 					SetEnabled(false);
 				}