diff options
| author | Ira Rice <irarice@gmail.com> | 2009-01-12 15:41:10 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2009-01-12 15:41:10 -0700 |
| commit | 7f8f7bcd329e62d240914686b01a9cd68624309c (patch) | |
| tree | 1256aff76fa3f81b62724e73197eb94d231d9045 /src/main.cpp | |
| parent | fc1539e019b6d916d1470ddf1f31997044af8396 (diff) | |
| download | mana-7f8f7bcd329e62d240914686b01a9cd68624309c.tar.gz mana-7f8f7bcd329e62d240914686b01a9cd68624309c.tar.bz2 mana-7f8f7bcd329e62d240914686b01a9cd68624309c.tar.xz mana-7f8f7bcd329e62d240914686b01a9cd68624309c.zip | |
Some rather pedantic changes. Unified all naming for emoticons in the
code so that only one term is used everywhere (to simplify
maintainability), as well as corrected several variable names and
comments where there was copy/pasted code, but it wasn't corrected. Also
moved emote shortcuts back to where they were originally, to reduce
player confusion when the next build comes around.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index d9ebaefa..3cf8611d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -40,7 +40,6 @@ #include "game.h" #include "graphics.h" #include "itemshortcut.h" -#include "smileyshortcut.h" #include "keyboardconfig.h" #include "localplayer.h" #include "lockedarray.h" @@ -57,6 +56,7 @@ #include "gui/char_server.h" #include "gui/char_select.h" #include "gui/colour.h" +#include "gui/emoteshortcut.h" #include "gui/gui.h" #include "gui/login.h" #include "gui/ok_dialog.h" @@ -403,8 +403,8 @@ void init_engine(const Options &options) // Initialize the item shortcuts. itemShortcut = new ItemShortcut(); - // Initialize the smiley shortcuts. - smileyShortcut = new SmileyShortcut(); + // Initialize the emote shortcuts. + emoteShortcut = new EmoteShortcut(); gui = new Gui(graphics); state = LOGIN_STATE; /**< Initial game state */ @@ -438,7 +438,7 @@ void exit_engine() // Before config.write() since it writes the shortcuts to the config delete itemShortcut; - delete smileyShortcut; + delete emoteShortcut; config.write(); |