Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cpp-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Maul
cpp-project
Commits
a2e43865
Commit
a2e43865
authored
5 months ago
by
Frederik
Browse files
Options
Downloads
Patches
Plain Diff
Delete accidental double declaration from merge
parent
dbafae78
No related branches found
No related tags found
1 merge request
!42
Add more Doxygen comments to most of the project
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/game/Level.hpp
+0
-16
0 additions, 16 deletions
src/game/Level.hpp
src/game/Tile.hpp
+3
-7
3 additions, 7 deletions
src/game/Tile.hpp
with
3 additions
and
23 deletions
src/game/Level.hpp
+
0
−
16
View file @
a2e43865
...
@@ -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?
*/
*/
...
...
This diff is collapsed.
Click to expand it.
src/game/Tile.hpp
+
3
−
7
View file @
a2e43865
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment