summaryrefslogtreecommitdiff
path: root/src/map/clif.h
diff options
context:
space:
mode:
authorbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-22 06:38:03 +0000
committerbrianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-04-22 06:38:03 +0000
commit8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4 (patch)
tree03a20ec3e80d4b44c145875bf91bd77e452914f6 /src/map/clif.h
parent170f8fe0c31c0fb2a92ff3e21e34e2d63992e726 (diff)
downloadhercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.tar.gz
hercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.tar.bz2
hercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.tar.xz
hercules-8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4.zip
- Changed @pettalk /dice to roll random 1-6 (before it always rolled 1).
- Added more /emotions to pet emotion processing. - Removed the clif_skill_fail so it doesn't spam them with a message (the client limits spamming clif_parse_Emotion, but not spamming @commands). - Follow up to r15009: used clif_emotion constants (see r14518). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15916 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/clif.h')
-rw-r--r--src/map/clif.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/map/clif.h b/src/map/clif.h
index 3dcab7379..9ef748ecb 100644
--- a/src/map/clif.h
+++ b/src/map/clif.h
@@ -140,9 +140,9 @@ typedef enum emotion_type
E_FLASH, // /fsh
E_SPIN, // /spin
E_SIGH,
- E_PROUD, // /dum
+ E_DUM, // /dum
E_LOUD, // /crwd
- E_OHNOES, // /desp, /otl
+ E_OTL, // /otl, /desp
E_DICE1,
E_DICE2,
E_DICE3, // --- 60
@@ -150,15 +150,15 @@ typedef enum emotion_type
E_DICE5,
E_DICE6,
E_INDIA,
- E_LOOSER,
+ E_LUV, // /love
E_RUSSIA,
E_VIRGIN,
- E_PHONE,
+ E_MOBILE,
E_MAIL,
E_CHINESE, // --- 70
- E_SIGNAL,
- E_SIGNAL2,
- E_SIGNAL3,
+ E_ANTENNA1,
+ E_ANTENNA2,
+ E_ANTENNA3,
E_HUM,
E_ABS,
E_OOPS,