Merge pull request #2419 from 4144/statusfields

Dehardcode limits for attack related calculated parameters

1 files changed, 18 insertions, 20 deletions

diff --git a/src/map/status.h b/src/map/status.h
index 79aaca95f..a70687b67 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -2045,28 +2045,26 @@ enum e_status_calc_opt {
 //Required because players have two of these, one in status_data
 //and another for their left hand weapon.
 typedef struct weapon_atk {
-	unsigned short atk, atk2;
+	unsigned int atk, atk2;
 	unsigned short range;
 	unsigned char ele;
 #ifdef RENEWAL
-	unsigned short matk;
+	unsigned int matk;
 	unsigned char wlv;
 #endif
 } weapon_atk;
 
 //For holding basic status (which can be modified by status changes)
 struct status_data {
-	unsigned int
+	uint32
 		hp, sp,  // see status_cpy before adding members before hp and sp
-		max_hp, max_sp;
-	unsigned short
+		max_hp, max_sp,
 		str, agi, vit, int_, dex, luk,
 		batk,
 		matk_min, matk_max,
 		speed,
-		amotion, adelay, dmotion;
-	uint32 mode;
-	short
+		amotion, adelay, dmotion,
+		mode,
 		hit, flee, cri, flee2,
 		def2, mdef2,
 #ifdef RENEWAL_ASPD
@@ -2340,8 +2338,8 @@ struct status_interface {
 	short (*calc_def2) (struct block_list *bl, struct status_change *sc, int def2, bool viewable);
 	defType (*calc_mdef) (struct block_list *bl, struct status_change *sc, int mdef, bool viewable);
 	short (*calc_mdef2) (struct block_list *bl, struct status_change *sc, int mdef2, bool viewable);
-	unsigned short (*calc_batk)(struct block_list *bl, struct status_change *sc, int batk, bool viewable);
-	unsigned short(*base_matk) (struct block_list *bl, const struct status_data *st, int level);
+	int (*calc_batk)(struct block_list *bl, struct status_change *sc, int batk, bool viewable);
+	int (*base_matk) (struct block_list *bl, const struct status_data *st, int level);
 	int (*get_weapon_atk) (struct block_list *src, struct weapon_atk *watk, int flag);
 	int (*get_total_mdef) (struct block_list *src);
 	int (*get_total_def) (struct block_list *src);
@@ -2352,7 +2350,7 @@ struct status_interface {
 	void (*initChangeTables) (void);
 	void (*initDummyData) (void);
 	int (*base_amotion_pc) (struct map_session_data *sd, struct status_data *st);
-	unsigned short (*base_atk) (const struct block_list *bl, const struct status_data *st);
+	int (*base_atk) (const struct block_list *bl, const struct status_data *st);
 	unsigned int (*get_base_maxhp) (const struct map_session_data *sd, const struct status_data *st);
 	unsigned int (*get_base_maxsp) (const struct map_session_data *sd, const struct status_data *st);
 	unsigned int (*get_restart_hp) (const struct map_session_data *sd, const struct status_data *st);
@@ -2364,12 +2362,12 @@ struct status_interface {
 	unsigned short (*calc_int) (struct block_list *bl, struct status_change *sc, int int_);
 	unsigned short (*calc_dex) (struct block_list *bl, struct status_change *sc, int dex);
 	unsigned short (*calc_luk) (struct block_list *bl, struct status_change *sc, int luk);
-	unsigned short (*calc_watk) (struct block_list *bl, struct status_change *sc, int watk, bool viewable);
-	unsigned short (*calc_matk) (struct block_list *bl, struct status_change *sc, int matk, bool viewable);
-	signed short (*calc_hit) (struct block_list *bl, struct status_change *sc, int hit, bool viewable);
-	signed short (*calc_critical) (struct block_list *bl, struct status_change *sc, int critical, bool viewable);
-	signed short (*calc_flee) (struct block_list *bl, struct status_change *sc, int flee, bool viewable);
-	signed short (*calc_flee2) (struct block_list *bl, struct status_change *sc, int flee2, bool viewable);
+	int (*calc_watk) (struct block_list *bl, struct status_change *sc, int watk, bool viewable);
+	int (*calc_matk) (struct block_list *bl, struct status_change *sc, int matk, bool viewable);
+	signed int (*calc_hit) (struct block_list *bl, struct status_change *sc, int hit, bool viewable);
+	signed int (*calc_critical) (struct block_list *bl, struct status_change *sc, int critical, bool viewable);
+	signed int (*calc_flee) (struct block_list *bl, struct status_change *sc, int flee, bool viewable);
+	signed int (*calc_flee2) (struct block_list *bl, struct status_change *sc, int flee2, bool viewable);
 	unsigned short (*calc_speed) (struct block_list *bl, struct status_change *sc, int speed);
 	short (*calc_aspd_rate) (struct block_list *bl, struct status_change *sc, int aspd_rate);
 	unsigned short (*calc_dmotion) (struct block_list *bl, struct status_change *sc, int dmotion);
@@ -2380,7 +2378,7 @@ struct status_interface {
 	unsigned char (*calc_element) (struct block_list *bl, struct status_change *sc, int element);
 	unsigned char (*calc_element_lv) (struct block_list *bl, struct status_change *sc, int lv);
 	uint32 (*calc_mode) (const struct block_list *bl, const struct status_change *sc, uint32 mode);
-	unsigned short (*calc_ematk) (struct block_list *bl, struct status_change *sc, int matk);
+	int (*calc_ematk) (struct block_list *bl, struct status_change *sc, int matk);
 	void (*calc_bl_main) (struct block_list *bl, int flag);
 	void (*display_add) (struct map_session_data *sd, enum sc_type type, int dval1, int dval2, int dval3);
 	void (*display_remove) (struct map_session_data *sd, enum sc_type type);
@@ -2393,8 +2391,8 @@ struct status_interface {
 	void (*read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb);
 	void (*set_sc) (uint16 skill_id, sc_type sc, int icon, unsigned int flag);
 	void (*copy) (struct status_data *a, const struct status_data *b);
-	unsigned short (*base_matk_min) (const struct status_data *st);
-	unsigned short (*base_matk_max) (const struct status_data *st);
+	int (*base_matk_min) (const struct status_data *st);
+	int (*base_matk_max) (const struct status_data *st);
 };
 
 #ifdef HERCULES_CORE