diff options
author | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 06:38:03 +0000 |
---|---|---|
committer | brianluau <brianluau@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 06:38:03 +0000 |
commit | 8b8f847bb862c2cfa31557fb54d81e3e7b5c6be4 (patch) | |
tree | 03a20ec3e80d4b44c145875bf91bd77e452914f6 /src/map/status.c | |
parent | 170f8fe0c31c0fb2a92ff3e21e34e2d63992e726 (diff) | |
download | hercules-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/status.c')
-rw-r--r-- | src/map/status.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/status.c b/src/map/status.c index b15229308..790e02571 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -9313,7 +9313,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) } } - clif_emotion(bl,18); + clif_emotion(bl,E_HEH); sc_timer_next(4000+tick,status_change_timer,bl->id,data); } return 0; @@ -9337,7 +9337,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) case SC_OBLIVIONCURSE: if( --(sce->val4) >= 0 ) { - clif_emotion(bl,1); + clif_emotion(bl,E_WHAT); sc_timer_next(3000 + tick, status_change_timer, bl->id, data ); return 0; } @@ -9488,7 +9488,7 @@ int status_change_timer(int tid, unsigned int tick, int id, intptr_t data) case SC_VOICEOFSIREN: if( --(sce->val4) >= 0 ) { - clif_emotion(bl,3); + clif_emotion(bl,E_LV); sc_timer_next(2000 + tick, status_change_timer, bl->id, data); return 0; } |