Added initial action property to LitObject

Author: Semphris

src/object/lit_object.cpp

@@ -27,6 +27,8 @@ LitObject::LitObject(const ReaderMapping& reader) :
   m_light_offset(-6.f, -17.f),
   m_sprite_name("images/objects/lightflower/lightflower1.sprite"),
   m_light_sprite_name("images/objects/lightflower/light/glow_light.sprite"),
+  m_sprite_action("default"),
+  m_light_sprite_action("default"),
   m_sprite(),
   m_light_sprite(),
   m_layer(0),
@@ -42,6 +44,9 @@ LitObject::LitObject(const ReaderMapping& reader) :
   reader.get("light-sprite", m_light_sprite_name);
   reader.get("layer", m_layer, 0);
 
+  reader.get("action", m_sprite_action);
+  reader.get("light-action", m_light_sprite_action);
+
   std::vector<float> vColor;
   if (!reader.get("color", vColor)) vColor = { 1.f, 1.f, 1.f };
 
@@ -52,6 +57,9 @@ LitObject::LitObject(const ReaderMapping& reader) :
   m_light_sprite = SpriteManager::current()->create(m_light_sprite_name);
   m_light_sprite->set_blend(Blend::ADD);
 
+  m_sprite->set_action(m_sprite_action);
+  m_light_sprite->set_action(m_light_sprite_action);
+
   m_col.m_bbox.set_size(static_cast<float>(m_sprite->get_width()),
                         static_cast<float>(m_sprite->get_height()));
 }
@@ -73,10 +81,13 @@ LitObject::get_settings()
 {
   ObjectSettings result = MovingObject::get_settings();
 
-  result.add_sprite(_("Sprite"), &m_sprite_name, "sprite", std::string("images/objects/torch/torch1.sprite"));
-  result.add_sprite(_("Light sprite"), &m_light_sprite_name, "light-sprite", std::string("images/objects/torch/torch1.sprite"));
+  result.add_sprite(_("Sprite"), &m_sprite_name, "sprite", std::string("images/objects/lightflower/lightflower1.sprite"));
+  result.add_sprite(_("Light sprite"), &m_light_sprite_name, "light-sprite", std::string("images/objects/lightflower/light/glow_light.sprite"));
   result.add_int(_("Layer"), &m_layer, "layer", 0);
 
+  result.add_text(_("Sprite starting action"), &m_sprite_action, "action", std::string("default"));
+  result.add_text(_("Light sprite starting action"), &m_light_sprite_action, "light-action", std::string("default"));
+
   result.add_float(_("Light sprite offset X"), &m_light_offset.x, "light-offset-x");
   result.add_float(_("Light sprite offset Y"), &m_light_offset.y, "light-offset-y");
 
@@ -90,6 +101,9 @@ LitObject::after_editor_set()
   m_light_sprite = SpriteManager::current()->create(m_light_sprite_name);
   m_light_sprite->set_blend(Blend::ADD);
 
+  m_sprite->set_action(m_sprite_action);
+  m_light_sprite->set_action(m_light_sprite_action);
+
   m_col.m_bbox.set_size(static_cast<float>(m_sprite->get_width()),
                         static_cast<float>(m_sprite->get_height()));
 }

src/object/lit_object.hpp

@@ -57,6 +57,8 @@ class LitObject final :
   Vector m_light_offset;
   std::string m_sprite_name;
   std::string m_light_sprite_name;
+  std::string m_sprite_action;
+  std::string m_light_sprite_action;
   SpritePtr m_sprite;
   SpritePtr m_light_sprite;
   int m_layer;