mdiluz/ttrts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename all usages of Team to Player

Browse source 
This was confusingly inconsistent in the codebase.
fixes #7
This commit is contained in:
mdiluzio 2014-12-21 11:04:26 +00:00
parent d4f9470704
commit 9e44d5144b
9 changed files with 98 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

24
source/gen/gen.cpp
View file

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