diff options
| -rw-r--r-- | src/emap/init.c | 6 | ||||
| -rw-r--r-- | src/emap/pc.c | 8 | ||||
| -rw-r--r-- | src/emap/pc.h | 6 | ||||
| -rw-r--r-- | src/emap/status.c | 8 |
4 files changed, 12 insertions, 16 deletions
diff --git a/src/emap/init.c b/src/emap/init.c index 0daa53c..8a5a197 100644 --- a/src/emap/init.c +++ b/src/emap/init.c @@ -103,9 +103,9 @@ HPExport void plugin_init (void) skilld_init(); /* grab some unique bonus ID for us */ - bHomunculusAtk = map->get_new_bonus_id(); - bHomunculusDef = map->get_new_bonus_id(); - bHomunculusMaxHP = map->get_new_bonus_id(); + bHomunculusAtkID = map->get_new_bonus_id(); + bHomunculusDefID = map->get_new_bonus_id(); + bHomunculusMaxHPID = map->get_new_bonus_id(); /* set bonus constants and their values */ script->set_constant("bHomunculusAtk", bHomunculusAtk, false, false); diff --git a/src/emap/pc.c b/src/emap/pc.c index 4e50781..f745410 100644 --- a/src/emap/pc.c +++ b/src/emap/pc.c @@ -36,8 +36,6 @@ #include "emap/struct/mapdext.h" #include "emap/struct/sessionext.h" -#include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */ - int langScriptId; int mountScriptId; @@ -1105,7 +1103,7 @@ int epc_bonus_preHook(struct map_session_data **sd, int *type, int *val) { // int bHomunculusAtk = -1; - if (*type == bHomunculusAtk) { + if (*type == bHomunculusAtkID) { struct s_homunculus_atk *data; if ((data = getFromMSD(*sd, 0)) == NULL) { /* don't have, create */ @@ -1119,7 +1117,7 @@ int epc_bonus_preHook(struct map_session_data **sd, int *type, int *val) } // int bHomunculusDef = -1; - if (*type == bHomunculusDef) { + if (*type == bHomunculusDefID) { struct s_homunculus_def *data; if ((data = getFromMSD(*sd, 0)) == NULL) { @@ -1133,7 +1131,7 @@ int epc_bonus_preHook(struct map_session_data **sd, int *type, int *val) } // int bHomunculusMaxHP = -1; - if (*type == bHomunculusMaxHP) { + if (*type == bHomunculusMaxHPID) { struct s_homunculus_maxhp *data; if ((data = getFromMSD(*sd, 0)) == NULL) { diff --git a/src/emap/pc.h b/src/emap/pc.h index 3c3b8ea..223452d 100644 --- a/src/emap/pc.h +++ b/src/emap/pc.h @@ -9,9 +9,9 @@ enum VarConst Const_ClientVersion = 10000 }; -int bHomunculusAtk = -1; -int bHomunculusDef = -1; -int bHomunculusMaxHP = -1; +int bHomunculusAtkID = -1; +int bHomunculusDefID = -1; +int bHomunculusMaxHPID = -1; struct s_homunculus_atk { int rate; diff --git a/src/emap/status.c b/src/emap/status.c index 16f552c..eead81f 100644 --- a/src/emap/status.c +++ b/src/emap/status.c @@ -39,8 +39,6 @@ #include "emap/enum/esctype.h" #include "emap/enum/esitype.h" -#include "common/HPMDataCheck.h" /* should always be the last file included! (if you don't make it last, it'll intentionally break compile time) */ - int class_move_speed[CLASS_COUNT]; void eInitChangeTables(void) @@ -304,15 +302,15 @@ int estatus_calc_homunculus_postHook(int retVal, struct homun_data *hd, enum e_s const struct s_homunculus_def *hddef; const struct s_homunculus_maxhp *hdmaxhp; - if ((hdatk = getFromMSD(*sd,0)) != NULL) { + if ((hdatk = getFromMSD(sd,0)) != NULL) { hd->battle_status.rhw.atk+=hdatk->rate; } - if ((hddef = getFromMSD(*sd,0)) != NULL) { + if ((hddef = getFromMSD(sd,0)) != NULL) { hd->battle_status.def+=hddef->rate; } - if ((hdmaxhp = getFromMSD(*sd,0)) != NULL) { + if ((hdmaxhp = getFromMSD(sd,0)) != NULL) { hd->battle_status.max_hp+=hdmaxhp->rate; } |