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

style corrections

Browse source
This commit is contained in:
Marek Kochanowicz 2014-01-03 11:42:49 +01:00
parent 24f090ca98
commit 7b63e1942c
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
apps/opencs/model/tools/referenceablecheck.cpp
View file

@ -779,31 +779,24 @@ void CSMTools::ReferenceableCheckStage::weaponCheck(int stage, const CSMWorld::R
{ {
inventoryItemCheck<ESM::Weapon>(Weapon, messages, id.toString(), true); inventoryItemCheck<ESM::Weapon>(Weapon, messages, id.toString(), true);
if (Weapon.mData.mType == ESM::Weapon::MarksmanBow or Weapon.mData.mType == ESM::Weapon::MarksmanCrossbow or Weapon.mData.mType == ESM::Weapon::MarksmanThrown or Weapon.mData.mType == ESM::Weapon::Arrow or Weapon.mData.mType == ESM::Weapon::Bolt) if (!(Weapon.mData.mType == ESM::Weapon::MarksmanBow or Weapon.mData.mType == ESM::Weapon::MarksmanCrossbow or Weapon.mData.mType == ESM::Weapon::MarksmanThrown or Weapon.mData.mType == ESM::Weapon::Arrow or Weapon.mData.mType == ESM::Weapon::Bolt))
{
if (Weapon.mData.mChop[0] > Weapon.mData.mChop[1])
{
messages.push_back(id.toString() + "|" + Weapon.mId + " has minimum chop damage higher than maximum");
}
}
else
{ {
if (Weapon.mData.mSlash[0] > Weapon.mData.mSlash[1]) if (Weapon.mData.mSlash[0] > Weapon.mData.mSlash[1])
{ {
messages.push_back(id.toString() + "|" + Weapon.mId + " has minimum slash damage higher than maximum"); messages.push_back(id.toString() + "|" + Weapon.mId + " has minimum slash damage higher than maximum");
} }
if (Weapon.mData.mChop[0] > Weapon.mData.mChop[1])
{
messages.push_back(id.toString() + "|" + Weapon.mId + " has minimum chop damage higher than maximum");
}
if (Weapon.mData.mThrust[0] > Weapon.mData.mThrust[1]) if (Weapon.mData.mThrust[0] > Weapon.mData.mThrust[1])
{ {
messages.push_back(id.toString() + "|" + Weapon.mId + " has minimum thrust damage higher than maximum"); messages.push_back(id.toString() + "|" + Weapon.mId + " has minimum thrust damage higher than maximum");
} }
} }
if (Weapon.mData.mChop[0] > Weapon.mData.mChop[1])
{
messages.push_back(id.toString() + "|" + Weapon.mId + " has minimum chop damage higher than maximum");
}
if (!(Weapon.mData.mType == ESM::Weapon::Arrow or Weapon.mData.mType == ESM::Weapon::Bolt or Weapon.mData.mType == ESM::Weapon::MarksmanThrown)) if (!(Weapon.mData.mType == ESM::Weapon::Arrow or Weapon.mData.mType == ESM::Weapon::Bolt or Weapon.mData.mType == ESM::Weapon::MarksmanThrown))
{ {
//checking of health //checking of health