diff options
| author | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-28 20:11:19 +0800 |
|---|---|---|
| committer | j-tkay <joseph.tk.ea@gmail.com> | 2013-06-28 20:11:19 +0800 |
| commit | 8489dbf3b58d3bff70b27ea42884a14d5229430a (patch) | |
| tree | 89e0f9be6b3bc7c3ebc135fc311d9f6d6ebbfeec /src/map/pc.h | |
| parent | de7919f0f59f47473e6de709b5d5287a4a55e18d (diff) | |
| parent | 2154c0fa9cee582a36f9a8d7923a646a6d47adf0 (diff) | |
| download | hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.gz hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.bz2 hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.tar.xz hercules-8489dbf3b58d3bff70b27ea42884a14d5229430a.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map/pc.h')
| -rw-r--r-- | src/map/pc.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/map/pc.h b/src/map/pc.h index 43d5d40c7..442b55965 100644 --- a/src/map/pc.h +++ b/src/map/pc.h @@ -10,7 +10,7 @@ #include "battle.h" // battle_config #include "battleground.h" #include "buyingstore.h" // struct s_buyingstore -#include "itemdb.h" // MAX_ITEMGROUP +#include "itemdb.h" #include "map.h" // RC_MAX #include "script.h" // struct script_reg, struct script_regstr #include "searchstore.h" // struct s_search_store_info @@ -256,7 +256,6 @@ struct map_session_data { int expaddrace[RC_MAX]; int ignore_mdef[RC_MAX]; int ignore_def[RC_MAX]; - int itemgrouphealrate[MAX_ITEMGROUP]; short sp_gain_race[RC_MAX]; short sp_gain_race_attack[RC_MAX]; short hp_gain_race_attack[RC_MAX]; @@ -483,7 +482,7 @@ struct map_session_data { struct sc_display_entry **sc_display; unsigned char sc_display_count; - unsigned short *instance; + short *instance; unsigned short instances; /* Possible Thanks to Yommy~! */ |