- Made Deluge/volcano/v. gale be castable on top of each other again

- Modified unit_walktoxy and NPC_RUN to enable running even when the caster does not has the MD_CANMOVE bit on.
- PF_MINDBREAKER will now silently fail if you try to use it on someone who already has the status active.
- Cleaned up yet again skill_landprotector, now new cells of Deluge/Volcano/V.Gale will delete previous cells when they are recasted on top of each other.
- Summoned Marine Spheres no longer get the MD_CANMOVE bit.


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

1 files changed, 6 insertions, 3 deletions

diff --git a/src/map/unit.c b/src/map/unit.c
index 606d64801..9d2356d58 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -258,6 +258,7 @@ static int unit_walktoxy_timer(int tid,unsigned int tick,int id,int data)
 	return 0;
 }
 
+//Easy parameter: &1 -> 1/2 = easy/hard, &2 -> ignore MD_CANMOVE check
 int unit_walktoxy( struct block_list *bl, int x, int y, int easy) {
 	struct unit_data        *ud = NULL;
 	struct status_change		*sc = NULL;
@@ -271,11 +272,13 @@ int unit_walktoxy( struct block_list *bl, int x, int y, int easy) {
 	
 	if( ud == NULL) return 0;
 
-	// 移動出来ないユニットは弾く
-	if(!(status_get_mode(bl)&MD_CANMOVE) || !unit_can_move(bl))
+	if(!(easy&2) && !status_get_mode(bl)&MD_CANMOVE)
+		return 0;
+	
+	if (!unit_can_move(bl))
 		return 0;
 
-	ud->state.walk_easy = easy;
+	ud->state.walk_easy = easy&1;
 	ud->target = 0;
 	ud->to_x = x;
 	ud->to_y = y;