- Fixed pc_setpos ignoring the clrtype sent to it.

- unit_free will now use clear type 3 for players (warping out effect)
- You can't invite someone to a guild now within Guild Castles.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5945 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 4 insertions, 4 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index 93e0da84a..baf7c7dcc 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3044,14 +3044,14 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
 		if(sd->mapindex){

 			int ip,port;

 			if(map_mapname2ipport(mapindex,&ip,&port)==0){

-				unit_remove_map(&sd->bl,3);

+				unit_remove_map(&sd->bl,clrtype);

 				sd->mapindex = mapindex;

 				sd->bl.x=x;

 				sd->bl.y=y;

 				sd->state.waitingdisconnect=1;

 				pc_clean_skilltree(sd);

 				if(sd->status.pet_id > 0 && sd->pd) {

-					unit_remove_map(&sd->pd->bl, 0);

+					unit_remove_map(&sd->pd->bl, clrtype);

 					intif_save_petdata(sd->status.account_id,&sd->pet);

 				}

 				chrif_save(sd,1);

@@ -3083,9 +3083,9 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
 	}

 

 	if(sd->bl.prev != NULL){

-		unit_remove_map(&sd->bl, 3);

+		unit_remove_map(&sd->bl, clrtype);

 		if(sd->status.pet_id > 0 && sd->pd)

-			unit_remove_map(&sd->pd->bl, 3);

+			unit_remove_map(&sd->pd->bl, clrtype);

 		clif_changemap(sd,map[m].index,x,y); // [MouseJstr]

 	}