Union now consumes sp when not soul linked. (bugreport:1155)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12499 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2008/04/05
+	* Union now consumes sp when not soul linked. (r12499) [Kevin]
 	* Running into a wall/npc/pc/mob no longer enables spurt. (r12498) [Kevin]
 	* Fixed unable to move after using a skill to break out of sprint. (r12497) [Kevin]
 	* DMG no longer stops running. (r12488) [Kevin]

src/map/skill.c

@@ -7915,7 +7915,8 @@ int skill_check_condition(struct map_session_data* sd, short skill, short lv, in
 		if (sc && sc->data[SC_SPIRIT] && sc->data[SC_SPIRIT]->val2 == SL_STAR)
 			break;
 		//Auron insists we should implement SP consumption when you are not Soul Linked. [Skotlex]
-		if(sp>0 && type&1)
+		//Only invoke on skill begin cast (instant cast skill). [Kevin]
+		if(sp>0 && !type)
 		{ 
 			if (status->sp < (unsigned int)sp)
 				clif_skill_fail(sd,skill,1,0);