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

Commit d8106ce

Browse files
garethyrgarethyr
authored
Merge pull request #84 from cortex-command-community/MaximDude-Experiments
System Cleanup and Refactor
2 parents 72d4108 + 3ee24b2 commit d8106ce

File tree

564 files changed

+9928
-108278
lines changed

Some content is hidden

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

564 files changed

+9928
-108278
lines changed

‎.gitignore

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,11 @@
44
*.log
55
*.pdb
66
*.obj
7+
*.vs
8+
*.APS
79

8-
/.vs
910
/_Bin
10-
/_SDL
11-
/_Pindrop
12-
/Backup
13-
/Debug
14-
/Packaging/Win32-Beta/files
15-
/Packaging/Win32/files
16-
/GUI/Editor/Debug
17-
/GUI/Editor/Release
18-
/Steam Release
19-
/Steam Debug
20-
/Steam Final
21-
/_Bin/Final Open Source
22-
/_Bin/Debug Open Source
23-
/Final Open Source
24-
/Debug Open Source
25-
/Final2017
26-
/Remote Profile
27-
/Remote Release
28-
/Release
29-
/Final
30-
/DebugFast
31-
MemCleanupInfo.txt
32-
/Packaging/Win32-Beta/client1
33-
/Packaging/Win32-Beta/client2
34-
/Packaging/Win32-Beta/client3
35-
/Packaging/Win32-Beta/ClientFinal
36-
/Packaging/Win32-Beta/ServerFinal
37-
/Packaging/Win32-Beta/ServerFinalGameplay
3811
/NATPunchServer/Server/NATCompleteServer/Debug
3912
/NATPunchServer/Server/NATCompleteServer/Release
40-
/NATPunchServer/Server/NATCompleteServer/.vs
41-
/_LuaBind/Debug
42-
/_LuaBind/Release
43-
/_LuaBind/.vs
44-
/_boost_1_69_0/bin.v2
45-
/_boost_1_69_0/stage
46-
/_Allegro-4.2.3.1-Custom/Allegro/build/msvc8/.vs
47-
/_Allegro-4.2.3.1-Custom/Allegro/lib
48-
/_Allegro-4.2.3.1-Custom/Allegro/obj
49-
Doxygen/Output/
13+
/Documentation/Doxygen/Output
14+
MemCleanupInfo.txt

‎Activities/ActorEditor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//////////////////////////////////////////////////////////////////////////////////////////
1515
// Inclusions of header files
1616

17-
#include "DDTTools.h"
17+
#include "RTETools.h"
1818
#include "EditorActivity.h"
1919

2020
namespace RTE

‎Activities/AreaEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ void AreaEditor::Update()
381381
const Activity *pActivityPreset = dynamic_cast<const Activity *>(g_PresetMan.GetEntityPreset("GAScripted", "Skirmish Defense"));
382382
Activity * pActivity = dynamic_cast<Activity *>(pActivityPreset->Clone());
383383
GameActivity *pTestGame = dynamic_cast<GameActivity *>(pActivity);
384-
AAssert(pTestGame, "Couldn't find the \"Skirmish Defense\" GAScripted Activity! Has it been defined?");
384+
RTEAssert(pTestGame, "Couldn't find the \"Skirmish Defense\" GAScripted Activity! Has it been defined?");
385385
pTestGame->SetPlayerCount(1);
386386
pTestGame->SetTeamCount(2);
387387
pTestGame->SetTeamOfPlayer(0, 0);

‎Activities/AreaEditor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//////////////////////////////////////////////////////////////////////////////////////////
1515
// Inclusions of header files
1616

17-
#include "DDTTools.h"
17+
#include "RTETools.h"
1818
#include "EditorActivity.h"
1919

2020
namespace RTE

