mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1785 from akortunov/warnfix

Browse source 
Fix some GCC warnings
This commit is contained in:
Bret Curtis 2018-06-28 10:33:51 +02:00 committed by GitHub
commit f07d50e5bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/opencs/view/world/enumdelegate.cpp
View file

@ -110,7 +110,11 @@ void CSVWorld::EnumDelegate::paint (QPainter *painter, const QStyleOptionViewIte
int valueIndex = getValueIndex(index); int valueIndex = getValueIndex(index);
if (valueIndex != -1) if (valueIndex != -1)
{ {
#if QT_VERSION >= QT_VERSION_CHECK(5,7,0)
QStyleOptionViewItem itemOption(option);
#else
QStyleOptionViewItemV4 itemOption(option); QStyleOptionViewItemV4 itemOption(option);
#endif
itemOption.text = mValues.at(valueIndex).second; itemOption.text = mValues.at(valueIndex).second;
QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &itemOption, painter); QApplication::style()->drawControl(QStyle::CE_ItemViewItem, &itemOption, painter);
} }

5
apps/openmw/mwmechanics/spellpriority.cpp
View file

@ -328,7 +328,10 @@ namespace MWMechanics
if (race->mData.mFlags & ESM::Race::Beast) if (race->mData.mFlags & ESM::Race::Beast)
return 0.f; return 0.f;
} }
// Intended fall-through else
return 0.f;
break;
// Creatures can not wear armor // Creatures can not wear armor
case ESM::MagicEffect::BoundCuirass: case ESM::MagicEffect::BoundCuirass:
case ESM::MagicEffect::BoundGloves: case ESM::MagicEffect::BoundGloves: