Merge branch 'i-have-value-too' into 'master'

FIX(CS): Re-add gold value column for objects

See merge request OpenMW/openmw!3991

apps/opencs/model/world/columns.cpp

@@ -57,6 +57,7 @@ namespace CSMWorld
             { ColumnId_Charges, "Charges" },
             { ColumnId_Enchantment, "Enchantment" },
             { ColumnId_StackCount, "Count" },
+            { ColumnId_GoldValue, "Value" },
             { ColumnId_Teleport, "Teleport" },
             { ColumnId_TeleportCell, "Teleport Cell" },
             { ColumnId_IsLocked, "Locked" },

apps/opencs/model/world/columns.hpp

@@ -355,6 +355,8 @@ namespace CSMWorld
 
             ColumnId_ProjectileSpeed = 319,
 
+            ColumnId_GoldValue = 320,
+
             // Allocated to a separate value range, so we don't get a collision should we ever need
             // to extend the number of use values.
             ColumnId_UseValue1 = 0x10000,

apps/opencs/model/world/refidcollection.cpp

@@ -97,7 +97,7 @@ CSMWorld::RefIdCollection::RefIdCollection()
     inventoryColumns.mIcon = &mColumns.back();
     mColumns.emplace_back(Columns::ColumnId_Weight, ColumnBase::Display_Float);
     inventoryColumns.mWeight = &mColumns.back();
-    mColumns.emplace_back(Columns::ColumnId_StackCount, ColumnBase::Display_Integer);
+    mColumns.emplace_back(Columns::ColumnId_GoldValue, ColumnBase::Display_Integer);
     inventoryColumns.mValue = &mColumns.back();
 
     IngredientColumns ingredientColumns(inventoryColumns);