diff options
author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-28 22:43:10 +0000 |
---|---|---|
committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-11-28 22:43:10 +0000 |
commit | f5211cd347e39ea4c97c354006811cd251961687 (patch) | |
tree | 2b333464005bbb08bd465d9dceafb73018d97b11 /src/map/pet.c | |
parent | dc1175bda087b4b4ce657a114225b5daefbcf5c4 (diff) | |
download | hercules-f5211cd347e39ea4c97c354006811cd251961687.tar.gz hercules-f5211cd347e39ea4c97c354006811cd251961687.tar.bz2 hercules-f5211cd347e39ea4c97c354006811cd251961687.tar.xz hercules-f5211cd347e39ea4c97c354006811cd251961687.zip |
* Added emotion_type enumeration for clif_emotion constants.
- Made clif_parse_Emotion use clif_emotion, rather than having it's code inlined.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14518 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
-rw-r--r-- | src/map/pet.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index d3758b9e5..843f1cc11 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -509,7 +509,7 @@ int pet_catch_process2(struct map_session_data* sd, int target_id) if (sd->catch_target_class == 0 && !(md->status.mode&MD_BOSS)) sd->catch_target_class = md->class_; if(i < 0 || sd->catch_target_class != md->class_) { - clif_emotion(&md->bl, 7); //mob will do /ag if wrong lure is used on them. + clif_emotion(&md->bl, E_AG); //mob will do /ag if wrong lure is used on them. clif_pet_roulette(sd,0); sd->catch_target_class = -1; return 1; @@ -1100,7 +1100,7 @@ int pet_recovery_timer(int tid, unsigned int tick, int id, intptr data) //Detoxify is chosen for now. clif_skill_nodamage(&pd->bl,&sd->bl,TF_DETOXIFY,1,1); status_change_end(&sd->bl,pd->recovery->type,-1); - clif_emotion(&pd->bl, 33); + clif_emotion(&pd->bl, E_OK); } pd->recovery->timer = INVALID_TIMER; |