- 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, 4 deletions

diff --git a/src/map/skill.c b/src/map/skill.c
index a07db8ba0..7f460e507 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -5085,10 +5085,9 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			}
 			sp1 = sstatus->sp;
 			sp2 = tstatus->sp;
-			status_zap(src, 0, sp1);
-			status_zap(bl, 0, sp2);
-			status_heal(src, 0, sp2, 3);
-			status_heal(bl, 0, sp1, 3);
+			//TODO: Will this work correctly once sp1/sp2 go above INT_MAX?
+			status_heal(src, 0, (signed int)(sp2-sp1), 3);
+			status_heal(bl, 0, (signed int)(sp1-sp2), 3);
 			clif_skill_nodamage(src,bl,skillid,skilllv,1);
 		}
 		break;