Merge pull request #2086 from Capostrophic/aidata

Editor: avoid overflows in certain fields (bug #2987)

CHANGELOG.md

@@ -1,6 +1,7 @@
 0.46.0
 ------
 
+    Bug #2987: Editor: some chance and AI data fields can overflow
     Bug #3623: Fix HiDPI on Windows
     Bug #4540: Rain delay when exiting water
     Bug #4701: PrisonMarker record is not hardcoded like other markers

apps/opencs/model/tools/referenceablecheck.cpp

@@ -470,6 +470,13 @@ void CSMTools::ReferenceableCheckStage::creatureCheck (
     if (creature.mData.mSoul < 0)
         messages.add(id, "Soul value is negative", "", CSMDoc::Message::Severity_Error);
 
+    if (creature.mAiData.mAlarm > 100)
+        messages.add(id, "Alarm rating is over 100", "", CSMDoc::Message::Severity_Warning);
+    if (creature.mAiData.mFight > 100)
+        messages.add(id, "Fight rating is over 100", "", CSMDoc::Message::Severity_Warning);
+    if (creature.mAiData.mFlee > 100)
+        messages.add(id, "Flee rating is over 100", "", CSMDoc::Message::Severity_Warning);
+
     for (int i = 0; i < 6; ++i)
     {
         if (creature.mData.mAttack[i] < 0)
@@ -700,6 +707,13 @@ void CSMTools::ReferenceableCheckStage::npcCheck (
     if (level <= 0)
         messages.add(id, "Level is non-positive", "", CSMDoc::Message::Severity_Warning);
 
+    if (npc.mAiData.mAlarm > 100)
+        messages.add(id, "Alarm rating is over 100", "", CSMDoc::Message::Severity_Warning);
+    if (npc.mAiData.mFight > 100)
+        messages.add(id, "Fight rating is over 100", "", CSMDoc::Message::Severity_Warning);
+    if (npc.mAiData.mFlee > 100)
+        messages.add(id, "Flee rating is over 100", "", CSMDoc::Message::Severity_Warning);
+
     if (gold < 0)
         messages.add(id, "Gold count is negative", "", CSMDoc::Message::Severity_Error);
 
@@ -1014,6 +1028,11 @@ template<typename Tool> void CSMTools::ReferenceableCheckStage::toolCheck (
 template<typename List> void CSMTools::ReferenceableCheckStage::listCheck (
     const List& someList, CSMDoc::Messages& messages, const std::string& someID)
 {
+    if (someList.mChanceNone > 100)
+    {
+        messages.add(someID, "Chance that no object is used is over 100 percent", "", CSMDoc::Message::Severity_Warning);
+    }
+
     for (unsigned i = 0; i < someList.mList.size(); ++i)
     {
         if (mReferencables.searchId(someList.mList[i].mId).first == -1)

apps/opencs/model/tools/regioncheck.cpp

@@ -42,5 +42,11 @@ void CSMTools::RegionCheckStage::perform (int stage, CSMDoc::Messages& messages)
     if (chances != 100)
         messages.add(id, "Weather chances do not add up to 100", "", CSMDoc::Message::Severity_Error);
 
+    for (const ESM::Region::SoundRef& sound : region.mSoundList)
+    {
+        if (sound.mChance > 100)
+            messages.add(id, "Chance of '" + sound.mSound.toString() + "' sound to play is over 100 percent", "", CSMDoc::Message::Severity_Warning);
+    }
+
     /// \todo check data members that can't be edited in the table view
 }

apps/opencs/model/world/data.cpp

@@ -205,7 +205,7 @@ CSMWorld::Data::Data (ToUTF8::FromType encoding, bool fsStrict, const Files::Pat
     mRegions.getNestableColumn(index)->addColumn(
         new NestedChildColumn (Columns::ColumnId_SoundName, ColumnBase::Display_Sound));
     mRegions.getNestableColumn(index)->addColumn(
-        new NestedChildColumn (Columns::ColumnId_SoundChance, ColumnBase::Display_Integer));
+        new NestedChildColumn (Columns::ColumnId_SoundChance, ColumnBase::Display_UnsignedInteger8));
 
     mBirthsigns.addColumn (new StringIdColumn<ESM::BirthSign>);
     mBirthsigns.addColumn (new RecordStateColumn<ESM::BirthSign>);

apps/opencs/model/world/refidcollection.cpp

@@ -128,13 +128,13 @@ CSMWorld::RefIdCollection::RefIdCollection()
 
     ActorColumns actorsColumns (nameColumns);
 
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiHello, ColumnBase::Display_Integer));
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiHello, ColumnBase::Display_UnsignedInteger8));
     actorsColumns.mHello = &mColumns.back();
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiFlee, ColumnBase::Display_Integer));
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiFlee, ColumnBase::Display_UnsignedInteger8));
     actorsColumns.mFlee = &mColumns.back();
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiFight, ColumnBase::Display_Integer));
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiFight, ColumnBase::Display_UnsignedInteger8));
     actorsColumns.mFight = &mColumns.back();
-    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiAlarm, ColumnBase::Display_Integer));
+    mColumns.push_back (RefIdColumn (Columns::ColumnId_AiAlarm, ColumnBase::Display_UnsignedInteger8));
     actorsColumns.mAlarm = &mColumns.back();
 
     // Nested table
@@ -645,7 +645,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(
         new RefIdColumn (Columns::ColumnId_LevelledItemType, CSMWorld::ColumnBase::Display_Boolean));
     mColumns.back().addColumn(
-        new RefIdColumn (Columns::ColumnId_LevelledItemChanceNone, CSMWorld::ColumnBase::Display_Integer));
+        new RefIdColumn (Columns::ColumnId_LevelledItemChanceNone, CSMWorld::ColumnBase::Display_UnsignedInteger8));
 
     mAdapters.insert (std::make_pair (UniversalId::Type_Activator,
         new NameRefIdAdapter<ESM::Activator> (UniversalId::Type_Activator, nameColumns)));