Merge branch 'master' into feature-33-capsules

needed for fixed cbp file

diff --git a/src/common/Inventory.cpp b/src/common/Inventory.cpp
index e279ac5856d0b608a1866fd97a3e26193f16286a..793a0597f372f04b5668cff2777c9586ba15ce39 100644 (file)
--- a/src/common/Inventory.cpp
+++ b/src/common/Inventory.cpp
@@ -77,7 +77,7 @@ bool Inventory::AddScenarioItem(const Item *i) {
 
 
 void Inventory::Sort() {
-       std::sort(entries, entries + 96, Entry::Less);
+       std::stable_sort(entries, entries + 96, Entry::Less);
 }
 
 bool Inventory::Entry::Less(const Entry &lhs, const Entry &rhs) {