diff options
| author | Haru <haru@dotalux.com> | 2014-05-10 17:17:13 +0200 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2014-05-10 17:17:13 +0200 |
| commit | 0ab52ac65bdba93be94e4149e267698d31b41d72 (patch) | |
| tree | e7f0cd0d549c8a04a35693cc98b6b27c06eeb2ed /src/map/status.h | |
| parent | 94657284973f4037596bae468ebfbee5c217e02b (diff) | |
| download | hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.gz hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.bz2 hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.tar.xz hercules-0ab52ac65bdba93be94e4149e267698d31b41d72.zip | |
Re-commit of "Fixed order of includes in all source files"
This reverts commit 94657284973f4037596bae468ebfbee5c217e02b.
Diffstat (limited to 'src/map/status.h')
| -rw-r--r-- | src/map/status.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/status.h b/src/map/status.h index e47c2b365..baa586297 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -5,14 +5,18 @@ #ifndef _MAP_STATUS_H_ #define _MAP_STATUS_H_ +#include "../config/core.h" // defType, NEW_CARTS, RENEWAL, RENEWAL_ASPD + +#include "../common/cbasetypes.h" #include "../common/mmo.h" struct block_list; -struct mob_data; -struct pet_data; +struct elemental_data; struct homun_data; struct mercenary_data; -struct status_change; +struct mob_data; +struct npc_data; +struct pet_data; //Change the equation when the values are high enough to discard the //imprecision in exchange of overflow protection [Skotlex] @@ -1878,11 +1882,7 @@ struct status_interface { int hp_coefficient2[CLASS_COUNT]; int hp_sigma_val[CLASS_COUNT][MAX_LEVEL+1]; int sp_coefficient[CLASS_COUNT]; -#ifdef RENEWAL_ASPD - int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; -#else - int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE]; //[blackhole89] -#endif + int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD sc_type Skill2SCTable[MAX_SKILL]; // skill -> status int IconChangeTable[SC_MAX]; // status -> "icon" (icon is a bit of a misnomer, since there exist values with no icon associated) unsigned int ChangeFlagTable[SC_MAX]; // status -> flags |