Merge branch 'twoahahidles' into 'master'

Change wander package column names to match reality

See merge request OpenMW/openmw!4032

apps/opencs/model/world/columns.cpp

@@ -324,7 +324,6 @@ namespace CSMWorld
             { ColumnId_MaxAttack, "Max Attack" },
             { ColumnId_CreatureMisc, "Creature Misc" },
 
-            { ColumnId_Idle1, "Idle 1" },
             { ColumnId_Idle2, "Idle 2" },
             { ColumnId_Idle3, "Idle 3" },
             { ColumnId_Idle4, "Idle 4" },
@@ -332,6 +331,7 @@ namespace CSMWorld
             { ColumnId_Idle6, "Idle 6" },
             { ColumnId_Idle7, "Idle 7" },
             { ColumnId_Idle8, "Idle 8" },
+            { ColumnId_Idle9, "Idle 9" },
 
             { ColumnId_RegionWeather, "Weather" },
             { ColumnId_WeatherName, "Type" },

apps/opencs/model/world/columns.hpp

@@ -310,14 +310,14 @@ namespace CSMWorld
             ColumnId_MaxAttack = 284,
             ColumnId_CreatureMisc = 285,
 
-            ColumnId_Idle1 = 286,
-            ColumnId_Idle2 = 287,
-            ColumnId_Idle3 = 288,
-            ColumnId_Idle4 = 289,
-            ColumnId_Idle5 = 290,
-            ColumnId_Idle6 = 291,
-            ColumnId_Idle7 = 292,
-            ColumnId_Idle8 = 293,
+            ColumnId_Idle2 = 286,
+            ColumnId_Idle3 = 287,
+            ColumnId_Idle4 = 288,
+            ColumnId_Idle5 = 289,
+            ColumnId_Idle6 = 290,
+            ColumnId_Idle7 = 291,
+            ColumnId_Idle8 = 292,
+            ColumnId_Idle9 = 293,
 
             ColumnId_RegionWeather = 294,
             ColumnId_WeatherName = 295,

apps/opencs/model/world/refidcollection.cpp

@@ -210,7 +210,6 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiDuration, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderToD, CSMWorld::ColumnBase::Display_Integer));
 
-    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle1, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle2, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle3, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle4, CSMWorld::ColumnBase::Display_Integer));
@@ -218,6 +217,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle6, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle7, CSMWorld::ColumnBase::Display_Integer));
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle8, CSMWorld::ColumnBase::Display_Integer));
+    mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_Idle9, CSMWorld::ColumnBase::Display_Integer));
 
     mColumns.back().addColumn(new RefIdColumn(Columns::ColumnId_AiWanderRepeat, CSMWorld::ColumnBase::Display_Boolean));
     mColumns.back().addColumn(