Skip to content

Replace RTEList with std::list and remove "global_types.h" #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janisozaur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replace RTEList with std::list and remove "global_types.h" #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Entities/SchemeEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,11 +772,11 @@ void SchemeEditor::UpdateLoadDialog()
m_pLoadNameCombo->ClearList();

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

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

} // namespace RTE
} // namespace RTE
4 changes: 1 addition & 3 deletions Entities/SchemeEditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
//////////////////////////////////////////////////////////////////////////////////////////
// Inclusions of header files

#include "global_types.h"

#include <string>
#include <deque>

Expand Down Expand Up @@ -354,4 +352,4 @@ ENTITYALLOCATION(SchemeEditor)

} // namespace RTE

#endif // File
#endif // File
4 changes: 1 addition & 3 deletions Managers/ThreadMan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
//////////////////////////////////////////////////////////////////////////////////////////
// Inclusions of header files

#include "global_types.h"


#include <string>
#include <deque>
Expand Down Expand Up @@ -141,4 +139,4 @@ class ThreadMan:

} // namespace RTE

#endif // File
#endif // File
4 changes: 2 additions & 2 deletions Menus/SchemeEditorGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ void SchemeEditorGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const
return;

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

Expand All @@ -751,7 +751,7 @@ void SchemeEditorGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const
int i = 0;
Actor *pActor = 0;
// HeldDevice *pDevice = 0;
for (RTEList<SceneObject *>::const_iterator itr = pSceneObjectList->begin(); itr != pSceneObjectList->end(); ++itr, ++i)
for (list<SceneObject *>::const_iterator itr = pSceneObjectList->begin(); itr != pSceneObjectList->end(); ++itr, ++i)
{
// Draw the currently held object into the order of the list if it is to be placed inside
if (m_pCurrentObject && m_DrawCurrentObject && i == m_ObjectListOrder)
Expand Down
6 changes: 2 additions & 4 deletions Menus/SchemeEditorGUI.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
//////////////////////////////////////////////////////////////////////////////////////////
// Inclusions of header files

#include "global_types.h"

//#include "FrameMan.h"
#include "Sound.h"
#include "Timer.h"
Expand Down Expand Up @@ -329,7 +327,7 @@ class SchemeEditorGUI {
// Currently placed scene object to make blink when drawing it. NOT OWNED.
const SceneObject *m_pObjectToBlink;
// Path found between brain pos and the sky to make sure fair brain placement
RTEList<Vector> m_BrainSkyPath;
std::list<Vector> m_BrainSkyPath;
// Sound for enabling and disabling menu
Sound m_EnterMenuSound;
Sound m_ExitMenuSound;
Expand Down Expand Up @@ -375,4 +373,4 @@ class SchemeEditorGUI {

} // namespace RTE

#endif // File
#endif // File