add another player

game/mod.rs

@@ -1,4 +1,4 @@
-mod player;
+pub mod player;
 mod star;
 mod carrier;
 
@@ -14,9 +14,8 @@ pub struct Game {
 }
 
 impl Game {
-    pub fn addPlayer(&mut self, name: String) {
+    pub fn addPlayer(&mut self, name: String, color: Option<(u8,u8,u8)>, race: Option<player::Race>) {
-        let mut player: Player = Player::default();
+        let player = Player::new(name, color, race);
-        player.name = name;
         self.players.push(player);
     }
 }

game/player.rs

@@ -1,5 +1,5 @@
 #[derive(Debug)]
-enum Race {
+pub enum Race {
     Griffin,
     Catte
 }
@@ -36,7 +36,7 @@ struct Research {
 
 #[derive(Debug)]
 pub struct Player {
-    pub name: String,
+    name: String,
     color: (u8, u8, u8),
     race: Race,
     research: Research
@@ -52,3 +52,14 @@ impl Default for Player {
         }
     }
 }
+
+impl Player {
+    pub fn new(name: String, color: Option<(u8, u8, u8)>, race: Option<Race>) -> Player {
+        Player {
+            name: name,
+            color: color.unwrap_or(Player::default().color),
+            race: race.unwrap_or(Player::default().race),
+            research: Research::default()
+        }
+    }
+}

main.rs

@@ -24,7 +24,8 @@ fn world() -> &'static str {
 fn test() -> String {
     let mut game: Game =  Game::default();
 
-    game.addPlayer("Daniel".to_string());
+    game.addPlayer("Daniel".to_string(), Option::Some((255, 0, 0)), Option::Some(game::player::Race::Catte));
+    game.addPlayer("Torpus".to_string(), Option::Some((0, 255, 0)), Option::Some(game::player::Race::Griffin));
 
-    format!("{:?}", game)
+    format!("{:#?}", game)
 }