diff options
author | Haru <haru@dotalux.com> | 2014-01-23 19:35:01 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-06-01 10:11:40 +0200 |
commit | ad958235cfc56b86da89bdc2aa1e5155b0c006a1 (patch) | |
tree | 8b5d66a4620d28edeeefae1aec67881b98ac0530 /src/map/mob.h | |
parent | 42e1df9e61f8efb6340ed1c9238cd247d553d9b8 (diff) | |
download | hercules-ad958235cfc56b86da89bdc2aa1e5155b0c006a1.tar.gz hercules-ad958235cfc56b86da89bdc2aa1e5155b0c006a1.tar.bz2 hercules-ad958235cfc56b86da89bdc2aa1e5155b0c006a1.tar.xz hercules-ad958235cfc56b86da89bdc2aa1e5155b0c006a1.zip |
Replaced some of the hardcoded values with constants (map)
- Replaced several hardcoded values with the appropriate enums.
- Added documentation for some hardcoded values that haven't been
replaced by enums (yet)
- Minor code legibility improvements.
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/mob.h')
-rw-r--r-- | src/map/mob.h | 33 |
1 files changed, 20 insertions, 13 deletions
diff --git a/src/map/mob.h b/src/map/mob.h index 02ae1630a..0a5844f39 100644 --- a/src/map/mob.h +++ b/src/map/mob.h @@ -38,7 +38,7 @@ #define MOB_CLONE_END MAX_MOB_DB //Used to determine default enemy type of mobs (for use in each in range calls) -#define DEFAULT_ENEMY_TYPE(md) ((md)->special_state.ai?BL_CHAR:BL_MOB|BL_PC|BL_HOM|BL_MER) +#define DEFAULT_ENEMY_TYPE(md) ((md)->special_state.ai != AI_NONE ?BL_CHAR:BL_MOB|BL_PC|BL_HOM|BL_MER) #define MAX_MOB_CHAT 250 //Max Skill's messages @@ -79,11 +79,23 @@ enum size { }; enum ai { - AI_NONE = 0, - AI_ATTACK, - AI_SPHERE, - AI_FLORA, - AI_ZANZOU, + AI_NONE = 0, //0: Normal mob. + AI_ATTACK, //1: Standard summon, attacks mobs. + AI_SPHERE, //2: Alchemist Marine Sphere + AI_FLORA, //3: Alchemist Summon Flora + AI_ZANZOU, //4: Summon Zanzou + + AI_MAX +}; + +/** + * Acceptable values for map_session_data.state.noks + */ +enum ksprotection_mode { + KSPROTECT_NONE = 0, + KSPROTECT_SELF = 1, + KSPROTECT_PARTY = 2, + KSPROTECT_GUILD = 3, }; struct mob_skill { @@ -141,13 +153,8 @@ struct mob_data { struct mob_db *db; //For quick data access (saves doing mob_db(md->class_) all the time) [Skotlex] char name[NAME_LENGTH]; struct { - unsigned int size : 2; //Small/Big monsters. - unsigned int ai : 4; //Special AI for summoned monsters. - //0: Normal mob. - //1: Standard summon, attacks mobs. - //2: Alchemist Marine Sphere - //3: Alchemist Summon Flora - //4: Summon Zanzou + unsigned int size : 2; //Small/Big monsters. @see enum size + unsigned int ai : 4; //Special AI for summoned monsters. @see enum ai unsigned int clone : 1;/* is clone? 1:0 */ } special_state; //Special mob information that does not needs to be zero'ed on mob respawn. struct { |