summaryrefslogtreecommitdiff
path: root/src/map/mercenary.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2017-11-18 19:01:51 +0100
committerGitHub <noreply@github.com>2017-11-18 19:01:51 +0100
commita63c82c8bd29fd829a5d8cfba7d02d11cf4634c5 (patch)
tree8f369881467a3d1a9a5a0a4fb16631ad6d33e44e /src/map/mercenary.c
parent93fe9834c3075bad0fc1ba1dd075147d7de3b73a (diff)
parent13b1d22dccc7a0e816963f070248e11c73538bd1 (diff)
downloadhercules-a63c82c8bd29fd829a5d8cfba7d02d11cf4634c5.tar.gz
hercules-a63c82c8bd29fd829a5d8cfba7d02d11cf4634c5.tar.bz2
hercules-a63c82c8bd29fd829a5d8cfba7d02d11cf4634c5.tar.xz
hercules-a63c82c8bd29fd829a5d8cfba7d02d11cf4634c5.zip
Merge pull request #1896 from MishimaHaruna/skill_id_idx
Skill ID / IDX fixes
Diffstat (limited to 'src/map/mercenary.c')
-rw-r--r--src/map/mercenary.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/mercenary.c b/src/map/mercenary.c
index f5d3fe11c..c4b692008 100644
--- a/src/map/mercenary.c
+++ b/src/map/mercenary.c
@@ -465,7 +465,7 @@ bool read_mercenarydb_sub(char* str[], int columns, int current) {
mstatus->race = atoi(str[20]);
ele = atoi(str[21]);
- mstatus->def_ele = ele%10;
+ mstatus->def_ele = ele % ELE_MAX;
mstatus->ele_lv = ele/20;
if( mstatus->def_ele >= ELE_MAX ) {
ShowWarning("Mercenary %d has invalid element type %d (max element is %d)\n", db->class_, mstatus->def_ele, ELE_MAX - 1);