More slots to new sprite #316

griefly · Sep 10, 2018 · e2f3bb8 · e2f3bb8
1 parent ef8a3ff
commit e2f3bb8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/exec/icons/screen1.dmi.json b/exec/icons/screen1.dmi.json
@@ -584,9 +584,24 @@
             "state": "act_hand"
         }, 
         {
-            "dirs": 4, 
+            "dirs": 1, 
+            "frames": 1, 
+            "state": "lhand"
+        }, 
+        {
+            "dirs": 1, 
+            "frames": 1, 
+            "state": "rhand"
+        }, 
+        {
+            "dirs": 1, 
+            "frames": 1, 
+            "state": "hand_3"
+        }, 
+        {
+            "dirs": 1, 
             "frames": 1, 
-            "state": "hand"
+            "state": "hand_4"
         }, 
         {
             "dirs": 1, 

diff --git a/sources/core/objects/mobs/HumanInterface.cpp b/sources/core/objects/mobs/HumanInterface.cpp
@@ -28,8 +28,8 @@ namespace
         const QString LEFT_HAND_ACTIVE = "hand_left";
 
         // Swap indicator states
-        const QString RIGHT_HAND = "hand_right";
-        const QString LEFT_HAND = "hand_left";
+        const QString RIGHT_HAND = "rhand";
+        const QString LEFT_HAND = "lhand";
 
         // Pull indicator states
         const QString NOT_PULL = "pull0";
@@ -147,7 +147,7 @@ kv::HumanInterface::HumanInterface()
     {
         Button drop;
         drop.position = {7, 15};
-        drop.view.SetSprite(OLD_INTERFACE_SPRITE);
+        drop.view.SetSprite(DEFAULT_INTERFACE_SPRITE);
         drop.view.SetState("act_drop");
         drop.name = DROP;
         buttons_.append(drop);
@@ -156,7 +156,7 @@ kv::HumanInterface::HumanInterface()
     {
         Button pull;
         pull.position = {8, 15};
-        pull.view.SetSprite(OLD_INTERFACE_SPRITE);
+        pull.view.SetSprite(DEFAULT_INTERFACE_SPRITE);
         pull.view.SetState(states::NOT_PULL);
         pull.name = STOP_PULL;
         buttons_.append(pull);
@@ -165,7 +165,7 @@ kv::HumanInterface::HumanInterface()
     {
         Button swap;
         swap.position = {6, 15};
-        swap.view.SetSprite(OLD_INTERFACE_SPRITE);
+        swap.view.SetSprite(DEFAULT_INTERFACE_SPRITE);
         swap.view.SetState(states::RIGHT_HAND);
         swap.name = SWAP;
         buttons_.append(swap);