From 1d09763bad4e5b4fc1a8584238215adcca7abdd6 Mon Sep 17 00:00:00 2001
From: David Cernat <davidcernat@gmail.com>
Date: Thu, 8 Aug 2019 08:05:10 +0300
Subject: [PATCH] [Client] Allow blanking out the enchantment IDs of records
 using a base

---
 apps/openmw/mwmp/RecordHelper.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmp/RecordHelper.cpp b/apps/openmw/mwmp/RecordHelper.cpp
index f52328338..0a658f2cf 100644
--- a/apps/openmw/mwmp/RecordHelper.cpp
+++ b/apps/openmw/mwmp/RecordHelper.cpp
@@ -583,7 +583,7 @@ void RecordHelper::overrideArmorRecord(const mwmp::ArmorRecord& record)
 
         if (record.baseOverrides.hasEnchantmentId)
         {
-            if (doesEnchantmentRecordExist(recordData.mEnchant))
+            if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
                 finalData.mEnchant = recordData.mEnchant;
             else
                 LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());
@@ -665,7 +665,7 @@ void RecordHelper::overrideBookRecord(const mwmp::BookRecord& record)
 
         if (record.baseOverrides.hasEnchantmentId)
         {
-            if (doesEnchantmentRecordExist(recordData.mEnchant))
+            if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
                 finalData.mEnchant = recordData.mEnchant;
             else
                 LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());
@@ -738,7 +738,7 @@ void RecordHelper::overrideClothingRecord(const mwmp::ClothingRecord& record)
 
         if (record.baseOverrides.hasEnchantmentId)
         {
-            if (doesEnchantmentRecordExist(recordData.mEnchant))
+            if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
                 finalData.mEnchant = recordData.mEnchant;
             else
                 LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());
@@ -900,7 +900,7 @@ void RecordHelper::overrideWeaponRecord(const mwmp::WeaponRecord& record)
 
         if (record.baseOverrides.hasEnchantmentId)
         {
-            if (doesEnchantmentRecordExist(recordData.mEnchant))
+            if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
                 finalData.mEnchant = recordData.mEnchant;
             else
                 LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());