diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-04 23:26:22 +0200 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-05-04 23:41:45 +0200 |
commit | 6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d (patch) | |
tree | a4ae355fe26eda518a5fd82c15347b6cfcf6b7f6 /src/gui/setup.cpp | |
parent | 1b06ec9f12e3fbfe6fbf6579fb64bb895464badb (diff) | |
download | mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.gz mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.bz2 mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.tar.xz mana-6cacaa3d7f55d91d8b7ca178f8595cc6c6b4383d.zip |
Replaced emote window with a new emote popup
The popup is meant to be temporary, showing the emote instantly when you
click on it. It adapts nicely to show any number of emotes.
I still need to add a better way of assigning emote shortcuts, since
currently you can only change which emote is assigned to which shortcut
by actually using it.
Diffstat (limited to 'src/gui/setup.cpp')
-rw-r--r-- | src/gui/setup.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp index 5dbce81b..ee69eaaf 100644 --- a/src/gui/setup.cpp +++ b/src/gui/setup.cpp @@ -43,7 +43,6 @@ extern Window *buyDialog; extern Window *sellDialog; extern Window *buySellDialog; extern Window *inventoryWindow; -extern Window *emoteWindow; extern Window *npcTextDialog; extern Window *npcStringDialog; extern Window *skillDialog; @@ -145,7 +144,6 @@ void Setup::action(const gcn::ActionEvent &event) buySellDialog->resetToDefaultSize(); #endif inventoryWindow->resetToDefaultSize(); - emoteWindow->resetToDefaultSize(); skillDialog->resetToDefaultSize(); minimap->resetToDefaultSize(); equipmentWindow->resetToDefaultSize(); @@ -168,4 +166,4 @@ void Setup::setInGame(bool inGame) mResetWindows->setEnabled(inGame); } -Setup* setupWindow; +Setup *setupWindow; |