Skip to content

Commit 7eb712a

Browse files
committed
Replace RTEList with std::list and remove "global_types.h"
This is my guess what the code should've been
1 parent f954683 commit 7eb712a

File tree

5 files changed

+9
-15
lines changed

5 files changed

+9
-15
lines changed

Entities/SchemeEditor.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -772,11 +772,11 @@ void SchemeEditor::UpdateLoadDialog()
772772
m_pLoadNameCombo->ClearList();
773773

774774
// Get the list of all read in scenes
775-
RTEList<Entity *> sceneList;
775+
list<Entity *> sceneList;
776776
g_PresetMan.GetAllOfType(sceneList, "Scene");
777777

778778
// Go through the list and add their names to the combo box
779-
for (RTEList<Entity *>::iterator itr = sceneList.begin(); itr != sceneList.end(); ++itr)
779+
for (list<Entity *>::iterator itr = sceneList.begin(); itr != sceneList.end(); ++itr)
780780
{
781781
// Don't add the special "Editor Scene", users shouldn't be messing with it
782782
if ((*itr)->GetPresetName() != "Editor Scene")
@@ -840,4 +840,4 @@ void SchemeEditor::UpdateOverwriteDialog()
840840
m_pOverwriteNameLabel->SetText(g_PresetMan.GetDataModule(m_ModuleSpaceID)->GetFileName() + "/Scenes/" + g_SceneMan.GetScene()->GetPresetName());
841841
}
842842

843-
} // namespace RTE
843+
} // namespace RTE

Entities/SchemeEditor.h

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

17-
#include "global_types.h"
18-
1917
#include <string>
2018
#include <deque>
2119

@@ -354,4 +352,4 @@ ENTITYALLOCATION(SchemeEditor)
354352

355353
} // namespace RTE
356354

357-
#endif // File
355+
#endif // File

Managers/ThreadMan.h

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

17-
#include "global_types.h"
18-
1917

2018
#include <string>
2119
#include <deque>
@@ -141,4 +139,4 @@ class ThreadMan:
141139

142140
} // namespace RTE
143141

144-
#endif // File
142+
#endif // File

Menus/SchemeEditorGUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ void SchemeEditorGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const
740740
return;
741741

742742
// The get a list of the currently edited set of placed objects in the Scene
743-
const RTEList<SceneObject *> *pSceneObjectList = 0;
743+
const list<SceneObject *> *pSceneObjectList = 0;
744744
if (m_FeatureSet == ONLOADEDIT)
745745
pSceneObjectList = g_SceneMan.GetScene()->GetPlacedObjects(Scene::PLACEONLOAD);
746746

@@ -751,7 +751,7 @@ void SchemeEditorGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const
751751
int i = 0;
752752
Actor *pActor = 0;
753753
// HeldDevice *pDevice = 0;
754-
for (RTEList<SceneObject *>::const_iterator itr = pSceneObjectList->begin(); itr != pSceneObjectList->end(); ++itr, ++i)
754+
for (list<SceneObject *>::const_iterator itr = pSceneObjectList->begin(); itr != pSceneObjectList->end(); ++itr, ++i)
755755
{
756756
// Draw the currently held object into the order of the list if it is to be placed inside
757757
if (m_pCurrentObject && m_DrawCurrentObject && i == m_ObjectListOrder)

Menus/SchemeEditorGUI.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
//////////////////////////////////////////////////////////////////////////////////////////
1515
// Inclusions of header files
1616

17-
#include "global_types.h"
18-
1917
//#include "FrameMan.h"
2018
#include "Sound.h"
2119
#include "Timer.h"
@@ -329,7 +327,7 @@ class SchemeEditorGUI {
329327
// Currently placed scene object to make blink when drawing it. NOT OWNED.
330328
const SceneObject *m_pObjectToBlink;
331329
// Path found between brain pos and the sky to make sure fair brain placement
332-
RTEList<Vector> m_BrainSkyPath;
330+
std::list<Vector> m_BrainSkyPath;
333331
// Sound for enabling and disabling menu
334332
Sound m_EnterMenuSound;
335333
Sound m_ExitMenuSound;
@@ -375,4 +373,4 @@ class SchemeEditorGUI {
375373

376374
} // namespace RTE
377375

378-
#endif // File
376+
#endif // File

0 commit comments

Comments
 (0)