From 5b804c6902ff0f76e8e2308ea0c88740d93fe673 Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Mon, 25 Mar 2019 17:56:41 +0300
Subject: [PATCH] [client] add colorize param to PlayerView

---
 src/client/haxe/ru/m/tankz/view/common/PlayerView.hx   | 5 ++++-
 src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx | 1 +
 src/common/haxe/ru/m/tankz/bot/BotControl.hx           | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx b/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx
index 6468701..6a7b4e6 100644
--- a/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx
+++ b/src/client/haxe/ru/m/tankz/view/common/PlayerView.hx
@@ -49,6 +49,7 @@ class TeamSkin implements ISkin<TeamButton> {
 
     public var item_index(default, set):Int;
     public var data(default, set):Array<PlayerState>;
+    public var colorize:Bool;
 
     @:view var label(default, null):LabelView;
     @:view var teams(default, null):DataView<TeamId, ToggleButtonView>;
@@ -102,7 +103,9 @@ class TeamSkin implements ISkin<TeamButton> {
                     case NONE:
                         player = p;
                         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;
                     case _:
                 }
diff --git a/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx b/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx
index 7020dea..c5122b5 100644
--- a/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx
+++ b/src/client/haxe/ru/m/tankz/view/dota/DotaLevelFrame.hx
@@ -26,6 +26,7 @@ import ru.m.tankz.preset.DotaGame;
         var view = new PlayerView();
         view.item_index = index;
         view.data = data;
+        view.colorize = true;
         return view;
     }
 
diff --git a/src/common/haxe/ru/m/tankz/bot/BotControl.hx b/src/common/haxe/ru/m/tankz/bot/BotControl.hx
index 8460eef..dfc9152 100644
--- a/src/common/haxe/ru/m/tankz/bot/BotControl.hx
+++ b/src/common/haxe/ru/m/tankz/bot/BotControl.hx
@@ -12,7 +12,7 @@ class BotControl extends Control {
     private var tank(get, null):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 {