* Fixed bugreport:4687, @lostskill was removing the skill from skill tree and not disabling it (making it grey);

* Fixed mercenary window not showing up critical (bugreport:2369).

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

conf/battle/battle.conf

@@ -6,7 +6,7 @@
 // Note 1: Value is a config switch (on/off, yes/no or 1/0)
 // Note 2: Value is in percents (100 means 100%)
 // Note 3: Value is a bit field. If no description is given,
-//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun)
+//         assume unit types (1: Pc, 2: Mob, 4: Pet, 8: Homun, 16: Mercenary)
 //--------------------------------------------------------------
 
 // Who should have a baseatk value (makes str affect damage)? (Note 3)
@@ -17,7 +17,7 @@ enable_perfect_flee: 1
 
 // Who can have critical attacks? (Note 3)
 // (Note that there are some skills that always do critical hit regardless of this)
-enable_critical: 1
+enable_critical: 17
 
 // Critical adjustment rate for non-players (Note 2)
 mob_critical_rate: 100

src/map/clif.c

@@ -4698,9 +4698,8 @@ void clif_deleteskill(struct map_session_data *sd, int id)
 	WFIFOW(fd,0) = 0x441;
 	WFIFOW(fd,2) = id;
 	WFIFOSET(fd,packet_len(0x441));
-#else
-	clif_skillinfoblock(sd);
 #endif
+	clif_skillinfoblock(sd);
 }