krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Client] Add logging for invalid enchantmentIds in RecordHelper

Browse source
This commit is contained in:
David Cernat 2019-01-23 01:04:59 +02:00
parent 999ce857c7
commit 1df1515c7e
1 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
apps/openmw/mwmp/RecordHelper.cpp
View file

@ -462,7 +462,7 @@ void RecordHelper::overrideArmorRecord(const mwmp::ArmorRecord& record)
{ {
if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant)) if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant))
{ {
LOG_APPEND(Log::LOG_INFO, "-- Ignoring new armor record with invalid enchantment provided"); LOG_APPEND(Log::LOG_INFO, "-- Ignoring new armor record with invalid enchantmentId %s", recordData.mEnchant.c_str());
return; return;
} }
else else
@ -500,8 +500,13 @@ void RecordHelper::overrideArmorRecord(const mwmp::ArmorRecord& record)
if (record.baseOverrides.hasArmorRating) if (record.baseOverrides.hasArmorRating)
finalData.mData.mArmor = recordData.mData.mArmor; finalData.mData.mArmor = recordData.mData.mArmor;
if (record.baseOverrides.hasEnchantmentId && doesEnchantmentRecordExist(recordData.mEnchant)) if (record.baseOverrides.hasEnchantmentId)
finalData.mEnchant = recordData.mEnchant; {
if (doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant;
else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());
}
if (record.baseOverrides.hasEnchantmentCharge) if (record.baseOverrides.hasEnchantmentCharge)
finalData.mData.mEnchant = recordData.mData.mEnchant; finalData.mData.mEnchant = recordData.mData.mEnchant;
@ -541,7 +546,7 @@ void RecordHelper::overrideBookRecord(const mwmp::BookRecord& record)
{ {
if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant)) if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant))
{ {
LOG_APPEND(Log::LOG_INFO, "-- Ignoring new book record with invalid enchantment provided"); LOG_APPEND(Log::LOG_INFO, "-- Ignoring new book record with invalid enchantmentId %s", recordData.mEnchant.c_str());
return; return;
} }
else else
@ -577,8 +582,13 @@ void RecordHelper::overrideBookRecord(const mwmp::BookRecord& record)
if (record.baseOverrides.hasSkillId) if (record.baseOverrides.hasSkillId)
finalData.mData.mSkillId = recordData.mData.mSkillId; finalData.mData.mSkillId = recordData.mData.mSkillId;
if (record.baseOverrides.hasEnchantmentId && doesEnchantmentRecordExist(recordData.mEnchant)) if (record.baseOverrides.hasEnchantmentId)
finalData.mEnchant = recordData.mEnchant; {
if (doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant;
else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());
}
if (record.baseOverrides.hasEnchantmentCharge) if (record.baseOverrides.hasEnchantmentCharge)
finalData.mData.mEnchant = recordData.mData.mEnchant; finalData.mData.mEnchant = recordData.mData.mEnchant;
@ -615,7 +625,7 @@ void RecordHelper::overrideClothingRecord(const mwmp::ClothingRecord& record)
{ {
if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant)) if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant))
{ {
LOG_APPEND(Log::LOG_INFO, "-- Ignoring new clothing record with invalid enchantment provided"); LOG_APPEND(Log::LOG_INFO, "-- Ignoring new clothing record with invalid enchantmentId %s", recordData.mEnchant.c_str());
return; return;
} }
else else
@ -645,8 +655,13 @@ void RecordHelper::overrideClothingRecord(const mwmp::ClothingRecord& record)
if (record.baseOverrides.hasValue) if (record.baseOverrides.hasValue)
finalData.mData.mValue = recordData.mData.mValue; finalData.mData.mValue = recordData.mData.mValue;
if (record.baseOverrides.hasEnchantmentId && doesEnchantmentRecordExist(recordData.mEnchant)) if (record.baseOverrides.hasEnchantmentId)
finalData.mEnchant = recordData.mEnchant; {
if (doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant;
else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());
}
if (record.baseOverrides.hasEnchantmentCharge) if (record.baseOverrides.hasEnchantmentCharge)
finalData.mData.mEnchant = recordData.mData.mEnchant; finalData.mData.mEnchant = recordData.mData.mEnchant;
@ -742,7 +757,7 @@ void RecordHelper::overrideWeaponRecord(const mwmp::WeaponRecord& record)
{ {
if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant)) if (!recordData.mEnchant.empty() && !doesEnchantmentRecordExist(recordData.mEnchant))
{ {
LOG_APPEND(Log::LOG_INFO, "-- Ignoring new weapon record with invalid enchantment provided"); LOG_APPEND(Log::LOG_INFO, "-- Ignoring new weapon record with invalid enchantmentId %s", recordData.mEnchant.c_str());
return; return;
} }
else else
@ -802,8 +817,13 @@ void RecordHelper::overrideWeaponRecord(const mwmp::WeaponRecord& record)
if (record.baseOverrides.hasFlags) if (record.baseOverrides.hasFlags)
finalData.mData.mFlags = recordData.mData.mFlags; finalData.mData.mFlags = recordData.mData.mFlags;
if (record.baseOverrides.hasEnchantmentId && doesEnchantmentRecordExist(recordData.mEnchant)) if (record.baseOverrides.hasEnchantmentId)
finalData.mEnchant = recordData.mEnchant; {
if (doesEnchantmentRecordExist(recordData.mEnchant))
finalData.mEnchant = recordData.mEnchant;
else
LOG_APPEND(Log::LOG_INFO, "-- Ignoring invalid enchantmentId %s", recordData.mEnchant.c_str());
}
if (record.baseOverrides.hasEnchantmentCharge) if (record.baseOverrides.hasEnchantmentCharge)
finalData.mData.mEnchant = recordData.mData.mEnchant; finalData.mData.mEnchant = recordData.mData.mEnchant;