Skip to content
This repository was archived by the owner on Jan 5, 2024. It is now read-only.

Commit c382bbe

Browse files
MaximDudeMaximDude
committed
No need to prepend data directory to hardcoded paths because the whole point of the handling in PresetMan is to deal with automagic-ing this
1 parent fe1aa47 commit c382bbe

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

‎Managers/ConsoleMan.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ namespace RTE {
4545
if (!m_GUIInput) { m_GUIInput = new GUIInputWrapper(-1); }
4646
if (!m_GUIControlManager) { m_GUIControlManager = new GUIControlManager(); }
4747

48-
if (!m_GUIControlManager->Create(m_GUIScreen, m_GUIInput, "Data/Base.rte/GUIs/Skins/Menus", m_ConsoleUseMonospaceFont ? "ConsoleMonospaceSkin.ini" : "ConsoleSkin.ini")) {
48+
if (!m_GUIControlManager->Create(m_GUIScreen, m_GUIInput, "Base.rte/GUIs/Skins/Menus", m_ConsoleUseMonospaceFont ? "ConsoleMonospaceSkin.ini" : "ConsoleSkin.ini")) {
4949
RTEAbort("Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/ConsoleSkin.ini");
5050
}
5151

52-
m_GUIControlManager->Load("Data/Base.rte/GUIs/ConsoleGUI.ini");
52+
m_GUIControlManager->Load("Base.rte/GUIs/ConsoleGUI.ini");
5353
m_GUIControlManager->EnableMouse(false);
5454

5555
// Stretch the invisible root box to fill the screen

‎Menus/LoadingScreen.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ namespace RTE {
2727

2828
void LoadingScreen::Create(AllegroScreen *guiScreen, GUIInputWrapper *guiInput, bool progressReportDisabled) {
2929
GUIControlManager loadingScreenManager;
30-
RTEAssert(loadingScreenManager.Create(guiScreen, guiInput, "Data/Base.rte/GUIs/Skins/Menus", "LoadingScreenSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/LoadingScreenSkin.ini");
31-
loadingScreenManager.Load("Data/Base.rte/GUIs/LoadingGUI.ini");
30+
RTEAssert(loadingScreenManager.Create(guiScreen, guiInput, "Base.rte/GUIs/Skins/Menus", "LoadingScreenSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/LoadingScreenSkin.ini");
31+
loadingScreenManager.Load("Base.rte/GUIs/LoadingGUI.ini");
3232

3333
int loadingSplashOffset = 0;
3434
if (!progressReportDisabled) {

‎Menus/MainMenuGUI.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ namespace RTE {
5555

5656
void MainMenuGUI::Create(AllegroScreen *guiScreen, GUIInputWrapper *guiInput) {
5757
m_MainMenuScreenGUIControlManager = std::make_unique<GUIControlManager>();
58-
RTEAssert(m_MainMenuScreenGUIControlManager->Create(guiScreen, guiInput, "Data/Base.rte/GUIs/Skins/Menus", "MainMenuScreenSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuScreenSkin.ini");
59-
m_MainMenuScreenGUIControlManager->Load("Data/Base.rte/GUIs/MainMenuGUI.ini");
58+
RTEAssert(m_MainMenuScreenGUIControlManager->Create(guiScreen, guiInput, "Base.rte/GUIs/Skins/Menus", "MainMenuScreenSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuScreenSkin.ini");
59+
m_MainMenuScreenGUIControlManager->Load("Base.rte/GUIs/MainMenuGUI.ini");
6060

6161
m_SubMenuScreenGUIControlManager = std::make_unique<GUIControlManager>();
62-
RTEAssert(m_SubMenuScreenGUIControlManager->Create(guiScreen, guiInput, "Data/Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
63-
m_SubMenuScreenGUIControlManager->Load("Data/Base.rte/GUIs/MainMenuSubMenuGUI.ini");
62+
RTEAssert(m_SubMenuScreenGUIControlManager->Create(guiScreen, guiInput, "Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
63+
m_SubMenuScreenGUIControlManager->Load("Base.rte/GUIs/MainMenuSubMenuGUI.ini");
6464

6565
m_RootBoxMaxWidth = g_WindowMan.FullyCoversAllDisplays() ? g_WindowMan.GetPrimaryWindowDisplayWidth() / g_WindowMan.GetResMultiplier() : g_WindowMan.GetResX();
6666

‎Menus/MetagameGUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,10 @@ int MetagameGUI::Create(Controller *pController)
373373
m_pGUIInput = new GUIInputWrapper(-1, true);
374374
if (!m_pGUIController)
375375
m_pGUIController = new GUIControlManager();
376-
if (!m_pGUIController->Create(m_pGUIScreen, m_pGUIInput, "Data/Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini")) {
376+
if (!m_pGUIController->Create(m_pGUIScreen, m_pGUIInput, "Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini")) {
377377
RTEAbort("Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
378378
}
379-
m_pGUIController->Load("Data/Base.rte/GUIs/MetagameGUI.ini");
379+
m_pGUIController->Load("Base.rte/GUIs/MetagameGUI.ini");
380380

381381
m_RootBoxMaxWidth = g_WindowMan.FullyCoversAllDisplays() ? g_WindowMan.GetPrimaryWindowDisplayWidth() / g_WindowMan.GetResMultiplier() : g_WindowMan.GetResX();
382382

‎Menus/ModManagerGUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace RTE {
2020

2121
ModManagerGUI::ModManagerGUI(AllegroScreen *guiScreen, GUIInputWrapper *guiInput) {
2222
m_GUIControlManager = std::make_unique<GUIControlManager>();
23-
RTEAssert(m_GUIControlManager->Create(guiScreen, guiInput, "Data/Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
24-
m_GUIControlManager->Load("Data/Base.rte/GUIs/ModManagerGUI.ini");
23+
RTEAssert(m_GUIControlManager->Create(guiScreen, guiInput, "Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
24+
m_GUIControlManager->Load("Base.rte/GUIs/ModManagerGUI.ini");
2525

2626
int rootBoxMaxWidth = g_WindowMan.FullyCoversAllDisplays() ? g_WindowMan.GetPrimaryWindowDisplayWidth() / g_WindowMan.GetResMultiplier() : g_WindowMan.GetResX();
2727

‎Menus/ScenarioGUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ namespace RTE {
5555

5656
void ScenarioGUI::Create(AllegroScreen *guiScreen, GUIInputWrapper *guiInput) {
5757
m_GUIControlManager = std::make_unique<GUIControlManager>();
58-
RTEAssert(m_GUIControlManager->Create(guiScreen, guiInput, "Data/Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
59-
m_GUIControlManager->Load("Data/Base.rte/GUIs/ScenarioGUI.ini");
58+
RTEAssert(m_GUIControlManager->Create(guiScreen, guiInput, "Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
59+
m_GUIControlManager->Load("Base.rte/GUIs/ScenarioGUI.ini");
6060

6161
m_RootBoxMaxWidth = g_WindowMan.FullyCoversAllDisplays() ? g_WindowMan.GetPrimaryWindowDisplayWidth() / g_WindowMan.GetResMultiplier() : g_WindowMan.GetResX();
6262

‎Menus/SettingsGUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ namespace RTE {
1414

1515
SettingsGUI::SettingsGUI(AllegroScreen *guiScreen, GUIInputWrapper *guiInput) {
1616
m_GUIControlManager = std::make_unique<GUIControlManager>();
17-
RTEAssert(m_GUIControlManager->Create(guiScreen, guiInput, "Data/Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
18-
m_GUIControlManager->Load("Data/Base.rte/GUIs/SettingsGUI.ini");
17+
RTEAssert(m_GUIControlManager->Create(guiScreen, guiInput, "Base.rte/GUIs/Skins/Menus", "MainMenuSubMenuSkin.ini"), "Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Menus/MainMenuSubMenuSkin.ini");
18+
m_GUIControlManager->Load("Base.rte/GUIs/SettingsGUI.ini");
1919

2020
int rootBoxMaxWidth = g_WindowMan.FullyCoversAllDisplays() ? g_WindowMan.GetPrimaryWindowDisplayWidth() / g_WindowMan.GetResMultiplier() : g_WindowMan.GetResX();
2121

0 commit comments

Comments
 (0)