Player -> player_t

This commit is contained in:
mdiluzio 2014-12-21 11:14:01 +00:00
parent 9e44d5144b
commit 83020d9120
8 changed files with 49 additions and 49 deletions

View file

@ -3,7 +3,7 @@
#include <iostream>
#include <fstream>
void AddUnitToGame( Player player, char vis, uvector2 vec, CTTRTSGame& game )
void AddUnitToGame( player_t player, char vis, uvector2 vec, CTTRTSGame& game )
{
CUnit unit = CUnit::GetUnitFromVis(vis);
unit.SetPos(vec);
@ -28,10 +28,10 @@ int main()
CTTRTSGame game(6, 6);
game.SetName("Tiny2v2");
AddUnitToGame( Player::Red, '<', uvector2(4, 2), game);
AddUnitToGame( Player::Red, '<', uvector2(4, 4), game);
AddUnitToGame( Player::Green, '>', uvector2(1, 1), game);
AddUnitToGame( Player::Green, '>', uvector2(1, 3), game);
AddUnitToGame( player_t::Red, '<', uvector2(4, 2), game);
AddUnitToGame( player_t::Red, '<', uvector2(4, 4), game);
AddUnitToGame( player_t::Green, '>', uvector2(1, 1), game);
AddUnitToGame( player_t::Green, '>', uvector2(1, 3), game);
OutputGame(std::move(game));
}
@ -42,9 +42,9 @@ int main()
game.SetName("Big2v2");
for ( ucoord_t y : { 2,4,6,8,10 } )
AddUnitToGame( Player::Red, '<', uvector2(18, y), game);
AddUnitToGame( player_t::Red, '<', uvector2(18, y), game);
for ( ucoord_t y : { 1,3,5,7,9 } )
AddUnitToGame( Player::Green, '>', uvector2(1, y), game);
AddUnitToGame( player_t::Green, '>', uvector2(1, y), game);
OutputGame(std::move(game));
@ -56,13 +56,13 @@ int main()
game.SetName("Chess");
for ( ucoord_t y : { 1,3,5,7 } ) {
AddUnitToGame(Player::Red, '<', uvector2(6, y), game);
AddUnitToGame(Player::Red, '<', uvector2(7, y), game);
AddUnitToGame(player_t::Red, '<', uvector2(6, y), game);
AddUnitToGame(player_t::Red, '<', uvector2(7, y), game);
}
for ( ucoord_t y : { 0,2,4,6 } ) {
AddUnitToGame(Player::Green, '>', uvector2(0, y), game);
AddUnitToGame(Player::Green, '>', uvector2(1, y), game);
AddUnitToGame(player_t::Green, '>', uvector2(0, y), game);
AddUnitToGame(player_t::Green, '>', uvector2(1, y), game);
}
OutputGame(std::move(game));