Ported buy dialog, which could still use visual improvement, and added

\|-`~ to the fixed font.

6 files changed, 254 insertions, 6 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
new file mode 100644
index 00000000..c3b8751d
--- /dev/null
+++ b/src/gui/buy.cpp
@@ -0,0 +1,152 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include "buy.h"
+#include "button.h"
+
+#include <sstream>
+
+BuyDialog::BuyDialog(gcn::Container *parent):
+    Window(parent, "Buy"),
+    money(0)
+{
+    itemList = new gcn::ListBox(this);
+    scrollArea = new gcn::ScrollArea(itemList);
+    slider = new gcn::Slider(1.0);
+    quantityLabel = new gcn::Label("0");
+    moneyLabel = new gcn::Label("350 G");
+    okButton = new Button("OK");
+    cancelButton = new Button("Cancel");
+
+    setSize(260, 175);
+    scrollArea->setDimension(gcn::Rectangle(5, 5, 250, 110));
+    slider->setDimension(gcn::Rectangle(5, 120, 200, 10));
+    quantityLabel->setPosition(215, 120);
+    moneyLabel->setPosition(5, 135);
+    okButton->setPosition(180, 145);
+    cancelButton->setPosition(208, 145);
+
+    itemList->setEventId("item");
+    slider->setEventId("slider");
+    okButton->setEventId("ok");
+    cancelButton->setEventId("cancel");
+
+    itemList->addActionListener(this);
+    slider->addActionListener(this);
+    okButton->addActionListener(this);
+    cancelButton->addActionListener(this);
+
+    add(scrollArea);
+    add(slider);
+    add(quantityLabel);
+    add(moneyLabel);
+    add(okButton);
+    add(cancelButton);
+
+    setLocationRelativeTo(getParent());
+}
+
+BuyDialog::~BuyDialog()
+{
+    delete cancelButton;
+    delete okButton;
+    delete moneyLabel;
+    delete slider;
+    delete itemList;
+    delete scrollArea;
+}
+
+void BuyDialog::setMoney(int amount)
+{
+    money = amount;
+    std::stringstream ss;
+    ss << money << " G";
+    moneyLabel->setCaption(ss.str());
+    moneyLabel->adjustSize();
+}
+
+void BuyDialog::reset()
+{
+    shopInventory.clear();
+    money = 0;
+}
+
+void BuyDialog::addItem(short id, int price)
+{
+    ITEM_SHOP item_shop;
+
+    if (id - 501 >= 0 && id - 501 <= 11) {
+        sprintf(item_shop.name, "%s %i gp", item_db[id - 501], price);
+    }
+    else {
+        sprintf(item_shop.name, "Unknown item %i gp", price);
+    }
+    item_shop.price = price;
+    item_shop.id = id;
+
+    shopInventory.push_back(item_shop);
+    itemList->adjustSize();
+}
+
+void BuyDialog::action(const std::string& eventId)
+{
+    int selectedItem = itemList->getSelected();
+
+    if (eventId == "slider" || eventId == "item") {
+        if (selectedItem > -1) {
+            int maxItems = money / shopInventory[selectedItem].price;
+            std::stringstream ss;
+
+            ss << (int)(slider->getValue() * maxItems);
+            quantityLabel->setCaption(ss.str());
+            quantityLabel->adjustSize();
+        }
+    }
+    else if (eventId == "ok") {
+        if (selectedItem > -1) {
+            // Attempt purchase
+            int maxItems = money / shopInventory[selectedItem].price;
+            int amount = (int)(slider->getValue() * maxItems);
+
+            if (amount > 0) {
+                WFIFOW(0) = net_w_value(0x00c8);
+                WFIFOW(2) = net_w_value(8);
+                WFIFOW(4) = net_w_value(amount);
+                WFIFOW(6) = net_w_value(shopInventory[selectedItem].id);
+                WFIFOSET(8);
+            }
+        }
+        setVisible(false);
+    }
+    else if (eventId == "cancel") {
+        setVisible(false);
+    }
+}
+
+int BuyDialog::getNumberOfElements()
+{
+    return shopInventory.size();
+}
+
+std::string BuyDialog::getElementAt(int i)
+{
+    return shopInventory[i].name;
+}
diff --git a/src/gui/buy.h b/src/gui/buy.h
new file mode 100644
index 00000000..67978409
--- /dev/null
+++ b/src/gui/buy.h
@@ -0,0 +1,96 @@
+/*
+ *  The Mana World
+ *  Copyright 2004 The Mana World Development Team
+ *
+ *  This file is part of The Mana World.
+ *
+ *  The Mana World is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  The Mana World is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with The Mana World; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _TMW_BUY_H
+#define _TMW_BUY_H
+
+#include "gui.h"
+#include "window.h"
+#include "shop.h"
+
+#include <vector>
+
+/**
+ * The buy dialog.
+ *
+ * \ingroup GUI
+ */
+class BuyDialog : public Window, public gcn::ActionListener,
+                  public gcn::ListModel
+{
+    public:
+        /**
+         * Constructor
+         *
+         * @see Window::Window
+         */
+        BuyDialog(gcn::Container *parent);
+
+        /**
+         * Destructor
+         */
+        ~BuyDialog();
+
+        /**
+         * Resets the dialog, clearing shop inventory.
+         */
+        void reset();
+
+        /**
+         * Sets the amount of available money.
+         */
+        void setMoney(int amount);
+
+        /**
+         * Adds an item to the shop inventory.
+         */
+        void addItem(short id, int price);
+
+        /**
+         * Called when receiving actions from the widgets.
+         */
+        void action(const std::string& eventId);
+
+        /**
+         * Returns the number of items in the shop inventory.
+         */
+        int getNumberOfElements();
+
+        /**
+         * Returns the name of item number i in the shop inventory.
+         */
+        std::string getElementAt(int i);
+
+    private:
+        gcn::Button *okButton;
+        gcn::Button *cancelButton;
+        gcn::ListBox *itemList;
+        gcn::ScrollArea *scrollArea;
+        gcn::Label *moneyLabel;
+        gcn::Label *quantityLabel;
+        gcn::Slider *slider;
+
+        std::vector<ITEM_SHOP> shopInventory;
+
+        int money;
+};
+
+#endif
diff --git a/src/gui/char_server.h b/src/gui/char_server.h
index 2f2a6f46..c1cb704b 100644
--- a/src/gui/char_server.h
+++ b/src/gui/char_server.h
@@ -19,13 +19,13 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifndef _CHAR_SEL_SERVER_H
+#define _CHAR_SEL_SERVER_H
+
 #ifdef WIN32
   #pragma warning (disable:4312)
 #endif
 
-#ifndef _CHAR_SEL_SERVER_H
-#define _CHAR_SEL_SERVER_H
-
 #include "../main.h"
 #include "../net/network.h"
 #include "gui.h"
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index b6bfd72f..ee6d2a0a 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -87,7 +87,7 @@ void init_gui(BITMAP *bitmap, const char *skin) {
     gui->setTop(guiTop);
     guiFont = new gcn::ImageFont("./data/graphic/fixedfont.bmp",
             " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:@"
-            "!\"$%&/=?^+*#[]{}()<>_;'.,"
+            "!\"$%&/=?^+*#[]{}()<>_;'.,\\|-~`"
             );
     gcn::Widget::setGlobalFont(guiFont);
 
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 0d8e31ad..73b14e97 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "../graphic/graphic.h"
 #include "inventory.h"
 
 
