- Fixed Magnum break's animation not showing if the fire-elemental bonus did not start.

- Removed some last traces of waterlevel reading.


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

npc/scripts_mapflags.conf

@@ -36,5 +36,4 @@ npc: conf/mapflag/pvp_noparty.txt
 npc: conf/mapflag/pvp_noguild.txt
 npc: conf/mapflag/night.txt
 npc: conf/mapflag/restricted.txt
-water_height: conf/mapflag/water_height.txt
 // --------------------------------------------------------------

src/map/map.c

@@ -3257,8 +3257,6 @@ int map_config_read(char *cfgName) {
 			} else if (strcmpi(w1, "map_port") == 0) {
 				clif_setport(atoi(w2));
 				map_port = (atoi(w2));
-			//} else if (strcmpi(w1, "water_height") == 0) {
-			//	map_readwater(w2);
 			} else if (strcmpi(w1, "map") == 0) {
 				map_addmap(w2);
 			} else if (strcmpi(w1, "delmap") == 0) {

src/map/pc.c

@@ -3835,7 +3835,7 @@ int pc_follow_timer(int tid,unsigned int tick,int id,int data)
 			pc_setpos(sd, tsd->mapindex, tsd->bl.x, tsd->bl.y, 3);
 	}
 	sd->followtimer = add_timer(
-		tick + sd->aspd + rand() % 1000,	// increase time a bit to loosen up map's load
+		tick + 1000,	// increase time a bit to loosen up map's load
 		pc_follow_timer, sd->bl.id, 0);
 	return 0;
 }

src/map/skill.c

@@ -2773,9 +2773,8 @@ int skill_castend_damage_id (struct block_list* src, struct block_list *bl,int s
 				src,skillid,skilllv,tick, flag|BCT_ENEMY|1,
 				skill_castend_damage_id);
 			//Initiate 10% of your damage becomes fire element.
-			clif_skill_nodamage (src,bl,skillid,skilllv,
-				sc_start4(src,SC_WATK_ELEMENT,100,
-					3,20,0,0,skill_get_time2(skillid, skilllv)));
+			clif_skill_nodamage (src,bl,skillid,skilllv,1);
+			sc_start4(src,SC_WATK_ELEMENT,100,3,20,0,0,skill_get_time2(skillid, skilllv));
 			if (sd) skill_blockpc_start (sd, skillid, skill_get_time(skillid, skilllv));
 		}
 		break;
@@ -3684,8 +3683,8 @@ int skill_castend_nodamage_id (struct block_list *src, struct block_list *bl, in
 			src,skillid,skilllv,tick, flag|BCT_ENEMY|1,
 			skill_castend_damage_id);
  //Initiate 10% of your damage becomes fire element.
-		clif_skill_nodamage (src,src,skillid,skilllv,
-			sc_start4(src,SC_WATK_ELEMENT,100,3,20,0,0,skill_get_time2(skillid, skilllv)));
+		clif_skill_nodamage (src,src,skillid,skilllv,1);
+		sc_start4(src,SC_WATK_ELEMENT,100,3,20,0,0,skill_get_time2(skillid, skilllv));
 		if (sd) skill_blockpc_start (sd, skillid, skill_get_time(skillid, skilllv));
 		break;
 	case LK_BERSERK:		/* ƒo?ƒT?ƒN */