Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/SZXC-WG/LocalGen-new
Browse files Browse the repository at this point in the history
  • Loading branch information
GoodCoder666 committed Dec 14, 2024
2 parents 82f592c + f3c988c commit 03448a2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ SpacesInLineCommentPrefix:
Maximum: -1
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: c++14
Standard: c++17
TabWidth: 4
UseTab: Never
---
Expand Down
4 changes: 2 additions & 2 deletions drafts/board.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/// Game map board. Zoomable.
/// The %Board is a complex thing. Many systems are part of it (e.g. vision system).
class Board {
private:
protected:
pos_t row, col;
std::vector<std::vector<Tile>> tiles;

Expand Down Expand Up @@ -79,5 +79,5 @@ class Board {
}
};

/// Declare Alias for convenience.
/// Declare alias for convenience.
using BoardView = Board::BoardView;
3 changes: 1 addition & 2 deletions drafts/coord.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@

using pos_t = int32_t;

/// @brief Struct for Coordinates, %Coord.
///
/// Struct for Coordinates, %Coord.
/// Avoid using `COORD` as windows.h defines it.
struct Coord {
pos_t x, y;
Expand Down
5 changes: 3 additions & 2 deletions drafts/tile.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,12 @@ struct TileView {
Player* occupier;
tile_type_e type;
army_t army;
/// Light has no importance in game, and will not be displayed.
/// Light has no importance in game, and will not be given.
// bool light;

TileView() {}
TileView(const Tile& tile, bool vis) :
/// Constructor using a %Tile and its visibility.
TileView(const Tile& tile, const bool& vis) :
visible(vis) {
if(vis) {
occupier = tile.occupier;
Expand Down

0 comments on commit 03448a2

Please sign in to comment.