diff options
| author | Haru <haru@dotalux.com> | 2016-06-30 01:23:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 01:23:58 +0200 |
| commit | 48064104f599a2dfa57440a1fda861c27bd55401 (patch) | |
| tree | 4539455f5932acb1b5ab3a1d61faaeada02c6e81 /src/map | |
| parent | c1d86fb39a1567edb3c7c5c174b7aeafb4cc9266 (diff) | |
| parent | 0903637f9479083a89689e54b6208cd8b19570a5 (diff) | |
| download | hercules-48064104f599a2dfa57440a1fda861c27bd55401.tar.gz hercules-48064104f599a2dfa57440a1fda861c27bd55401.tar.bz2 hercules-48064104f599a2dfa57440a1fda861c27bd55401.tar.xz hercules-48064104f599a2dfa57440a1fda861c27bd55401.zip | |
Merge pull request #1330 from 4144/variabledefine
Allow redefine some array sizes by preprocessor from command line
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/status.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/map/status.h b/src/map/status.h index 2b932b149..2f70ee41d 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -64,7 +64,9 @@ enum refine_type { REFINE_TYPE_WEAPON2 = 2, REFINE_TYPE_WEAPON3 = 3, REFINE_TYPE_WEAPON4 = 4, +#ifndef REFINE_TYPE_MAX REFINE_TYPE_MAX = 5 +#endif }; /** @@ -825,8 +827,9 @@ typedef enum sc_type { SC_M_LIFEPOTION, SC_G_LIFEPOTION, // 640 SC_MYSTICPOWDER, - +#ifndef SC_MAX SC_MAX, //Automatically updated max, used in for's to check we are within bounds. +#endif } sc_type; /// Official status change ids, used to display status icons in the client. @@ -1792,8 +1795,9 @@ enum si_type { //SI_EP16_2_BUFF_SS = 963, //SI_EP16_2_BUFF_SC = 964, //SI_EP16_2_BUFF_AC = 965, - +#ifndef SI_MAX SI_MAX, +#endif }; // JOINTBEAT stackable ailments |