Skip to content
Snippets Groups Projects
Commit 7fd4f5c6 authored by Bariatti Francesco's avatar Bariatti Francesco
Browse files

Deleted useless penguin refresh in play

parent 6587b42e
No related branches found
No related tags found
No related merge requests found
...@@ -327,9 +327,7 @@ namespace game ...@@ -327,9 +327,7 @@ namespace game
//Move the current penguin //Move the current penguin
move_penguin(p); move_penguin(p);
cout << "Penguin p :" << *p << endl; //Update moves on all penguins of the next player
//Update moves on all penguins
uint64_t obstacles = (~(state.one_fish | state.two_fish | state.three_fish)); uint64_t obstacles = (~(state.one_fish | state.two_fish | state.three_fish));
obstacles |= ((uint64_t) 1) << (state.p1_red & 63); obstacles |= ((uint64_t) 1) << (state.p1_red & 63);
obstacles |= ((uint64_t) 1) << (state.p2_red & 63); obstacles |= ((uint64_t) 1) << (state.p2_red & 63);
...@@ -340,25 +338,41 @@ namespace game ...@@ -340,25 +338,41 @@ namespace game
obstacles |= ((uint64_t) 1) << (state.p3_blue & 63); obstacles |= ((uint64_t) 1) << (state.p3_blue & 63);
obstacles |= ((uint64_t) 1) << (state.p4_blue & 63); obstacles |= ((uint64_t) 1) << (state.p4_blue & 63);
cout << obstacles << endl;
state.nb_moves_red = 0; state.nb_moves_red = 0;
state.nb_moves_blue = 0; state.nb_moves_blue = 0;
state.nb_moves_red += update_moves(&state.p1_red, obstacles);
state.nb_moves_red += update_moves(&state.p2_red, obstacles); if (state.current_player_red) //Red just played
state.nb_moves_red += update_moves(&state.p3_red, obstacles); {
state.nb_moves_red += update_moves(&state.p4_red, obstacles); state.nb_moves_blue += update_moves(&state.p1_blue, obstacles);
state.nb_moves_blue += update_moves(&state.p1_blue, obstacles); state.nb_moves_blue += update_moves(&state.p2_blue, obstacles);
state.nb_moves_blue += update_moves(&state.p2_blue, obstacles); state.nb_moves_blue += update_moves(&state.p3_blue, obstacles);
state.nb_moves_blue += update_moves(&state.p3_blue, obstacles); state.nb_moves_blue += update_moves(&state.p4_blue, obstacles);
state.nb_moves_blue += update_moves(&state.p4_blue, obstacles); if (state.nb_moves_blue == 0) //If Blue can not move we update moves for red
{
//Change player if the other one can play state.nb_moves_red += update_moves(&state.p1_red, obstacles);
if(state.current_player_red && state.nb_moves_blue > 0) state.nb_moves_red += update_moves(&state.p2_red, obstacles);
state.current_player_red = false; state.nb_moves_red += update_moves(&state.p3_red, obstacles);
else if(state.current_player_red == false && state.nb_moves_red > 0) state.nb_moves_red += update_moves(&state.p4_red, obstacles);
state.current_player_red = true; }
else
{ state.current_player_red = false; }
}
else //Blue just played
{
state.nb_moves_red += update_moves(&state.p1_red, obstacles);
state.nb_moves_red += update_moves(&state.p2_red, obstacles);
state.nb_moves_red += update_moves(&state.p3_red, obstacles);
state.nb_moves_red += update_moves(&state.p4_red, obstacles);
if (state.nb_moves_red == 0)
{
state.nb_moves_blue += update_moves(&state.p1_blue, obstacles);
state.nb_moves_blue += update_moves(&state.p2_blue, obstacles);
state.nb_moves_blue += update_moves(&state.p3_blue, obstacles);
state.nb_moves_blue += update_moves(&state.p4_blue, obstacles);
}
else
{ state.current_player_red = true; }
}
} }
string penguin::player_to_string(uint8_t player) const string penguin::player_to_string(uint8_t player) const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment