Merge GuiRefactoring back into trunk.

Note that this changes ALL the display code to not pass game objects directly into the GUI, so bear that in mind when merging local changes (and in future commits).
This commit is contained in:
elcnesh
2014-09-15 12:12:02 +00:00
266 changed files with 8594 additions and 4891 deletions

View File

@@ -43,8 +43,8 @@ public class LobbyPlayerAi extends LobbyPlayer implements IGameEntitiesFactory {
}
@Override
public Player createIngamePlayer(Game game) {
Player ai = new Player(getName(), game);
public Player createIngamePlayer(Game game, final int id) {
Player ai = new Player(getName(), game, id);
ai.setFirstController(createControllerFor(ai));
if( rotateProfileEachGame ) {