@@ -43,6 +42,7 @@ struct ITEM_SHOP {
 extern int n_items;
 extern char* selectedItem;
 extern char itemCurrenyQ[10];
+extern char *item_db[];
 
 char *shop_list(int index, int *list_size);
 void add_buy_item(short id, int price);
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 65014cb9..5deb270a 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -62,7 +62,7 @@ char *skill_db[] = {
 
 DIALOG skill_dialog[] = {
    /* (dialog proc)     (x)   (y)   (w)   (h)   (fg)  (bg)  (key) (flags)  (d1)                    (d2)  (dp)              (dp2) (dp3) */
-   { tmw_dialog_proc,     300,  200,  150,   60,  0,    0,    0,    0,       0,                0,    (char *)"Skill",  NULL, NULL  },
+   { tmw_dialog_proc,     300,  200,  150,   60,  0,    0,    0,    0,       0,                0,    (char *)"Skills",  NULL, NULL  },
    { tmw_text_proc,       304,  224,  252,  100,  0,    0,    0,    0,       0,                0,    str_string,       NULL, NULL  },
    { tmw_plus_proc,       354,  224,  16,    16,    0,   0,    '0',  0,          0,			   1,     (void*)increaseStatus,NULL, NULL  },
    { tmw_text_proc,       304,  234,  252,  100,  0,    0,    0,    0,       0,                0,    agi_string,       NULL, NULL  },