mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

[Client] Allow blanking out the enchantment IDs of records using a base

Browse Source
pull/541/head
David Cernat 5 years ago
parent 14af0be657
commit 1d09763bad
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
apps/openmw/mwmp/RecordHelper.cpp
Unescape Escape View File

@ -583,7 +583,7 @@ void RecordHelper::overrideArmorRecord(const mwmp::ArmorRecord& record)
if (record.baseOverrides.hasEnchantmentId) if (record.baseOverrides.hasEnchantmentId)
{ {
if (doesEnchantmentRecordExist(recordData.mEnchant)) if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant; finalData.mEnchant = recordData.mEnchant;
else else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str()); 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 (record.baseOverrides.hasEnchantmentId)
{ {
if (doesEnchantmentRecordExist(recordData.mEnchant)) if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant; finalData.mEnchant = recordData.mEnchant;
else else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str()); 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 (record.baseOverrides.hasEnchantmentId)
{ {
if (doesEnchantmentRecordExist(recordData.mEnchant)) if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant; finalData.mEnchant = recordData.mEnchant;
else else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str()); 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 (record.baseOverrides.hasEnchantmentId)
{ {
if (doesEnchantmentRecordExist(recordData.mEnchant)) if (recordData.mEnchant.empty() || doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant; finalData.mEnchant = recordData.mEnchant;
else else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str()); LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());

Write Preview
Loading…
Cancel
Save