summaryrefslogtreecommitdiff
path: root/src/gui/inventorywindow.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/inventorywindow.cpp')
-rw-r--r--src/gui/inventorywindow.cpp145
1 files changed, 116 insertions, 29 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index fef55b6c..21d2df3f 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -1,9 +1,8 @@
/*
- * Aethyra
+ * The Mana World
* Copyright (C) 2004 The Mana World Development Team
*
- * This file is part of Aethyra based on original code
- * from The Mana World.
+ * This file is part of The Mana World.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,6 +31,7 @@
#include "label.h"
#include "progressbar.h"
#include "scrollarea.h"
+#include "sdlinput.h"
#include "viewport.h"
#include "widgets/layout.h"
@@ -39,6 +39,7 @@
#include "../inventory.h"
#include "../item.h"
#include "../localplayer.h"
+#include "../units.h"
#include "../resources/iteminfo.h"
@@ -48,14 +49,19 @@
InventoryWindow::InventoryWindow(int invSize):
Window(_("Inventory")),
mMaxSlots(invSize),
+ mSplit(false),
mItemDesc(false)
{
- setWindowName(_("Inventory"));
- setResizable(true);
+ setWindowName("Inventory");
+ setResizable(false);
setCloseButton(true);
-
+ // LEEOR/TODO: Since this window is not resizable, do we really need to set these
+ // values or can we drop them?
+ setMinWidth(375);
+ setMinHeight(283);
// If you adjust these defaults, don't forget to adjust the trade window's.
setDefaultSize(375, 300, ImageRect::CENTER);
+ addKeyListener(this);
std::string longestUseString = getFont()->getWidth(_("Equip")) >
getFont()->getWidth(_("Use")) ?
@@ -69,16 +75,23 @@ InventoryWindow::InventoryWindow(int invSize):
mUseButton = new Button(longestUseString, "use", this);
mDropButton = new Button(_("Drop"), "drop", this);
-
- mItems = new ItemContainer(player_node->getInventory(), 2);
+#ifdef TMWSERV_SUPPORT
+ mSplitButton = new Button(_("Split"), "split", this);
+#endif
+
+#ifdef TMWSERV_SUPPORT
+ mItems = new ItemContainer(player_node->getInventory(), 10, 5);
+#else
+ mItems = new ItemContainer(player_node->getInventory(), 10, 5, 2);
+#endif
mItems->addSelectionListener(this);
mInvenScroll = new ScrollArea(mItems);
mInvenScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER);
- mTotalWeight = player_node->mTotalWeight;
- mMaxWeight = player_node->mMaxWeight;
- mUsedSlots = player_node->getInventory()->getNumberOfSlotsUsed();
+ mTotalWeight = -1;
+ mMaxWeight = -1;
+ mUsedSlots = -1;
mSlotsLabel = new Label(_("Slots: "));
mWeightLabel = new Label(_("Weight: "));
@@ -93,12 +106,15 @@ InventoryWindow::InventoryWindow(int invSize):
place(1, 0, mWeightBar, 3);
place(4, 0, mSlotsLabel).setPadding(3);
place(5, 0, mSlotsBar, 2);
- place(0, 1, mInvenScroll, 7, 4);
- place(5, 5, mDropButton);
- place(6, 5, mUseButton);
+ place(0, 1, mInvenScroll, 100).setPadding(3);
+ place(0, 2, mUseButton);
+ place(1, 2, mDropButton);
+#ifdef TMWSERV_SUPPORT
+ place(2, 2, mSplitButton);
+#endif
Layout &layout = getLayout();
- layout.setRowHeight(0, mDropButton->getHeight());
+ layout.setRowHeight(0, Layout::AUTO_SET);
loadWindowState();
}
@@ -121,17 +137,18 @@ void InventoryWindow::logic()
const int usedSlots = player_node->getInventory()->getNumberOfSlotsUsed();
- if (mMaxWeight != player_node->mMaxWeight ||
- mTotalWeight != player_node->mTotalWeight || mUsedSlots != usedSlots)
+ if (mMaxWeight != player_node->getMaxWeight() ||
+ mTotalWeight != player_node->getTotalWeight() ||
+ mUsedSlots != usedSlots)
{
- mTotalWeight = player_node->mTotalWeight;
- mMaxWeight = player_node->mMaxWeight;
+ mTotalWeight = player_node->getTotalWeight();
+ mMaxWeight = player_node->getMaxWeight();
mUsedSlots = usedSlots;
// Weight Bar coloration
if (mTotalWeight < (mMaxWeight / 3))
mWeightBar->setColor(0, 0, 255); // Blue
- else if (mTotalWeight < ((mMaxWeight / 3) * 2))
+ else if (mTotalWeight < ((mMaxWeight * 2) / 3))
mWeightBar->setColor(255, 255, 0); // Yellow
else
mWeightBar->setColor(255, 0, 0); // Red
@@ -141,7 +158,9 @@ void InventoryWindow::logic()
mWeightBar->setProgress((float) mTotalWeight / mMaxWeight);
mSlotsBar->setText(strprintf("%d/%d", mUsedSlots, mMaxSlots));
- mWeightBar->setText(strprintf("%dg/%dg", mTotalWeight, mMaxWeight));
+ mWeightBar->setText(strprintf("%s/%s",
+ Units::formatWeight(mTotalWeight).c_str(),
+ Units::formatWeight(mMaxWeight).c_str()));
}
}
@@ -154,6 +173,14 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
if (event.getId() == "use")
{
+#ifdef TMWSERV_SUPPORT
+ if (item->isEquipment()) {
+ player_node->equipItem(item);
+ }
+ else {
+ player_node->useItem(item->getInvIndex());
+ }
+#else
if (item->isEquipment())
{
if (item->isEquipped())
@@ -163,19 +190,33 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
}
else
player_node->useItem(item);
+#endif
}
else if (event.getId() == "drop")
{
- if (item->getQuantity() == 1)
- player_node->dropItem(item, 1);
- else
- {
+ if (item->getQuantity() > 1) {
// Choose amount of items to drop
new ItemAmountWindow(AMOUNT_ITEM_DROP, this, item);
}
+ else {
+ player_node->dropItem(item, 1);
+ }
+ mItems->selectNone();
+ }
+ else if (event.getId() == "split")
+ {
+ if (item && !item->isEquipment() && item->getQuantity() > 1) {
+ new ItemAmountWindow(AMOUNT_ITEM_SPLIT, this, item,
+ (item->getQuantity() - 1));
+ }
}
}
+Item* InventoryWindow::getSelectedItem() const
+{
+ return mItems->getSelectedItem();
+}
+
void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
{
Window::mouseClicked(event);
@@ -196,15 +237,55 @@ void InventoryWindow::mouseClicked(gcn::MouseEvent &event)
}
}
+#ifdef TMWSERV_SUPPORT
+void InventoryWindow::keyPressed(gcn::KeyEvent &event)
+{
+ switch (event.getKey().getValue())
+ {
+ case Key::LEFT_SHIFT:
+ case Key::RIGHT_SHIFT:
+ mSplit = true;
+ break;
+ }
+}
+
+void InventoryWindow::keyReleased(gcn::KeyEvent &event)
+{
+ switch (event.getKey().getValue())
+ {
+ case Key::LEFT_SHIFT:
+ case Key::RIGHT_SHIFT:
+ mSplit = false;
+ break;
+ }
+}
+#endif
+
+void InventoryWindow::valueChanged(const gcn::SelectionEvent &event)
+{
+ if (mSplit)
+ {
+ Item *item = mItems->getSelectedItem();
+
+ if (item && !item->isEquipment() && item->getQuantity() > 1)
+ {
+ mSplit = false;
+ new ItemAmountWindow(AMOUNT_ITEM_SPLIT, this, item, (item->getQuantity() - 1));
+ }
+ }
+}
+
void InventoryWindow::updateButtons()
{
const Item *selectedItem = mItems->getSelectedItem();
if (selectedItem && selectedItem->isEquipment())
{
+#ifdef EATHENA_SUPPORT
if (selectedItem->isEquipped())
mUseButton->setCaption(_("Unequip"));
else
+#endif
mUseButton->setCaption(_("Equip"));
}
else
@@ -212,9 +293,15 @@ void InventoryWindow::updateButtons()
mUseButton->setEnabled(selectedItem != 0);
mDropButton->setEnabled(selectedItem != 0);
-}
-Item* InventoryWindow::getSelectedItem() const
-{
- return mItems->getSelectedItem();
+#ifdef TMWSERV_SUPPORT
+ if (selectedItem && !selectedItem->isEquipment() &&
+ selectedItem->getQuantity() > 1)
+ {
+ mSplitButton->setEnabled(true);
+ }
+ else {
+ mSplitButton->setEnabled(false);
+ }
+#endif
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-05-10 23:25:40 +0000