Changeset 24 for src/map/unit.c

Timestamp:

07/07/08 22:48:26 (17 years ago)

Author:

jinshiro

Message:

 

Files:

• src/map/unit.c (modified) (5 diffs)

src/map/unit.c

@@ -374 +374 @@
         if (sc && sc->data[SC_CONFUSION]) //Randomize the target position
                 map_random_dir(bl, &ud->to_x, &ud->to_y);
-
         if (sc && sc->data[SC_FEAR]) //Flee from my target [Brainstorm]
-        unit_escape(bl, tbl, 15);
-
+                unit_escape(bl, tbl, 15);
 
         if(ud->walktimer != -1) {
@@ -1091 +1089 @@
         if(casttime > 0) {
                 ud->skilltimer = add_timer( tick+casttime, skill_castend_id, src->id, 0 );
-                if(sd && pc_checkskill(sd,SA_FREECAST))
-                        status_freecast_switch(sd);
+                if( sd && pc_checkskill(sd,SA_FREECAST) > 0 )
+                        status_calc_bl(&sd->bl, SCB_SPEED);
                 else
                         unit_stop_walking(src,1);
@@ -1192 +1190 @@
         if(casttime > 0) {
                 ud->skilltimer = add_timer( tick+casttime, skill_castend_pos, src->id, 0 );
-                if(sd && pc_checkskill(sd,SA_FREECAST))
-                        status_freecast_switch(sd);
+                if( sd && pc_checkskill(sd,SA_FREECAST) > 0 )
+                        status_calc_bl(&sd->bl, SCB_SPEED);
                 else
                         unit_stop_walking(src,1);
@@ -1525 +1523 @@
         }
         
-        ud->canact_tick=tick;
-        if(sd && pc_checkskill(sd,SA_FREECAST))
-                status_freecast_switch(sd);
-        
+        ud->canact_tick = tick;
+
         if(type&1 && sd)
                 skill = sd->skillid_old;
@@ -1540 +1536 @@
         if(ret<0)
                 ShowError("delete timer error : skillid : %d\n",ret);
-        
+
+        ud->skilltimer = -1;
+
+        if( sd && pc_checkskill(sd,SA_FREECAST) > 0 )
+                status_calc_bl(&sd->bl, SCB_SPEED);
+
         if(bl->type==BL_MOB) ((TBL_MOB*)bl)->skillidx  = -1;
 
-        ud->skilltimer = -1;
         clif_skillcastcancel(bl);
         return 1;