Merge remote-tracking branch 'upstream/develop' into SquidHack

Author: realSquidCoder

docs/changelog.txt

@@ -35,6 +35,7 @@ Template for new versions:
 ## Documentation
 
 ## API
+- Added GUI focus strings for new_arena: ``/Loading`` and ``/Mods``
 
 ## Lua
 

library/modules/Gui.cpp

@@ -90,6 +90,7 @@ distribution.
 #include "df/viewscreen_dungeonmodest.h"
 #include "df/viewscreen_dwarfmodest.h"
 #include "df/viewscreen_legendsst.h"
+#include "df/viewscreen_new_arenast.h"
 #include "df/viewscreen_new_regionst.h"
 #include "df/viewscreen_setupdwarfgamest.h"
 #include "df/viewscreen_titlest.h"
@@ -188,6 +189,18 @@ DEFINE_GET_FOCUS_STRING_HANDLER(new_region)
         focusStrings.push_back(baseFocus);
 }
 
+DEFINE_GET_FOCUS_STRING_HANDLER(new_arena)
+{
+    if (screen->raw_load)
+        focusStrings.push_back(baseFocus + "/Loading");
+    else if (screen->doing_mods)
+        focusStrings.push_back(baseFocus + "/Mods");
+
+    if (focusStrings.empty())
+        focusStrings.push_back(baseFocus);
+
+}
+
 DEFINE_GET_FOCUS_STRING_HANDLER(choose_start_site)
 {
     if (screen->doing_site_finder)