Tuning: fixed flares not loading material in addonpart ZIP.

Of course I could't get it right the first time.

The mechanism I added is the same thing that props and flexbodies already use. Search fulltext for `*_rg_override`.

Author: ohlidalp

source/main/physics/ActorSpawner.cpp

@@ -2225,7 +2225,8 @@ void ActorSpawner::ProcessFlare2(RigDef::Flare2 & def)
             }
         }
 
-        Ogre::MaterialPtr material = this->FindOrCreateCustomizedMaterial(material_name, m_custom_resource_group);
+        std::string material_rg = (def._material_rg_override != "") ? def._material_rg_override : m_actor->getTruckFileResourceGroup();
+        Ogre::MaterialPtr material = this->FindOrCreateCustomizedMaterial(material_name, material_rg);
         if (!material.isNull())
         {
             flare.bbs->setMaterial(material);

source/main/resources/addonpart_fileformat/AddonPartFileFormat.cpp

@@ -358,6 +358,8 @@ void AddonPartUtility::ProcessFlare()
     if (n > 8) { def.size              = m_context->getTokFloat(8); }
     if (n > 9) { def.material_name     = m_context->getTokString(9); }
 
+    def._material_rg_override = m_addonpart_entry->resource_group;
+
     m_module->flares2.push_back(def);
 }
 
@@ -397,6 +399,8 @@ void AddonPartUtility::ProcessFlare2()
     if (n > 9) { def.size              = m_context->getTokFloat(9); }
     if (n > 10) { def.material_name     = m_context->getTokString(10); }
 
+    def._material_rg_override = m_addonpart_entry->resource_group;
+
     m_module->flares2.push_back(def);
 }
 

source/main/resources/rig_def_fileformat/RigDef_File.h

@@ -876,6 +876,7 @@ struct Flare2 // Used for both 'flares' and 'flares2' sections
     int blink_delay_milis = -2;
     float size = -1.f;
     Ogre::String material_name;
+    Ogre::String _material_rg_override; //!< Needed for addonparts
 };
 
 struct Flare3: public Flare2