diff options
| author | Haru <haru@dotalux.com> | 2017-11-18 19:01:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-18 19:01:51 +0100 |
| commit | a63c82c8bd29fd829a5d8cfba7d02d11cf4634c5 (patch) | |
| tree | 8f369881467a3d1a9a5a0a4fb16631ad6d33e44e /src/common | |
| parent | 93fe9834c3075bad0fc1ba1dd075147d7de3b73a (diff) | |
| parent | 13b1d22dccc7a0e816963f070248e11c73538bd1 (diff) | |
| download | hercules-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/common')
| -rw-r--r-- | src/common/mmo.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 52f68b719..6a0e75ca5 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -139,8 +139,8 @@ #endif #define MAX_FAME 1000000000 #define MAX_CART 100 -#ifndef MAX_SKILL -#define MAX_SKILL 1510 +#ifndef MAX_SKILL_DB +#define MAX_SKILL_DB 1510 ///< Maximum number of skills in the skill DB (compacted array size) #endif #ifndef MAX_SKILL_ID #define MAX_SKILL_ID 10015 // [Ind/Hercules] max used skill ID @@ -635,7 +635,7 @@ struct mmo_charstatus { struct point last_point,save_point,memo_point[MAX_MEMOPOINTS]; struct item inventory[MAX_INVENTORY],cart[MAX_CART]; - struct s_skill skill[MAX_SKILL]; + struct s_skill skill[MAX_SKILL_DB]; struct s_friend friends[MAX_FRIENDS]; //New friend system [Skotlex] #ifdef HOTKEY_SAVING @@ -1203,4 +1203,8 @@ enum hz_char_ask_name_answer { #error MAX_SLOTS it too small #endif +#ifdef MAX_SKILL +#error MAX_SKILL has been replaced by MAX_SKILL_DB. Please update your custom definitions. +#endif + #endif /* COMMON_MMO_H */ |