- Corrected Musical Strike having a different damage equation from Throw Arrow.

- Some minor cleanup of Soul Change 
- Added state rewarp to players. It gets set when a pc_setpos call is triggered while the player is changing maps so that when the player finish loading the map, it is inmediately rewarped to where it has been rewarped/recalled to.


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

1 files changed, 3 insertions, 8 deletions

diff --git a/src/map/pc.c b/src/map/pc.c
index 417aab16f..63d097b14 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3167,13 +3167,6 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
 		ShowDebug("pc_setpos: Passed mapindex(%d) is invalid!\n", mapindex);

 		return 1;

 	}

-	if(sd->state.auth && sd->bl.prev == NULL)

-	{	//Should NOT move a character while it is not in a map (changing between maps, for example)

-		//state.auth helps identifies if this is the initial setpos rather than a normal map-change set pos.

-		if (battle_config.etc_log)

-			ShowInfo("pc_setpos failed: Attempted to relocate player %s (%d:%d) while it is still between maps.\n", sd->status.name, sd->status.account_id, sd->status.char_id);

-		return 3;

-	}

 

 	m=map_mapindex2mapid(mapindex);

 

@@ -3246,7 +3239,9 @@ int pc_setpos(struct map_session_data *sd,unsigned short mapindex,int x,int y,in
 		if(sd->status.pet_id > 0 && sd->pd)

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

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

-	}

+	} else if(sd->state.auth)

+		//Tag player for rewarping after map-loading is done. [Skotlex]

+		sd->state.rewarp = 1;

 	

 	sd->mapindex =  mapindex;

 	sd->bl.m = m;