dadada/Bob
dadada/Bob
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added surrendering.

Browse source 
Fixed an issue concerning the box of the UpgradeBox.
This commit is contained in:
Tim Schubert 2016-01-30 03:58:53 +01:00
parent 63d4e42b80
commit 230408e2fc
6 changed files with 129 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/Bob.cpp
View file

@ -205,18 +205,7 @@ void Game::command(std::string input)
{
if (this->started)
{
Player *last_player = Player::current_player;
this->turn = (this->turn + 1) % players.size();
Player::current_player = players[turn];
if (this->turn == 0)
{
trigger_event(BOB_NEXTTURNEVENT, 0, (void *) last_player, (void *) Player::current_player);
trigger_event(BOB_NEXTROUNDEVENT, 0, (void *) last_player, (void *) Player::current_player);
}
else
{
trigger_event(BOB_NEXTTURNEVENT, 0, (void *) last_player, (void *) Player::current_player);
}
this->next_turn();
prompt << "Next player is: " << (Player::current_player)->get_name();
}
else
@ -226,7 +215,17 @@ void Game::command(std::string input)
}
else if (input == "surrender")
{
//Player::current_player->surrender();
this->grid->surrender(Player::current_player);
prompt << "Player " << Player::current_player->get_name() << " surrendered!\n";
for (int i = 0; i < this->players.size(); i++)
{
if (this->players[i] == Player::current_player)
{
delete this->players[i];
this->players.erase(this->players.begin() + i);
}
}
this->next_turn();
}
else if (input.substr(0, 10) == "add player")
{
@ -278,6 +277,32 @@ void Game::start()
trigger_event(BOB_NEXTTURNEVENT, 0, nullptr, (void *) Player::current_player);
}
void Game::next_turn()
{
if (!this->players.empty())
{
Player *last_player = Player::current_player;
this->turn = (this->turn + 1) % players.size();
Player::current_player = players[turn];
if (this->turn == 0)
{
trigger_event(BOB_NEXTTURNEVENT, 0, (void *) last_player, (void *) Player::current_player);
trigger_event(BOB_NEXTROUNDEVENT, 0, (void *) last_player, (void *) Player::current_player);
}
else
{
trigger_event(BOB_NEXTTURNEVENT, 0, (void *) last_player, (void *) Player::current_player);
}
}
else
{
Player *def = new Player();
Player::current_player = def;
this->players.push_back(def);
this->started = false;
}
}
int Game::game_loop()
{
this->frame_timer->start_timer();