summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorJan-Fabian Humann <malastare@gmx.net>2005-05-12 18:34:52 +0000
committerJan-Fabian Humann <malastare@gmx.net>2005-05-12 18:34:52 +0000
commit308e722a1b3fc34ade98e88b050a024cbd2c9f78 (patch)
treeb7228180c846751ac44d792c415442f77acecdb6 /src/game.cpp
parentabe13c1a2b9338e9a3001128954cc9fb6125ce0f (diff)
downloadmana-308e722a1b3fc34ade98e88b050a024cbd2c9f78.tar.gz
mana-308e722a1b3fc34ade98e88b050a024cbd2c9f78.tar.bz2
mana-308e722a1b3fc34ade98e88b050a024cbd2c9f78.tar.xz
mana-308e722a1b3fc34ade98e88b050a024cbd2c9f78.zip
trade fixes as usual + quit dialog pops up now instead of being under other windows
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 18ef46a0..1ec08e0c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -289,6 +289,7 @@ void do_input()
if (event.key.keysym.sym == SDLK_ESCAPE)
{
quitDialog->setVisible(true);
+ quitDialog->requestMoveToTop();
}
if (keysym.sym == SDLK_g && !chatWindow->isFocused())
@@ -815,7 +816,7 @@ void do_parse()
break;
// Trade: Item added on trade partner's side
case 0x00e9:
- // todo:
+ // TODO:
// Maybe also handle identified, etc
// handle zeny as well
@@ -835,7 +836,7 @@ void do_parse()
inventoryWindow->unequipItem(RFIFOW(2));
}
}
-
+ //TODO: Fix this lines (to handle correct quantity)
tradeWindow->addItem(
tradeWindow->myItems->getFreeSlot(),
inventoryWindow->items->getId(RFIFOW(2)),