diff options
| author | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-05-10 06:08:56 -0300 |
| commit | 94657284973f4037596bae468ebfbee5c217e02b (patch) | |
| tree | c99c1e3a39ad41183f2d70eb093df54ca60ad0fb /src/map/status.h | |
| parent | a1eba2e076401ddbc34e5a65e15bb0f418591b1a (diff) | |
| download | hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.gz hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.bz2 hercules-94657284973f4037596bae468ebfbee5c217e02b.tar.xz hercules-94657284973f4037596bae468ebfbee5c217e02b.zip | |
Revert "Fixed order of includes in all source files"
This reverts commit b6b3f58795288701d0e162d43fa6f0a47af913b3.
Fixes issue 8184
http://hercules.ws/board/tracker/issue-8184-cart-related/
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 baa586297..e47c2b365 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -5,18 +5,14 @@ #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 elemental_data; -struct homun_data; -struct mercenary_data; struct mob_data; -struct npc_data; struct pet_data; +struct homun_data; +struct mercenary_data; +struct status_change; //Change the equation when the values are high enough to discard the //imprecision in exchange of overflow protection [Skotlex] @@ -1882,7 +1878,11 @@ struct status_interface { int hp_coefficient2[CLASS_COUNT]; int hp_sigma_val[CLASS_COUNT][MAX_LEVEL+1]; int sp_coefficient[CLASS_COUNT]; - int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; // +1 for RENEWAL_ASPD +#ifdef RENEWAL_ASPD + int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE+1]; +#else + int aspd_base[CLASS_COUNT][MAX_WEAPON_TYPE]; //[blackhole89] +#endif 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 |