summaryrefslogtreecommitdiff
path: root/aethyra.cbp
diff options
context:
space:
mode:
authorIra Rice <irarice@gmail.com>2009-01-12 15:41:10 -0700
committerIra Rice <irarice@gmail.com>2009-01-12 15:41:10 -0700
commit7f8f7bcd329e62d240914686b01a9cd68624309c (patch)
tree1256aff76fa3f81b62724e73197eb94d231d9045 /aethyra.cbp
parentfc1539e019b6d916d1470ddf1f31997044af8396 (diff)
downloadmana-client-7f8f7bcd329e62d240914686b01a9cd68624309c.tar.gz
mana-client-7f8f7bcd329e62d240914686b01a9cd68624309c.tar.bz2
mana-client-7f8f7bcd329e62d240914686b01a9cd68624309c.tar.xz
mana-client-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 'aethyra.cbp')
-rw-r--r--aethyra.cbp14
1 files changed, 8 insertions, 6 deletions
diff --git a/aethyra.cbp b/aethyra.cbp
index 0ede5d07..67d8d7d2 100644
--- a/aethyra.cbp
+++ b/aethyra.cbp
@@ -100,6 +100,8 @@
<Unit filename="src\configuration.h" />
<Unit filename="src\effectmanager.cpp" />
<Unit filename="src\effectmanager.h" />
+ <Unit filename="src\emoteshortcut.cpp" />
+ <Unit filename="src\emoteshortcut.h" />
<Unit filename="src\engine.cpp" />
<Unit filename="src\engine.h" />
<Unit filename="src\equipment.cpp" />
@@ -141,6 +143,12 @@
<Unit filename="src\gui\connection.h" />
<Unit filename="src\gui\debugwindow.cpp" />
<Unit filename="src\gui\debugwindow.h" />
+ <Unit filename="src\gui\emotecontainer.cpp" />
+ <Unit filename="src\gui\emotecontainer.h" />
+ <Unit filename="src\gui\emoteshortcutcontainer.cpp" />
+ <Unit filename="src\gui\emoteshortcutcontainer.h" />
+ <Unit filename="src\gui\emotewindow.cpp" />
+ <Unit filename="src\gui\emotewindow.h" />
<Unit filename="src\gui\equipmentwindow.cpp" />
<Unit filename="src\gui\equipmentwindow.h" />
<Unit filename="src\gui\focushandler.cpp" />
@@ -223,12 +231,6 @@
<Unit filename="src\gui\skill.h" />
<Unit filename="src\gui\slider.cpp" />
<Unit filename="src\gui\slider.h" />
- <Unit filename="src\gui\smileycontainer.cpp" />
- <Unit filename="src\gui\smileycontainer.h" />
- <Unit filename="src\gui\smileyshortcutcontainer.cpp" />
- <Unit filename="src\gui\smileyshortcutcontainer.h" />
- <Unit filename="src\gui\smileywindow.cpp" />
- <Unit filename="src\gui\smileywindow.h" />
<Unit filename="src\gui\speechbubble.cpp" />
<Unit filename="src\gui\speechbubble.h" />
<Unit filename="src\gui\status.cpp" />