Skip to content

Update game/worm to fit the game Worm #4

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

Merged
nircoe merged 2 commits into from
Apr 12, 2025
Merged

Update game/worm to fit the game Worm #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
546245b
Update game/worm to fit the game Worm
nircoe Apr 5, 2025
cd115f5
Update tests and set CI for game/* branches
nircoe Apr 12, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/ci-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Linux

on:
push:
branches: [ main ]
branches: [ main, 'game/*' ]
pull_request:
branches: [ main ]
branches: [ main, 'game/*' ]

jobs:
build-and-test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: macOS

on:
push:
branches: [ main ]
branches: [ main, 'game/*' ]
pull_request:
branches: [ main ]
branches: [ main, 'game/*' ]

jobs:
build-and-test:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Windows

on:
push:
branches: [ main ]
branches: [ main, 'game/*' ]
pull_request:
branches: [ main ]
branches: [ main, 'game/*' ]

jobs:
build-and-test:
Expand Down
8 changes: 4 additions & 4 deletions include/datacoe/game_data.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ namespace datacoe
class GameData
{
std::string m_nickname;
std::array<int, 4> m_highscores;
std::array<std::size_t, 4> m_highscores;

public:
GameData(const std::string& nickname = "", const std::array<int, 4>& highscores = {0});
GameData(const std::string &nickname = "", const std::array<std::size_t, 4> &highscores = {0});

void setNickname(const std::string& nickname);
void setHighscores(const std::array<int, 4>& highscores);
void setHighscores(const std::array<std::size_t, 4> &highscores);

const std::string& getNickname() const;
const std::array<int, 4>& getHighscores() const;
const std::array<std::size_t, 4> &getHighscores() const;

json toJson() const;

Expand Down
10 changes: 5 additions & 5 deletions src/game_data.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

namespace datacoe
{
GameData::GameData(const std::string &nickname, const std::array<int, 4>& highscores) : m_nickname(nickname), m_highscores(highscores) {}
GameData::GameData(const std::string &nickname, const std::array<std::size_t, 4> &highscores) : m_nickname(nickname), m_highscores(highscores) {}

void GameData::setNickname(const std::string &nickname) { m_nickname = nickname; }

void GameData::setHighscores(const std::array<int, 4> &highscores) { m_highscores = highscores; }
void GameData::setHighscores(const std::array<std::size_t, 4> &highscores) { m_highscores = highscores; }

const std::string &GameData::getNickname() const { return m_nickname; }

const std::array<int, 4> &GameData::getHighscores() const { return m_highscores; }
const std::array<std::size_t, 4> &GameData::getHighscores() const { return m_highscores; }

json GameData::toJson() const
{
Expand All @@ -24,7 +24,7 @@ namespace datacoe
GameData GameData::fromJson(const json &j)
{
std::string nickname;
std::array<int, 4> highscores;
std::array<std::size_t, 4> highscores;
if (j.contains("nickname") && j["nickname"].is_string())
{
try { nickname = j["nickname"].get<std::string>(); }
Expand All @@ -35,7 +35,7 @@ namespace datacoe

if (j.contains("highscores") && j["highscores"].is_array() && j["highscores"].size() == 4)
{
try { highscores = j["highscore"].get<std::array<int, 4>>(); }
try { highscores = j["highscores"].get<std::array<std::size_t, 4>>(); }
catch (const json::exception &) { throw; }
}
else
Expand Down
Loading
Loading