diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-29 08:19:07 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-29 08:19:07 +0000 |
| commit | e7bae02e70b98330adbf1a44ace9a9939636cd50 (patch) | |
| tree | 4081aac30fe79be4d8364435dc31439e7b2c8ff5 /src/map/mercenary.c | |
| parent | b91483219d36a4fb7359a5fdc17cedaf73b18dc5 (diff) | |
| download | hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.gz hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.bz2 hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.tar.xz hercules-e7bae02e70b98330adbf1a44ace9a9939636cd50.zip | |
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
Diffstat (limited to 'src/map/mercenary.c')
| -rw-r--r-- | src/map/mercenary.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |