From 0fdc432eb243c7e9f53f7c329411e65e52d4515b Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sun, 10 Mar 2024 22:14:15 +0100 Subject: [PATCH] Format probability --- apps/opencs/model/world/data.cpp | 2 +- apps/opencs/model/world/nestedcoladapterimp.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/opencs/model/world/data.cpp b/apps/opencs/model/world/data.cpp index 7bee635678..1f8ff54e89 100644 --- a/apps/opencs/model/world/data.cpp +++ b/apps/opencs/model/world/data.cpp @@ -314,7 +314,7 @@ CSMWorld::Data::Data(ToUTF8::FromType encoding, const Files::PathContainer& data mRegions.getNestableColumn(index)->addColumn( new NestedChildColumn(Columns::ColumnId_SoundChance, ColumnBase::Display_UnsignedInteger8)); 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); mBirthsigns.addColumn(new RecordStateColumn); diff --git a/apps/opencs/model/world/nestedcoladapterimp.cpp b/apps/opencs/model/world/nestedcoladapterimp.cpp index 9e5363e606..aa0178fd28 100644 --- a/apps/opencs/model/world/nestedcoladapterimp.cpp +++ b/apps/opencs/model/world/nestedcoladapterimp.cpp @@ -437,7 +437,8 @@ namespace CSMWorld const float p = std::min(soundList[i].mChance / 100.f, 1.f); 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: throw std::runtime_error("Region sounds subcolumn index out of range");