From e7bae02e70b98330adbf1a44ace9a9939636cd50 Mon Sep 17 00:00:00 2001 From: ultramage Date: Tue, 29 Jul 2008 08:19:07 +0000 Subject: Renamed struct 'skill' to 's_skill' to remove naming collisions. Added defines for mercenary skill ranges. Added a mapping of mercenary skills to the skill db (700-799 atm). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13012 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/mercenary.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/map/mercenary.c') diff --git a/src/map/mercenary.c b/src/map/mercenary.c index 6a027029f..c56c36cdb 100644 --- a/src/map/mercenary.c +++ b/src/map/mercenary.c @@ -836,7 +836,7 @@ int merc_hom_shuffle(struct homun_data *hd) struct map_session_data *sd; int lv, i, skillpts; unsigned int exp; - struct skill b_skill[MAX_HOMUNSKILL]; + struct s_skill b_skill[MAX_HOMUNSKILL]; if (!merc_is_hom_active(hd)) return 0; -- cgit v1.2.3-60-g2f50