Skip to content

Commit fa53af4

Browse files
trauntstraunts
committed
Merge remote-tracking branch 'source/ModuleMan' into ModuleMan
2 parents c5d0d69 + c1cdba2 commit fa53af4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1526
-1999
lines changed

‎Activities/ActorEditor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
#include "ActorEditor.h"
1515

16+
#include "ModuleMan.h"
1617
#include "PresetMan.h"
1718
#include "MovableMan.h"
1819
#include "FrameMan.h"
@@ -28,7 +29,6 @@
2829
#include "ACRocket.h"
2930
#include "HeldDevice.h"
3031
#include "Scene.h"
31-
#include "DataModule.h"
3232

3333
#include "ObjectPickerGUI.h"
3434

@@ -356,7 +356,7 @@ bool ActorEditor::ReloadActorData() {
356356
if (m_pEditedActor) {
357357
std::string presetName = m_pEditedActor->GetPresetName();
358358
std::string className = m_pEditedActor->GetClassName();
359-
std::string moduleName = g_PresetMan.GetDataModuleName(m_pEditedActor->GetModuleID());
359+
std::string moduleName = g_ModuleMan.GetModuleName(m_pEditedActor->GetModuleID());
360360
g_PresetMan.ReloadEntityPreset(presetName, className, moduleName, false);
361361
LoadActor(g_PresetMan.GetEntityPreset(className, presetName, moduleName));
362362
return m_pEditedActor != nullptr;

‎Activities/AreaEditor.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "AreaEditor.h"
1515

1616
#include "WindowMan.h"
17+
#include "ModuleMan.h"
1718
#include "PresetMan.h"
1819
#include "MovableMan.h"
1920
#include "FrameMan.h"
@@ -26,7 +27,6 @@
2627
#include "ACRocket.h"
2728
#include "HeldDevice.h"
2829
#include "Scene.h"
29-
#include "DataModule.h"
3030

3131
#include "GUI.h"
3232
#include "AllegroBitmap.h"
@@ -596,10 +596,10 @@ bool AreaEditor::SaveScene(const std::string &saveAsName, bool forceOverwrite) {
596596
Scene *editedScene = g_SceneMan.GetScene();
597597
editedScene->SetPresetName(saveAsName);
598598

599-
std::string dataModuleName = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName();
599+
std::string dataModuleName = g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName();
600600
bool savingToUserScenesModule = (dataModuleName == c_UserScenesModuleName);
601601

602-
std::string dataModuleFullPath = g_PresetMan.GetFullModulePath(dataModuleName);
602+
std::string dataModuleFullPath = g_ModuleMan.GetFullModulePath(dataModuleName);
603603
std::string sceneSavePath;
604604
std::string previewSavePath;
605605

@@ -711,10 +711,10 @@ void AreaEditor::UpdateLoadDialog()
711711
void AreaEditor::UpdateSaveDialog()
712712
{
713713
m_pSaveNameBox->SetText((g_SceneMan.GetScene()->GetPresetName() == "None" || !m_HasEverBeenSaved) ? "New Scene" : g_SceneMan.GetScene()->GetPresetName());
714-
if (g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == c_UserScenesModuleName)
715-
m_pSaveModuleLabel->SetText("Will save in " + g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/");
714+
if (g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == c_UserScenesModuleName)
715+
m_pSaveModuleLabel->SetText("Will save in " + g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/");
716716
else
717-
m_pSaveModuleLabel->SetText("Will save in " + g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes");
717+
m_pSaveModuleLabel->SetText("Will save in " + g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes");
718718
}
719719

720720

@@ -728,10 +728,10 @@ void AreaEditor::UpdateChangesDialog()
728728
if (m_HasEverBeenSaved)
729729
{
730730
dynamic_cast<GUILabel *>(m_pGUIController->GetControl("ChangesExpLabel"))->SetText("Do you want to save your changes to:");
731-
if (g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == c_UserScenesModuleName)
732-
m_pChangesNameLabel->SetText(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/" + g_SceneMan.GetScene()->GetPresetName());
731+
if (g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == c_UserScenesModuleName)
732+
m_pChangesNameLabel->SetText(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/" + g_SceneMan.GetScene()->GetPresetName());
733733
else
734-
m_pChangesNameLabel->SetText(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + g_SceneMan.GetScene()->GetPresetName());
734+
m_pChangesNameLabel->SetText(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + g_SceneMan.GetScene()->GetPresetName());
735735
}
736736
else
737737
{
@@ -748,10 +748,10 @@ void AreaEditor::UpdateChangesDialog()
748748

749749
void AreaEditor::UpdateOverwriteDialog()
750750
{
751-
if (g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == c_UserScenesModuleName)
752-
m_pOverwriteNameLabel->SetText(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/" + g_SceneMan.GetScene()->GetPresetName());
751+
if (g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() == c_UserScenesModuleName)
752+
m_pOverwriteNameLabel->SetText(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/" + g_SceneMan.GetScene()->GetPresetName());
753753
else
754-
m_pOverwriteNameLabel->SetText(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + g_SceneMan.GetScene()->GetPresetName());
754+
m_pOverwriteNameLabel->SetText(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + g_SceneMan.GetScene()->GetPresetName());
755755
}
756756

757757
} // namespace RTE

‎Activities/AssemblyEditor.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "AssemblyEditor.h"
1515

1616
#include "WindowMan.h"
17+
#include "ModuleMan.h"
1718
#include "PresetMan.h"
1819
#include "MovableMan.h"
1920
#include "FrameMan.h"
@@ -26,7 +27,6 @@
2627
#include "ACRocket.h"
2728
#include "HeldDevice.h"
2829
#include "Scene.h"
29-
#include "DataModule.h"
3030

3131
#include "GUI.h"
3232
#include "GUICollectionBox.h"
@@ -345,10 +345,10 @@ void AssemblyEditor::Update()
345345
if (g_SceneMan.GetScene())
346346
{
347347
//m_ModuleSpaceID = g_SceneMan.GetScene()->GetModuleID();
348-
m_ModuleSpaceID = g_PresetMan.GetModuleID(m_pModuleCombo->GetSelectedItem()->m_Name);
348+
m_ModuleSpaceID = g_ModuleMan.GetModuleID(m_pModuleCombo->GetSelectedItem()->m_Name);
349349
RTEAssert(m_ModuleSpaceID >= 0, "Loaded Scene's DataModule ID is negative? Should always be a specific one..");
350350
m_pEditorGUI->Destroy();
351-
if (m_ModuleSpaceID == g_PresetMan.GetModuleID(c_UserScenesModuleName))
351+
if (m_ModuleSpaceID == g_ModuleMan.GetModuleID(c_UserScenesModuleName))
352352
m_pEditorGUI->Create(&(m_PlayerController[0]), AssemblyEditorGUI::ONLOADEDIT, -1);
353353
else
354354
m_pEditorGUI->Create(&(m_PlayerController[0]), AssemblyEditorGUI::ONLOADEDIT, m_ModuleSpaceID);
@@ -609,10 +609,10 @@ BunkerAssembly * AssemblyEditor::BuildAssembly(std::string saveAsName)
609609
bool AssemblyEditor::SaveAssembly(const std::string &saveAsName, bool forceOverwrite) {
610610
std::unique_ptr<BunkerAssembly> editedAssembly(BuildAssembly(saveAsName));
611611

612-
std::string dataModuleName = g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName();
612+
std::string dataModuleName = g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName();
613613
bool savingToUserScenesModule = (dataModuleName == c_UserScenesModuleName);
614614

615-
std::string dataModuleFullPath = g_PresetMan.GetFullModulePath(dataModuleName);
615+
std::string dataModuleFullPath = g_ModuleMan.GetFullModulePath(dataModuleName);
616616
std::string assemblySavePath;
617617

618618
if (savingToUserScenesModule) {
@@ -698,20 +698,20 @@ void AssemblyEditor::UpdateLoadDialog()
698698

699699
if (m_pModuleCombo->GetCount() <= 0)
700700
{
701-
for (int module = 0; module < g_PresetMan.GetTotalModuleCount(); ++module)
701+
for (int module = 0; module < g_ModuleMan.GetTotalModuleCount(); ++module)
702702
{
703703
// Cut-off vanilla modules except Base.rte
704704
bool isValid = false;
705705

706706
// If metascenes are visible then allow to save assemblies to Base.rte
707707
if (g_SettingsMan.ShowMetascenes())
708708
{
709-
if ((module == 0 || module > 8) && g_PresetMan.GetDataModule(module)->GetFileName() != c_UserConquestSavesModuleName
710-
&& g_PresetMan.GetDataModule(module)->GetFileName() != "Missions.rte")
709+
if ((module == 0 || module > 8) && g_ModuleMan.GetDataModule(module)->GetFileName() != c_UserConquestSavesModuleName
710+
&& g_ModuleMan.GetDataModule(module)->GetFileName() != "Missions.rte")
711711
isValid = true;
712712
} else {
713-
if (module > 8 && g_PresetMan.GetDataModule(module)->GetFileName() != c_UserConquestSavesModuleName
714-
&& g_PresetMan.GetDataModule(module)->GetFileName() != "Missions.rte" && g_PresetMan.GetDataModule(module)->GetFileName() != c_UserScriptedSavesModuleName)
713+
if (module > 8 && g_ModuleMan.GetDataModule(module)->GetFileName() != c_UserConquestSavesModuleName
714+
&& g_ModuleMan.GetDataModule(module)->GetFileName() != "Missions.rte" && g_ModuleMan.GetDataModule(module)->GetFileName() != c_UserScriptedSavesModuleName)
715715
isValid = true;
716716
}
717717

@@ -721,17 +721,17 @@ void AssemblyEditor::UpdateLoadDialog()
721721

722722
if (isValid)
723723
{
724-
m_pModuleCombo->AddItem(g_PresetMan.GetDataModule(module)->GetFileName());
724+
m_pModuleCombo->AddItem(g_ModuleMan.GetDataModule(module)->GetFileName());
725725

726726
if (g_SettingsMan.AllowSavingToBase())
727727
{
728728
// If editors are in dev-mode then select Base.rte as default module to save stuff
729-
if (g_PresetMan.GetDataModule(module)->GetFileName() == "Base.rte")
729+
if (g_ModuleMan.GetDataModule(module)->GetFileName() == "Base.rte")
730730
scenesIndex = m_pModuleCombo->GetCount() - 1;
731731
}
732732
else
733733
{
734-
if (g_PresetMan.GetDataModule(module)->GetFileName() == c_UserScenesModuleName)
734+
if (g_ModuleMan.GetDataModule(module)->GetFileName() == c_UserScenesModuleName)
735735
scenesIndex = m_pModuleCombo->GetCount() - 1;
736736
}
737737
}
@@ -778,7 +778,7 @@ void AssemblyEditor::UpdateSaveDialog()
778778
defaultName = pScheme->GetPresetName() + " - ";
779779

780780
m_pSaveNameBox->SetText(m_pEditorGUI->GetCurrentAssemblyName() == "" ? defaultName : m_pEditorGUI->GetCurrentAssemblyName());
781-
m_pSaveModuleLabel->SetText("Will save in " + g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName());
781+
m_pSaveModuleLabel->SetText("Will save in " + g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName());
782782
}
783783

784784

‎Activities/BaseEditor.cpp

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#include "ACRocket.h"
3131
#include "HeldDevice.h"
3232
#include "Scene.h"
33-
#include "DataModule.h"
3433

3534
#include "SceneEditorGUI.h"
3635

@@ -339,7 +338,7 @@ void BaseEditor::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int whi
339338

340339
void BaseEditor::Draw(BITMAP* pTargetBitmap, const Vector &targetPos)
341340
{
342-
Activity::Draw(pTargetBitmap, targetPos);
341+
Activity::Draw(pTargetBitmap, targetPos);
343342
}
344343

345344

@@ -355,7 +354,7 @@ bool BaseEditor::SaveScene(std::string saveAsName, bool forceOverwrite)
355354
// Set the name of the current scene in effect
356355
g_SceneMan.GetScene()->SetPresetName(saveAsName);
357356
// Try to save to the data module
358-
string sceneFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + saveAsName + ".ini");
357+
string sceneFilePath(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + saveAsName + ".ini");
359358
if (g_PresetMan.AddEntityPreset(g_SceneMan.GetScene(), m_ModuleSpaceID, forceOverwrite, sceneFilePath))
360359
{
361360
// Does ini already exist? If yes, then no need to add it to a scenes.ini etc
@@ -370,7 +369,7 @@ bool BaseEditor::SaveScene(std::string saveAsName, bool forceOverwrite)
370369
if (!sceneFileExisted)
371370
{
372371
// First find/create a .rte/Scenes.ini file to include the new .ini into
373-
string scenesFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes.ini");
372+
string scenesFilePath(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes.ini");
374373
bool scenesFileExisted = System::PathExistsCaseSensitive(scenesFilePath.c_str());
375374
Writer scenesWriter(scenesFilePath.c_str(), true);
376375
scenesWriter.NewProperty("\nIncludeFile");
@@ -380,7 +379,7 @@ bool BaseEditor::SaveScene(std::string saveAsName, bool forceOverwrite)
380379
// If it's already included, it doens't matter, the definitions will just bounce the second time
381380
if (!scenesFileExisted)
382381
{
383-
string indexFilePath(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Index.ini");
382+
string indexFilePath(g_ModuleMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Index.ini");
384383
Writer indexWriter(indexFilePath.c_str(), true);
385384
// Add extra tab since the DataModule has everything indented
386385
indexWriter.NewProperty("\tIncludeFile");

‎Activities/EditorActivity.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "ACRocket.h"
2626
#include "HeldDevice.h"
2727
#include "Scene.h"
28-
#include "DataModule.h"
2928

3029
#include "GUI.h"
3130
#include "AllegroScreen.h"
@@ -247,7 +246,7 @@ void EditorActivity::End()
247246
{
248247
Activity::End();
249248

250-
249+
251250

252251
m_ActivityState = ActivityState::Over;
253252
}
@@ -406,7 +405,7 @@ void EditorActivity::Update()
406405
GUIListPanel::Item *pItem = m_pNewModuleCombo->GetItem(m_pNewModuleCombo->GetSelectedIndex());
407406
if (pItem && !pItem->m_Name.empty())
408407
{
409-
m_ModuleSpaceID = g_PresetMan.GetModuleID(pItem->m_Name);
408+
m_ModuleSpaceID = g_ModuleMan.GetModuleID(pItem->m_Name);
410409
411410
// Allocate Scene
412411
Scene *pNewScene = new Scene();
@@ -623,7 +622,7 @@ void EditorActivity::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int
623622

624623
void EditorActivity::Draw(BITMAP *pTargetBitmap, const Vector &targetPos)
625624
{
626-
625+
627626
}
628627

629628
} // namespace RTE

‎Activities/GAScripted.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "GAScripted.h"
1515

1616
#include "SceneMan.h"
17+
#include "ModuleMan.h"
1718
#include "PresetMan.h"
1819
#include "MovableMan.h"
1920
#include "UInputMan.h"
@@ -122,7 +123,7 @@ int GAScripted::ReadProperty(const std::string_view &propName, Reader &reader) {
122123
StartPropertyList(return GameActivity::ReadProperty(propName, reader));
123124

124125
MatchProperty("ScriptPath", {
125-
m_ScriptPath = g_PresetMan.GetFullModulePath(reader.ReadPropValue());
126+
m_ScriptPath = g_ModuleMan.GetFullModulePath(reader.ReadPropValue());
126127
});
127128
MatchProperty("LuaClassName", {
128129
reader >> m_LuaClassName;
@@ -505,7 +506,7 @@ int GAScripted::RunLuaFunction(const std::string& functionName, const std::vecto
505506

506507
void GAScripted::CollectRequiredAreas() {
507508
// Open the script file so we can check it out
508-
std::ifstream scriptFile = std::ifstream(g_PresetMan.GetFullModulePath(m_ScriptPath.c_str()));
509+
std::ifstream scriptFile = std::ifstream(g_ModuleMan.GetFullModulePath(m_ScriptPath.c_str()));
509510
if (!scriptFile.good()) {
510511
return;
511512
}

‎Activities/GameActivity.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "GameActivity.h"
1515

1616
#include "CameraMan.h"
17+
#include "ModuleMan.h"
1718
#include "PresetMan.h"
1819
#include "MovableMan.h"
1920
#include "WindowMan.h"
@@ -24,7 +25,6 @@
2425
#include "ConsoleMan.h"
2526
#include "PresetMan.h"
2627
#include "SceneMan.h"
27-
#include "DataModule.h"
2828
#include "PostProcessMan.h"
2929
#include "Controller.h"
3030
#include "Scene.h"
@@ -338,7 +338,7 @@ void GameActivity::Destroy(bool notInherited)
338338
m_TeamTech[team] = tech;
339339
else
340340
{
341-
int id = g_PresetMan.GetModuleID(tech);
341+
int id = g_ModuleMan.GetModuleID(tech);
342342
if (id != -1)
343343
m_TeamTech[team] = tech;
344344
else
@@ -356,7 +356,7 @@ void GameActivity::Destroy(bool notInherited)
356356
{
357357
if (moduleid > -1)
358358
{
359-
const DataModule * pDataModule = g_PresetMan.GetDataModule(moduleid);
359+
const DataModule * pDataModule = g_ModuleMan.GetDataModule(moduleid);
360360
if (pDataModule)
361361
return pDataModule->GetCrabToHumanSpawnRatio();
362362
}
@@ -956,7 +956,7 @@ int GameActivity::Start()
956956

957957
// Load correct loadouts into buy menu if we're starting a non meta-game activity
958958
if (m_pBuyGUI[player]->GetMetaPlayer() == Players::NoPlayer) {
959-
int techModuleID = g_PresetMan.GetModuleID(GetTeamTech(GetTeamOfPlayer(player)));
959+
int techModuleID = g_ModuleMan.GetModuleID(GetTeamTech(GetTeamOfPlayer(player)));
960960

961961
m_pBuyGUI[player]->SetNativeTechModule(techModuleID);
962962
m_pBuyGUI[player]->SetForeignCostMultiplier(1.0);

0 commit comments

Comments
 (0)