summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-28 21:41:38 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-11-28 21:41:38 +0000
commitdc1175bda087b4b4ce657a114225b5daefbcf5c4 (patch)
tree906c022c31ea0966b12519d8d105627da335789f /src/map/status.c
parentfcf5b330c38bc7a48e774163c5624428f25aead6 (diff)
downloadhercules-dc1175bda087b4b4ce657a114225b5daefbcf5c4.tar.gz
hercules-dc1175bda087b4b4ce657a114225b5daefbcf5c4.tar.bz2
hercules-dc1175bda087b4b4ce657a114225b5daefbcf5c4.tar.xz
hercules-dc1175bda087b4b4ce657a114225b5daefbcf5c4.zip
* Added clr_type enumeration for vanish effect constants.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14517 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/status.c b/src/map/status.c
index a9bf031e1..3b9213ca5 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -831,16 +831,16 @@ int status_damage(struct block_list *src,struct block_list *target,int hp, int s
status_change_clear(target,0);
if(flag&4) //Delete from memory. (also invokes map removal code)
- unit_free(target,1);
+ unit_free(target,CLR_DEAD);
else
if(flag&2) //remove from map
- unit_remove_map(target,1);
+ unit_remove_map(target,CLR_DEAD);
else
{ //Some death states that would normally be handled by unit_remove_map
unit_stop_attack(target);
unit_stop_walking(target,1);
unit_skillcastcancel(target,0);
- clif_clearunit_area(target,1);
+ clif_clearunit_area(target,CLR_DEAD);
skill_unit_move(target,gettick(),4);
skill_cleartimerskill(target);
}
@@ -5953,7 +5953,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
int pos = (bl->x&0xFFFF)|(bl->y<<16), //Current Coordinates
map = sd->mapindex; //Current Map
//1. Place in Jail (val2 -> Jail Map, val3 -> x, val4 -> y
- pc_setpos(sd,(unsigned short)val2,val3,val4, 3);
+ pc_setpos(sd,(unsigned short)val2,val3,val4, CLR_TELEPORT);
//2. Set restore point (val3 -> return map, val4 return coords
val3 = map;
val4 = pos;
@@ -6736,7 +6736,7 @@ int status_change_end(struct block_list* bl, enum sc_type type, int tid)
break;
//natural expiration.
if(sd && sd->mapindex == sce->val2)
- pc_setpos(sd,(unsigned short)sce->val3,sce->val4&0xFFFF, sce->val4>>16, 3);
+ pc_setpos(sd,(unsigned short)sce->val3,sce->val4&0xFFFF, sce->val4>>16, CLR_TELEPORT);
break; //guess hes not in jail :P
case SC_CHANGE:
if (tid == -1)