From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sun, 9 Dec 2012 14:30:43 +0000 (+0100)
Subject: Merge branch 'master' into feature-33-capsules
X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=67f6bb1d9727e7d1e2140cf2913aa89ebba84bf5;hp=59c735f03e5959ab6a32afac1603f1e371786ed7;p=l2e.git

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 e279ac5..793a059 100644
--- 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) {