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/Makefile.am | |
| 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/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e189b793..96be8465 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,6 +33,12 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/connection.h \ gui/debugwindow.cpp \ gui/debugwindow.h \ + gui/emotecontainer.cpp \ + gui/emotecontainer.h \ + gui/emoteshortcutcontainer.cpp \ + gui/emoteshortcutcontainer.h \ + gui/emotewindow.cpp \ + gui/emotewindow.h \ gui/equipmentwindow.cpp \ gui/equipmentwindow.h \ gui/focushandler.cpp \ @@ -117,12 +123,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ gui/skill.h \ gui/slider.cpp \ gui/slider.h \ - gui/smileycontainer.cpp \ - gui/smileycontainer.h \ - gui/smileyshortcutcontainer.cpp \ - gui/smileyshortcutcontainer.h \ - gui/smileywindow.cpp \ - gui/smileywindow.h \ gui/speechbubble.cpp \ gui/speechbubble.h \ gui/status.cpp \ @@ -252,6 +252,8 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ configuration.h \ effectmanager.cpp \ effectmanager.h \ + emoteshortcut.cpp \ + emoteshortcut.h \ engine.cpp \ engine.h \ equipment.cpp \ @@ -272,8 +274,6 @@ aethyra_SOURCES = gui/widgets/dropdown.cpp \ inventory.h \ item.cpp \ item.h \ - smileyshortcut.cpp \ - smileyshortcut.h \ itemshortcut.cpp \ itemshortcut.h \ joystick.cpp \ |