let chest and leg armor override humanoid config values

1 files changed, 4 insertions, 1 deletions

diff --git a/source/game/StarHumanoid.hpp b/source/game/StarHumanoid.hpp
index d43c5ef..d11de1d 100644
--- a/source/game/StarHumanoid.hpp
+++ b/source/game/StarHumanoid.hpp
@@ -127,7 +127,7 @@ public:
   void setIdentity(HumanoidIdentity const& identity);
   HumanoidIdentity const& identity() const;
 
-  void loadConfig(Json const& config);
+  void loadConfig(Json merger = JsonObject());
 
   // All of the image identifiers here are meant to be image *base* names, with
   // a collection of frames specific to each piece.  If an image is set to
@@ -308,6 +308,9 @@ private:
 
   Maybe<DancePtr> getDance() const;
 
+  Json m_baseConfig;
+  Json m_mergeConfig;
+
   Vec2F m_globalOffset;
   Vec2F m_headRunOffset;
   Vec2F m_headSwimOffset;