Skip to content
Snippets Groups Projects
Commit a2e43865 authored by Frederik's avatar Frederik
Browse files

Delete accidental double declaration from merge

parent dbafae78
No related branches found
No related tags found
1 merge request!42Add more Doxygen comments to most of the project
...@@ -236,22 +236,6 @@ class Level : public Scene ...@@ -236,22 +236,6 @@ class Level : public Scene
int m_id; int m_id;
LevelState m_state; // Current level state LevelState m_state; // Current level state
std::unordered_map<int, Unit> m_units; /* the units of the level
mapped to their uniqie ids*/
std::unordered_map<int, Effect> m_effects; /* the effects of the level
mapped to their unique ids*/
std::queue<Player> m_turnQ; /* The queue of players,
the player at the front is currently active*/
int m_selectedUnit; // The unique id of the currently selected unit
int m_selectedBuilding; // The unqique id of the currently selected building
ContextMenu m_contextMenu; // The context menu
RecruitingMenu m_recruitingMenu; // The recruiting menu
int m_id; // TODO add comment
LevelState m_state; // The current state of the level
/** /**
* TODO subject to remove? * TODO subject to remove?
*/ */
......
...@@ -27,10 +27,6 @@ class Tile ...@@ -27,10 +27,6 @@ class Tile
*/ */
Tile(TileId id, int x, int y); Tile(TileId id, int x, int y);
TileId m_id; // This tiles type
int m_x; // This tiles x-position
int m_y; // This tiles y-position
/** /**
* Renders the tile * Renders the tile
* *
...@@ -41,9 +37,9 @@ class Tile ...@@ -41,9 +37,9 @@ class Tile
TileId getType() const; TileId getType() const;
private: private:
TileId m_id; TileId m_id; // This tiles type
int m_x; int m_x; // This tiles x-position
int m_y; int m_y; // This tiles y-position
}; };
} // namespace advanced_wars } // namespace advanced_wars
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment