From bff861a677332f900dd3ccad0adbb5b2fd658de0 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 11 Sep 2018 00:19:33 +0300 Subject: [PATCH] Health to new sprite #316 --- exec/icons/screen1.dmi.json | 4 ++-- sources/core/objects/mobs/HumanInterface.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/exec/icons/screen1.dmi.json b/exec/icons/screen1.dmi.json index 45d6c59b..89ddd33f 100644 --- a/exec/icons/screen1.dmi.json +++ b/exec/icons/screen1.dmi.json @@ -63,7 +63,7 @@ { "dirs": 1, "frames": 1, - "state": "health0old" + "state": "health0" }, { "dirs": 1, @@ -456,7 +456,7 @@ { "dirs": 1, "frames": 1, - "state": "health0" + "state": "health0_new" }, { "dirs": 1, diff --git a/sources/core/objects/mobs/HumanInterface.cpp b/sources/core/objects/mobs/HumanInterface.cpp index d568b83a..61fb78e9 100644 --- a/sources/core/objects/mobs/HumanInterface.cpp +++ b/sources/core/objects/mobs/HumanInterface.cpp @@ -174,7 +174,7 @@ kv::HumanInterface::HumanInterface() { Button lay; lay.position = {15, 11}; - lay.view.SetSprite(OLD_INTERFACE_SPRITE); + lay.view.SetSprite(DEFAULT_INTERFACE_SPRITE); lay.view.SetState(states::NOT_LAY); lay.name = LAY; buttons_.append(lay); @@ -183,7 +183,7 @@ kv::HumanInterface::HumanInterface() { Button health; health.position = {15, 10}; - health.view.SetSprite(OLD_INTERFACE_SPRITE); + health.view.SetSprite(DEFAULT_INTERFACE_SPRITE); health.view.SetState("health0"); health.name = HEALTH; buttons_.append(health); @@ -192,7 +192,7 @@ kv::HumanInterface::HumanInterface() { Button oxygen; oxygen.position = {15, 12}; - oxygen.view.SetSprite(OLD_INTERFACE_SPRITE); + oxygen.view.SetSprite(DEFAULT_INTERFACE_SPRITE); oxygen.view.SetState(states::OXYGEN); oxygen.name = OXYGEN; buttons_.append(oxygen);