From 83a3b6f920f446b3001725554ab15bed34d6f368 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Thu, 13 Jan 2011 16:06:07 +0100
Subject: Fix a segfault when attempting to buy free items.

Resolves: Mana-mantis #277

Trivial fix.
---
 src/gui/buy.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index cc135e07..4a8dae17 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -204,8 +204,10 @@ void BuyDialog::action(const gcn::ActionEvent &event)
 
         // Update money and adjust the max number of items that can be bought
         mMaxItems -= mAmountItems;
-        setMoney(mMoney -
-                mAmountItems * mShopItems->at(selectedItem)->getPrice());
+        int price = mShopItems->at(selectedItem)->getPrice();
+        if (price < 0)
+            price = 0;
+        setMoney(mMoney - mAmountItems * price);
 
         // Reset selection
         mAmountItems = 1;
@@ -234,12 +236,20 @@ void BuyDialog::updateButtonsAndLabels()
         int itemPrice = mShopItems->at(selectedItem)->getPrice();
 
         // Calculate how many the player can afford
-        mMaxItems = mMoney / itemPrice;
-        if (mAmountItems > mMaxItems)
+        if (itemPrice > 0)
         {
-            mAmountItems = mMaxItems;
+            mMaxItems = mMoney / itemPrice;
+        }
+        else
+        {
+            // Let the player no more than 1 of them at a time, since it
+            // shouldn't be a permitted case.
+            mMaxItems = 1;
         }
 
+        if (mAmountItems > mMaxItems)
+            mAmountItems = mMaxItems;
+
         // Calculate price of pending purchase
         price = mAmountItems * itemPrice;
     }
-- 
cgit v1.2.3-70-g09d2