- Added handling of type BL_PET to skill_unitgrouptickset_search. I know pets normally aren't affected by skills, but their structure already had support for this, so....

- Rewrote/simplified functions skill_addtimerskill/skill_cleartimerskill
- Fixed SC_DANCING for non players (was making dances only last 1 second for them)
- Modified map_moveblock to handle calls to skill_unit_move_unit_group and cancelling of Close Confine effects, removed these checks from the walk functions and skill_blown functions.


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

1 files changed, 7 insertions, 5 deletions

diff --git a/src/map/status.c b/src/map/status.c
index b4abbd74a..3818d5b38 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5545,7 +5545,9 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
 		{

 			int s = 0;

 			int sp = 1;

-			if(sd && (--sc->data[type].val3) > 0) {

+			if (--sc->data[type].val3 <= 0)

+				break;

+			if(sd) {

 				switch(sc->data[type].val1){

 				case BD_RICHMANKIM:				/* ƒjƒˆƒ‹ƒh‚̉ƒ 3•b‚ÉSP1 */

 				case BD_DRUMBATTLEFIELD:		/* ?‘¾ŒÛ‚Ì‹¿‚« 3•b‚ÉSP1 */

@@ -5591,11 +5593,11 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
 					if (sd->status.sp <= 0)

 						break;

 				}

-				sc->data[type].timer=add_timer(	/* ƒ^ƒCƒ}?�Ä�Ý’è */

-					1000+tick, status_change_timer,

-					bl->id, data);

-				return 0;

 			}

+			sc->data[type].timer=add_timer(	/* ƒ^ƒCƒ}?�Ä�Ý’è */

+				1000+tick, status_change_timer,

+				bl->id, data);

+			return 0;

 		}

 		break;