‎Activities/AssemblyEditor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ void AssemblyEditor::Update()
369369
{
370370
//m_ModuleSpaceID = g_SceneMan.GetScene()->GetModuleID();
371371
m_ModuleSpaceID = g_PresetMan.GetModuleID(m_pModuleCombo->GetSelectedItem()->m_Name);
372-
AAssert(m_ModuleSpaceID >= 0, "Loaded Scene's DataModule ID is negative? Should always be a specific one..");
372+
RTEAssert(m_ModuleSpaceID >= 0, "Loaded Scene's DataModule ID is negative? Should always be a specific one..");
373373
m_pEditorGUI->Destroy();
374374
if (m_ModuleSpaceID == g_PresetMan.GetModuleID("Scenes.rte"))
375375
m_pEditorGUI->Create(&(m_PlayerController[0]), AssemblyEditorGUI::ONLOADEDIT, -1);

‎Activities/AssemblyEditor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//////////////////////////////////////////////////////////////////////////////////////////
1515
// Inclusions of header files
1616

17-
#include "DDTTools.h"
17+
#include "RTETools.h"
1818
#include "EditorActivity.h"
1919
#include "BunkerAssembly.h"
2020

‎Activities/BaseEditor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
//////////////////////////////////////////////////////////////////////////////////////////
1515
// Inclusions of header files
1616

17-
#include "DDTTools.h"
17+
#include "RTETools.h"
1818
#include "EditorActivity.h"
1919

2020
namespace RTE

‎Activities/EditorActivity.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ int EditorActivity::Start()
243243
if (!m_pGUIController)
244244
m_pGUIController = new GUIControlManager();
245245
if(!m_pGUIController->Create(m_pGUIScreen, m_pGUIInput, "Base.rte/GUIs/Skins/Base"))
246-
DDTAbort("Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Base");
246+
RTEAbort("Failed to create GUI Control Manager and load it from Base.rte/GUIs/Skins/Base");
247247

248248
return error;
249249
}
@@ -438,7 +438,7 @@ void EditorActivity::Update()
438438
if (pItem && !pItem->m_Name.empty())
439439
{
440440
SLTerrain *pNewTerrain = dynamic_cast<SLTerrain *>(g_PresetMan.GetEntityPreset("SLTerrain", pItem->m_Name, m_ModuleSpaceID)->Clone());
441-
AAssert(pNewTerrain, "No SLTerrain of that name defined!");
441+
RTEAssert(pNewTerrain, "No SLTerrain of that name defined!");
442442
pNewScene->Create(pNewTerrain);
443443
}
444444
@@ -447,21 +447,21 @@ void EditorActivity::Update()
447447
if (pItem && !pItem->m_Name.empty())
448448
{
449449
SceneLayer *pNewLayer = dynamic_cast<SceneLayer *>(g_PresetMan.GetEntityPreset("SceneLayer", pItem->m_Name, m_ModuleSpaceID)->Clone());
450-
AAssert(pNewLayer, "No SceneLayer of the name set as BG1 is defined!");
450+
RTEAssert(pNewLayer, "No SceneLayer of the name set as BG1 is defined!");
451451
pNewScene->GetBackLayers().push_back(pNewLayer);
452452
}
453453
pItem = m_pNewBG2Combo->GetItem(m_pNewBG2Combo->GetSelectedIndex());
454454
if (pItem && !pItem->m_Name.empty())
455455
{
456456
SceneLayer *pNewLayer = dynamic_cast<SceneLayer *>(g_PresetMan.GetEntityPreset("SceneLayer", pItem->m_Name, m_ModuleSpaceID)->Clone());
457-
AAssert(pNewLayer, "No SceneLayer of the name set as BG2 is defined!");
457+
RTEAssert(pNewLayer, "No SceneLayer of the name set as BG2 is defined!");
458458
pNewScene->GetBackLayers().push_back(pNewLayer);
459459
}
460460
pItem = m_pNewBG3Combo->GetItem(m_pNewBG3Combo->GetSelectedIndex());
461461
if (pItem && !pItem->m_Name.empty())
462462
{
463463
SceneLayer *pNewLayer = dynamic_cast<SceneLayer *>(g_PresetMan.GetEntityPreset("SceneLayer", pItem->m_Name, m_ModuleSpaceID)->Clone());
464-
AAssert(pNewLayer, "No SceneLayer of the name set as BG3 is defined!");
464+
RTEAssert(pNewLayer, "No SceneLayer of the name set as BG3 is defined!");
465465
pNewScene->GetBackLayers().push_back(pNewLayer);
466466
}
467467
@@ -493,7 +493,7 @@ void EditorActivity::Update()
493493
if (g_SceneMan.GetScene())
494494
{
495495
m_ModuleSpaceID = g_SceneMan.GetScene()->GetModuleID();
496-
AAssert(m_ModuleSpaceID >= 0, "Loaded Scene's DataModule ID is negative? Should always be a specific one..");
496+
RTEAssert(m_ModuleSpaceID >= 0, "Loaded Scene's DataModule ID is negative? Should always be a specific one..");
497497
m_pEditorGUI->Destroy();
498498
m_pEditorGUI->Create(&(m_PlayerController[0]), SceneEditorGUI::ONLOADEDIT, m_ModuleSpaceID);
499499
// TODO: Should read in all the already placed objects in the loaded scene and have them appear int he editor instead

‎Activities/EditorActivity.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// Inclusions of header files
1616

1717
#include "GUISound.h"
18-
#include "DDTTools.h"
18+
#include "RTETools.h"
1919
#include "ActivityMan.h"
2020

2121
namespace RTE

‎Activities/GATutorial.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ void GATutorial::Update()
705705
for (int area = 0; area < AREACOUNT; ++area)
706706
{
707707
// Switch if within the trigger box of a new area
708-
if (area != m_CurrentArea && m_TriggerBoxes[area].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
708+
if (area != m_CurrentArea && m_TriggerBoxes[area].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
709709
{
710710
// Change to the new area
711711
m_PrevArea = m_CurrentArea;
@@ -722,7 +722,7 @@ void GATutorial::Update()
722722
{
723723
724724
// Switch if within the trigger box of a new area
725-
if (area != m_CurrentArea && m_TriggerBoxes[area].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
725+
if (area != m_CurrentArea && m_TriggerBoxes[area].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
726726
{
727727
728728
if (m_FightTriggers[stage].Reset();
@@ -843,7 +843,7 @@ void GATutorial::Update()
843843
if (m_pControlledActor[m_TutorialPlayer])
844844
{
845845
// Triggered defending stage
846-
if (m_CurrentFightStage == NOFIGHT && m_FightTriggers[DEFENDING].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
846+
if (m_CurrentFightStage == NOFIGHT && m_FightTriggers[DEFENDING].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
847847
{
848848
// Take over control of screen messages
849849
m_MsgTimer[m_TutorialPlayer].Reset();

0 commit comments

Comments
 (0)