summaryrefslogtreecommitdiff
path: root/src/map/elemental.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-09-25 21:26:54 +0200
committerHaru <haru@dotalux.com>2013-09-25 22:15:53 +0200
commitafcad494411995396b906f214d1c4ffcf485cc0a (patch)
treee70b21658276ddef885322b7c9b18935b6c0235e /src/map/elemental.c
parent13afb7e0bf35bacc9c90c7dffe34120ddd2fd099 (diff)
downloadhercules-afcad494411995396b906f214d1c4ffcf485cc0a.tar.gz
hercules-afcad494411995396b906f214d1c4ffcf485cc0a.tar.bz2
hercules-afcad494411995396b906f214d1c4ffcf485cc0a.tar.xz
hercules-afcad494411995396b906f214d1c4ffcf485cc0a.zip
Renamed local variables that would conflict with a rename of iStatus to status
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/elemental.c')
-rw-r--r--src/map/elemental.c60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/map/elemental.c b/src/map/elemental.c
index 3a6ab2105..b1ad4073b 100644
--- a/src/map/elemental.c
+++ b/src/map/elemental.c
@@ -762,7 +762,7 @@ int read_elementaldb(void) {
char *str[26];
int i, j = 0, k = 0, ele;
struct s_elemental_db *db;
- struct status_data *status;
+ struct status_data *estatus;
sprintf(line, "%s/%s", iMap->db_path, "elemental_db.txt");
memset(elemental->elemental_db,0,sizeof(elemental->elemental_db));
@@ -798,44 +798,44 @@ int read_elementaldb(void) {
safestrncpy(db->name, str[2], NAME_LENGTH);
db->lv = atoi(str[3]);
- status = &db->status;
+ estatus = &db->status;
db->vd.class_ = db->class_;
- status->max_hp = atoi(str[4]);
- status->max_sp = atoi(str[5]);
- status->rhw.range = atoi(str[6]);
- status->rhw.atk = atoi(str[7]);
- status->rhw.atk2 = atoi(str[8]);
- status->def = atoi(str[9]);
- status->mdef = atoi(str[10]);
- status->str = atoi(str[11]);
- status->agi = atoi(str[12]);
- status->vit = atoi(str[13]);
- status->int_ = atoi(str[14]);
- status->dex = atoi(str[15]);
- status->luk = atoi(str[16]);
+ estatus->max_hp = atoi(str[4]);
+ estatus->max_sp = atoi(str[5]);
+ estatus->rhw.range = atoi(str[6]);
+ estatus->rhw.atk = atoi(str[7]);
+ estatus->rhw.atk2 = atoi(str[8]);
+ estatus->def = atoi(str[9]);
+ estatus->mdef = atoi(str[10]);
+ estatus->str = atoi(str[11]);
+ estatus->agi = atoi(str[12]);
+ estatus->vit = atoi(str[13]);
+ estatus->int_ = atoi(str[14]);
+ estatus->dex = atoi(str[15]);
+ estatus->luk = atoi(str[16]);
db->range2 = atoi(str[17]);
db->range3 = atoi(str[18]);
- status->size = atoi(str[19]);
- status->race = atoi(str[20]);
+ estatus->size = atoi(str[19]);
+ estatus->race = atoi(str[20]);
ele = atoi(str[21]);
- status->def_ele = ele%10;
- status->ele_lv = ele/20;
- if( status->def_ele >= ELE_MAX ) {
- ShowWarning("Elemental %d has invalid element type %d (max element is %d)\n", db->class_, status->def_ele, ELE_MAX - 1);
- status->def_ele = ELE_NEUTRAL;
+ estatus->def_ele = ele%10;
+ estatus->ele_lv = ele/20;
+ if( estatus->def_ele >= ELE_MAX ) {
+ ShowWarning("Elemental %d has invalid element type %d (max element is %d)\n", db->class_, estatus->def_ele, ELE_MAX - 1);
+ estatus->def_ele = ELE_NEUTRAL;
}
- if( status->ele_lv < 1 || status->ele_lv > 4 ) {
- ShowWarning("Elemental %d has invalid element level %d (max is 4)\n", db->class_, status->ele_lv);
- status->ele_lv = 1;
+ if( estatus->ele_lv < 1 || estatus->ele_lv > 4 ) {
+ ShowWarning("Elemental %d has invalid element level %d (max is 4)\n", db->class_, estatus->ele_lv);
+ estatus->ele_lv = 1;
}
- status->aspd_rate = 1000;
- status->speed = atoi(str[22]);
- status->adelay = atoi(str[23]);
- status->amotion = atoi(str[24]);
- status->dmotion = atoi(str[25]);
+ estatus->aspd_rate = 1000;
+ estatus->speed = atoi(str[22]);
+ estatus->adelay = atoi(str[23]);
+ estatus->amotion = atoi(str[24]);
+ estatus->dmotion = atoi(str[25]);
j++;
}