summaryrefslogtreecommitdiff
path: root/src/helper.hpp
diff options
context:
space:
mode:
authorSteph Enders <smenders@gmail.com>2023-02-26 10:43:21 -0500
committerSteph Enders <smenders@gmail.com>2023-02-26 10:43:21 -0500
commit975055e40938730cb09d151ba17bf8defd3b4adf (patch)
treec5a6051ceb45a1351428f79c22e28e61d8a0bf6a /src/helper.hpp
parent0bf89ad39d4c3659f3164639e4fbe7ca074fa04a (diff)
Code quality and improvements
I genuinely cannot remember what I was doing here, as I never committed it. But basically - it looks like I used my IDE and fixed warnings and improved some code blocks / references
Diffstat (limited to 'src/helper.hpp')
-rw-r--r--src/helper.hpp35
1 files changed, 11 insertions, 24 deletions
diff --git a/src/helper.hpp b/src/helper.hpp
index e13ee5e..6fef4b6 100644
--- a/src/helper.hpp
+++ b/src/helper.hpp
@@ -66,7 +66,6 @@ struct board_t
struct player_t
{
- int pid;
int score;
std::shared_ptr<std::vector<struct piece_t>> pieces;
};
@@ -82,13 +81,10 @@ std::shared_ptr<std::vector<sf::Texture>>
loadTextures(const char* path);
std::shared_ptr<std::vector<struct board_t>>
-createBoard(std::shared_ptr<std::vector<sf::Texture>> textures);
-
-sf::Font
-loadFont();
+createBoard(const std::shared_ptr<std::vector<sf::Texture>>& textures);
std::shared_ptr<struct player_t>
-createPlayer(const int pid, sf::Texture& pieceTexture);
+createPlayer(int pid, sf::Texture& pieceTexture);
std::shared_ptr<struct piece_t>
createPiece(int id, sf::Texture& texture);
@@ -100,32 +96,23 @@ std::shared_ptr<std::vector<sf::Sprite>>
createRollSprites(sf::Texture& t1, sf::Texture& t2);
std::shared_ptr<std::vector<sf::Sprite>>
-createPassSprites(std::shared_ptr<std::vector<sf::Texture>> textures);
+createPassSprites(const std::shared_ptr<std::vector<sf::Texture>>& textures);
std::shared_ptr<std::vector<sf::Sprite>>
createWinSprites(int player_id,
- std::shared_ptr<std::vector<sf::Texture>> textures);
+ const std::shared_ptr<std::vector<sf::Texture>>& textures);
std::shared_ptr<std::vector<sf::Sprite>>
-createStartSprites(std::shared_ptr<std::vector<sf::Texture>> textures);
+createStartSprites(const std::shared_ptr<std::vector<sf::Texture>>& textures);
void
makeNum(sf::Sprite* sprite_ptr,
int num,
- std::shared_ptr<std::vector<sf::Texture>> textures);
-
-bool
-clickedPiece(sf::Vector2i mousePosition, std::shared_ptr<struct piece_t> piece);
-
-bool
-canMovePiece(std::shared_ptr<struct piece_t> piece,
- int roll,
- std::shared_ptr<std::vector<struct piece_t>> myPieces,
- std::shared_ptr<std::vector<struct piece_t>> enemyPieces);
+ const std::shared_ptr<std::vector<sf::Texture>>& textures);
bool
-hasMoves(std::shared_ptr<struct player_t> activePlayer,
- std::shared_ptr<struct player_t> opponent,
+hasMoves(const std::shared_ptr<struct player_t>& activePlayer,
+ const std::shared_ptr<struct player_t>& opponent,
int roll);
sf::Vector2f
@@ -134,9 +121,9 @@ pos(float c, float r);
bool
canPlace(struct piece_t* piece,
int turn_pid,
- struct board_t board_tile,
- std::shared_ptr<std::vector<struct piece_t>> myPieces,
- std::shared_ptr<std::vector<struct piece_t>> opponentPieces,
+ const struct board_t& board_tile,
+ const std::shared_ptr<std::vector<struct piece_t>>& myPieces,
+ const std::shared_ptr<std::vector<struct piece_t>>& opponentPieces,
int& takenPieceId);
void