Merge branch 'typicalcs' into 'master'

Copy DIAL type to INFO when saving

Closes #7861

See merge request OpenMW/openmw!3998

CHANGELOG.md

@@ -160,6 +160,7 @@
     Bug #7840: First run of the launcher doesn't save viewing distance as the default value
     Bug #7841: Editor: "Dirty" water heights are saved in modified CELLs
     Bug #7859: AutoCalc flag is not used to calculate potion value
+    Bug #7861: OpenMW-CS: Incorrect DIAL's type in INFO records
     Bug #7872: Region sounds use wrong odds
     Bug #7887: Editor: Mismatched reported script data size and actual data size causes a crash during save
     Bug #7898: Editor: Invalid reference scales are allowed

apps/opencs/model/doc/savingstages.cpp

@@ -135,7 +135,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform(int stage, Messages& messages
     if (topic.mState == CSMWorld::RecordBase::State_Deleted)
     {
         // if the topic is deleted, we do not need to bother with INFO records.
-        ESM::Dialogue dialogue = topic.get();
+        const ESM::Dialogue& dialogue = topic.get();
         writer.startRecord(dialogue.sRecordId);
         dialogue.save(writer, true);
         writer.endRecord(dialogue.sRecordId);
@@ -187,6 +187,7 @@ void CSMDoc::WriteDialogueCollectionStage::perform(int stage, Messages& messages
                 {
                     ESM::DialInfo info = record.get();
                     info.mId = record.get().mOriginalId;
+                    info.mData.mType = topic.get().mType;
 
                     if (iter == infos.begin())
                         info.mPrev = ESM::RefId();