diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-19 15:49:45 +0300 |
| commit | b30a5d2289a0b68410dee5343e148aba88ea4839 (patch) | |
| tree | 9d756785b9166ced76675ad3ebe398c09b494a3c /src/gui/inventorywindow.cpp | |
| parent | 9a3a196dbf633a699c26d0227802a42f025c8bfd (diff) | |
| parent | 164e4ed5a153ce06badb52f3a5a4dff16c58d7e6 (diff) | |
| download | plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.gz plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.bz2 plus-b30a5d2289a0b68410dee5343e148aba88ea4839.tar.xz plus-b30a5d2289a0b68410dee5343e148aba88ea4839.zip | |
Merge branch 'master' into stripped
Diffstat (limited to 'src/gui/inventorywindow.cpp')
| -rw-r--r-- | src/gui/inventorywindow.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index 23f1e6fcf..8c59d10eb 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -113,7 +113,7 @@ InventoryWindow::InventoryWindow(Inventory *inventory): setWindowName("Inventory"); } - listen(Mana::CHANNEL_ATTRIBUTES); + listen(CHANNEL_ATTRIBUTES); if (setupWindow) setupWindow->registerWindowForReset(this); @@ -585,10 +585,10 @@ void InventoryWindow::close() } } -void InventoryWindow::processEvent(Mana::Channels channel A_UNUSED, - const Mana::Event &event) +void InventoryWindow::processEvent(Channels channel A_UNUSED, + const Event &event) { - if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE) + if (event.getName() == EVENT_UPDATEATTRIBUTE) { int id = event.getInt("id"); if (id == TOTAL_WEIGHT || id == MAX_WEIGHT) |