Merge branch 'pre4-testing' into 4zk-content-source

Author: fourZK

Entities/Scene.cpp

@@ -2289,16 +2289,17 @@ bool Scene::HasArea(string areaName)
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Gets a specific area box identified by a name. Ownership is NOT transferred!
 
-Scene::Area * Scene::GetArea(string areaName)
-{
-    for (list<Area>::iterator aItr = m_AreaList.begin(); aItr != m_AreaList.end(); ++aItr)
-    {
-        if ((*aItr).GetName() == areaName)
-            return &(*aItr);
-    }
+Scene::Area * Scene::GetArea(const std::string_view &areaName, bool luaWarnNotError) {
+	for (Scene::Area &area : m_AreaList) {
+		if (area.GetName() == areaName) {
+			return &area;
+		}
+	}
 
-    g_ConsoleMan.PrintString("ERROR: Could not find the requested Scene Area named: " + areaName);
-    return 0;
+	std::string luaMessageStart = luaWarnNotError ? "WARNING" : "ERROR";
+    g_ConsoleMan.PrintString(luaMessageStart + ": Could not find the requested Scene Area named: " + areaName.data());
+
+    return nullptr;
 }