diff --git a/package.json b/package.json index 50c88a9..983694f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tankz", - "version": "0.13.0", + "version": "0.13.1", "private": true, "devDependencies": { "dateformat": "^3.0.3", diff --git a/src/common/haxe/ru/m/tankz/config/Config.hx b/src/common/haxe/ru/m/tankz/config/Config.hx index bddf56b..ea6a936 100644 --- a/src/common/haxe/ru/m/tankz/config/Config.hx +++ b/src/common/haxe/ru/m/tankz/config/Config.hx @@ -75,7 +75,7 @@ typedef PlayerConfig = { @:optional var bonus:Float; @:optional var protect:Float; @:optional var life:Int; - @:optional var color:Color; + @:optional var color:Null; @:optional var control:String; } @@ -89,7 +89,7 @@ typedef TeamConfig = { @:optional var eagle:EagleConfig; @:optional var life:Int; @:optional var spawnInterval:Int; - @:optional var color:Color; + @:optional var color:Null; } typedef GamePreset = { @@ -108,7 +108,7 @@ typedef LevelConfig = { typedef PlayerControl = { var playerId:PlayerId; var control:String; - @:optional var color:Color; + @:optional var color:Null; } typedef ControlPreset = { @@ -235,7 +235,7 @@ class Config { public function getColor(playerId:PlayerId):Color { var player = getPlayer(playerId); - if (player != null && !player.color.zero) { + if (player != null && player.color != null) { return player.color; } var team = getTeam(playerId.team); diff --git a/src/common/haxe/ru/m/tankz/game/EntityBuilder.hx b/src/common/haxe/ru/m/tankz/game/EntityBuilder.hx index aff5b0a..904fe8f 100644 --- a/src/common/haxe/ru/m/tankz/game/EntityBuilder.hx +++ b/src/common/haxe/ru/m/tankz/game/EntityBuilder.hx @@ -44,11 +44,11 @@ class EntityBuilder { return eagle; } - public function buildTank(point:EntityPoint, playerId:PlayerId, type:TankType, color:Color, bonusOff:Bool = false):Tank { + public function buildTank(point:EntityPoint, playerId:PlayerId, type:TankType, color:Null, bonusOff:Bool = false):Tank { var playerConfig = config.getPlayer(playerId); var tankConfig = config.getTank(type); var tank = new Tank(++entityId, buildRect(point, tankConfig.width, tankConfig.height), playerId, tankConfig); - tank.color = color.zero ? config.getColor(playerId) : color; + tank.color = color == null ? config.getColor(playerId) : color; if (!bonusOff) { tank.bonus = Math.random() < playerConfig.bonus; } diff --git a/src/common/haxe/ru/m/tankz/game/Game.hx b/src/common/haxe/ru/m/tankz/game/Game.hx index 8201a71..4bf14f6 100644 --- a/src/common/haxe/ru/m/tankz/game/Game.hx +++ b/src/common/haxe/ru/m/tankz/game/Game.hx @@ -86,7 +86,7 @@ import ru.m.tankz.Type; for (team in teams.iterator()) { for (player in team.players.iterator()) { var playerControl = controlsById.get(player.id); - if (playerControl != null && !playerControl.color.zero) { + if (playerControl != null && playerControl.color != null) { player.state.color = playerControl.color; } var controlType:Controller = AController.fromString(playerControl != null ? playerControl.control : player.config.control);