diff -r 4feced261c68 -r de822cd3df3a project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/LocalRoomStateManager.java --- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/LocalRoomStateManager.java Tue Jan 21 22:38:13 2014 +0100 +++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/LocalRoomStateManager.java Tue Jan 21 22:43:06 2014 +0100 @@ -35,80 +35,80 @@ * state. */ public class LocalRoomStateManager extends BasicRoomState { - private static final String TAG = LocalRoomStateManager.class.getSimpleName(); + private static final String TAG = LocalRoomStateManager.class.getSimpleName(); - public LocalRoomStateManager(Scheme defaultScheme, Weaponset defaultWeaponset) { - setChief(true); - setGameStyle(GameConfig.DEFAULT_STYLE); - setMapRecipe(MapRecipe.makeRandomMap(0, MapRecipe.makeRandomSeed(), GameConfig.DEFAULT_THEME)); - setScheme(defaultScheme); - setWeaponset(defaultWeaponset); - } - - public void changeMapRecipe(MapRecipe map) { - setMapRecipe(map); - } + public LocalRoomStateManager(Scheme defaultScheme, Weaponset defaultWeaponset) { + setChief(true); + setGameStyle(GameConfig.DEFAULT_STYLE); + setMapRecipe(MapRecipe.makeRandomMap(0, MapRecipe.makeRandomSeed(), GameConfig.DEFAULT_THEME)); + setScheme(defaultScheme); + setWeaponset(defaultWeaponset); + } - public void changeMapTheme(String theme) { - setMapRecipe(getMapRecipe().withTheme(theme)); - } + public void changeMapRecipe(MapRecipe map) { + setMapRecipe(map); + } + + public void changeMapTheme(String theme) { + setMapRecipe(getMapRecipe().withTheme(theme)); + } - public void changeMapNameAndGenerator(String mapName) { - int newGenerator = MapRecipe.generatorForMapname(mapName); - setMapRecipe(getMapRecipe().withName(mapName).withMapgen(newGenerator)); - } + public void changeMapNameAndGenerator(String mapName) { + int newGenerator = MapRecipe.generatorForMapname(mapName); + setMapRecipe(getMapRecipe().withName(mapName).withMapgen(newGenerator)); + } - public void changeMapTemplate(int template) { - setMapRecipe(getMapRecipe().withTemplateFilter(template)); - } + public void changeMapTemplate(int template) { + setMapRecipe(getMapRecipe().withTemplateFilter(template)); + } - public void changeMazeSize(int mazeSize) { - setMapRecipe(getMapRecipe().withMazeSize(mazeSize)); - } + public void changeMazeSize(int mazeSize) { + setMapRecipe(getMapRecipe().withMazeSize(mazeSize)); + } - public void changeMapSeed(String seed) { - setMapRecipe(getMapRecipe().withSeed(seed)); - } + public void changeMapSeed(String seed) { + setMapRecipe(getMapRecipe().withSeed(seed)); + } - public void changeMapDrawdata(byte[] drawdata) { - setMapRecipe(getMapRecipe().withDrawData(drawdata)); - } + public void changeMapDrawdata(byte[] drawdata) { + setMapRecipe(getMapRecipe().withDrawData(drawdata)); + } - public void changeScheme(Scheme scheme) { - setScheme(scheme); - } + public void changeScheme(Scheme scheme) { + setScheme(scheme); + } - public void changeGameStyle(String style) { - setGameStyle(style); - } + public void changeGameStyle(String style) { + setGameStyle(style); + } - public void changeWeaponset(Weaponset weaponset) { - setWeaponset(weaponset); - } + public void changeWeaponset(Weaponset weaponset) { + setWeaponset(weaponset); + } - public void requestAddTeam(Team team, int colorIndex) { - putTeam(new TeamInGame(team, new TeamIngameAttributes("Player", colorIndex, TeamIngameAttributes.DEFAULT_HOG_COUNT, false))); - } + public void requestAddTeam(Team team, int colorIndex) { + putTeam(new TeamInGame(team, new TeamIngameAttributes("Player", colorIndex, TeamIngameAttributes.DEFAULT_HOG_COUNT, false))); + } - public void requestRemoveTeam(String teamname) { - removeTeam(teamname); - } + public void requestRemoveTeam(String teamname) { + removeTeam(teamname); + } - public void changeTeamColorIndex(String teamname, int colorIndex) { - TeamInGame oldTeam = getTeams().get(teamname); - if(oldTeam != null) { - putTeam(oldTeam.withAttribs(oldTeam.ingameAttribs.withColorIndex(colorIndex))); - } else { - Log.e(TAG, "Requested color change for unknown team "+ teamname); - } - } + public void changeTeamColorIndex(String teamname, int colorIndex) { + TeamInGame oldTeam = getTeams().get(teamname); + if(oldTeam != null) { + putTeam(oldTeam.withAttribs(oldTeam.ingameAttribs.withColorIndex(colorIndex))); + } else { + Log.e(TAG, "Requested color change for unknown team "+ teamname); + } + } - public void changeTeamHogCount(String teamname, int hogcount) { - TeamInGame oldTeam = getTeams().get(teamname); - if(oldTeam != null) { - putTeam(oldTeam.withAttribs(oldTeam.ingameAttribs.withHogCount(hogcount))); - } else { - Log.e(TAG, "Requested hog count change for unknown team "+ teamname); - } - } + public void changeTeamHogCount(String teamname, int hogcount) { + TeamInGame oldTeam = getTeams().get(teamname); + if(oldTeam != null) { + putTeam(oldTeam.withAttribs(oldTeam.ingameAttribs.withHogCount(hogcount))); + } else { + Log.e(TAG, "Requested hog count change for unknown team "+ teamname); + } + } }