InfernalGames/tankz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[client] add colorize param to PlayerView

Browse Source
This commit is contained in:
shmyga
2019-03-25 17:56:41 +03:00
parent 556cd2f1a9
commit 5b804c6902
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/haxe/ru/m/tankz/view/common/PlayerView.hx
View File

@@ -49,6 +49,7 @@ class TeamSkin implements ISkin<TeamButton> {
public var item_index(default, set):Int; public var item_index(default, set):Int;
public var data(default, set):Array<PlayerState>; public var data(default, set):Array<PlayerState>;
public var colorize:Bool;
@:view var label(default, null):LabelView; @:view var label(default, null):LabelView;
@:view var teams(default, null):DataView<TeamId, ToggleButtonView>; @:view var teams(default, null):DataView<TeamId, ToggleButtonView>;
@@ -102,7 +103,9 @@ class TeamSkin implements ISkin<TeamButton> {
case NONE: case NONE:
player = p; player = p;
player.controller = HUMAN(item_index); player.controller = HUMAN(item_index);
player.color = ColorUtil.multiply(state.config.getTeam(team).color, 1.7); if (colorize) {
player.color = ColorUtil.multiply(state.config.getTeam(team).color, 1.7);
}
break; break;
case _: case _:
} }

1
src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx
View File

@@ -26,6 +26,7 @@ import ru.m.tankz.preset.DotaGame;
var view = new PlayerView(); var view = new PlayerView();
view.item_index = index; view.item_index = index;
view.data = data; view.data = data;
view.colorize = true;
return view; return view;
} }

2
src/common/haxe/ru/m/tankz/bot/BotControl.hx
View File

@@ -12,7 +12,7 @@ class BotControl extends Control {
private var tank(get, null):Tank; private var tank(get, null):Tank;
private inline function get_tank():Tank { private inline function get_tank():Tank {
return cast handler.entities[tankId]; return handler == null ? null : cast handler.entities[tankId];
} }
override public function stop():Void { override public function stop():Void {