mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-05 15:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Format probability

Browse Source
This commit is contained in:
Evil Eye 2024-03-10 22:14:15 +01:00
parent c0578613af
commit 0fdc432eb2
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/opencs/model/world/data.cpp
View File

@ -314,7 +314,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data
mRegions.getNestableColumn(index)->addColumn( mRegions.getNestableColumn(index)->addColumn(
new NestedChildColumn(Columns::ColumnId_SoundChance, ColumnBase::Display_UnsignedInteger8)); new NestedChildColumn(Columns::ColumnId_SoundChance, ColumnBase::Display_UnsignedInteger8));
mRegions.getNestableColumn(index)->addColumn(new NestedChildColumn( mRegions.getNestableColumn(index)->addColumn(new NestedChildColumn(
Columns::ColumnId_SoundProbability, ColumnBase::Display_Float, ColumnBase::Flag_Dialogue, false)); Columns::ColumnId_SoundProbability, ColumnBase::Display_String, ColumnBase::Flag_Dialogue, false));
mBirthsigns.addColumn(new StringIdColumn<ESM::BirthSign>); mBirthsigns.addColumn(new StringIdColumn<ESM::BirthSign>);
mBirthsigns.addColumn(new RecordStateColumn<ESM::BirthSign>); mBirthsigns.addColumn(new RecordStateColumn<ESM::BirthSign>);

3
apps/opencs/model/world/nestedcoladapterimp.cpp
View File

@ -437,7 +437,8 @@ namespace CSMWorld
const float p = std::min(soundList[i].mChance / 100.f, 1.f); const float p = std::min(soundList[i].mChance / 100.f, 1.f);
probability *= 1.f - p; probability *= 1.f - p;
} }
return probability * std::min(soundRef.mChance / 100.f, 1.f) * 100.f; probability *= std::min(soundRef.mChance / 100.f, 1.f) * 100.f;
return QString("%1%").arg(probability, 0, 'f', 2);
} }
default: default:
throw std::runtime_error("Region sounds subcolumn index out of range"); throw std::runtime_error("Region sounds subcolumn index out of range");