(e42047dc1) Tester's build, January 30th 2020

2020-01-30 15:56:31 -03:00
parent eaa18a20a3
commit 15499cb704
203 changed files with 8274 additions and 4950 deletions
@@ -260,6 +260,11 @@ namespace Barotrauma
            }
        }

+#if CLIENT
+        private Sprite jobIcon;
+        private Vector2 jobIconPos;
+#endif
+
        private Sprite portraitBackground;
        public Sprite PortraitBackground
        {
@@ -442,6 +447,13 @@ namespace Barotrauma
            CalculateHeadSpriteRange();
            Head.HeadSpriteId = GetRandomHeadID();
            Job = (jobPrefab == null) ? Job.Random(Rand.RandSync.Server) : new Job(jobPrefab, variant);
+#if CLIENT
+            jobIcon = Job.Prefab.Icon;
+            //TODO: fix jobIconPos
+            jobIconPos = new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding);
+            GameMain.Instance.OnResolutionChanged += () => jobIconPos = new Vector2(HUDLayoutSettings.HealthBarAreaLeft.Right, HUDLayoutSettings.HealthBarAreaLeft.Y - HUDLayoutSettings.Padding);
+#endif
+
            if (!string.IsNullOrEmpty(name))
            {
                Name = name;