summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-17 20:51:25 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-11-17 20:51:25 +0000
commit462883b7cb02a2f229d0c53afd179163725d50de (patch)
tree977bd95af592ab70b87a37342da5873ca8251d1f /src/map/status.c
parent3bb42dda4732f3288155725bd26da76822c10021 (diff)
downloadhercules-462883b7cb02a2f229d0c53afd179163725d50de.tar.gz
hercules-462883b7cb02a2f229d0c53afd179163725d50de.tar.bz2
hercules-462883b7cb02a2f229d0c53afd179163725d50de.tar.xz
hercules-462883b7cb02a2f229d0c53afd179163725d50de.zip
Removed battle_config.error_log as console_silent already handles this
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11751 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c28
1 files changed, 11 insertions, 17 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 926b77162..706037115 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -70,8 +70,7 @@ static void add_sc(int skill, int sc)
else
if (sk >= HM_SKILLBASE) sk = skill - HM_SKILLBASE + SC_HM_BASE;
if (sk < 0 || sk >= MAX_SKILL) {
- if (battle_config.error_log)
- ShowError("add_sc: Unsupported skill id %d\n", skill);
+ ShowError("add_sc: Unsupported skill id %d\n", skill);
return;
}
if (SkillStatusChangeTableArray[sk]==-1) // skill -> sk [Lance]
@@ -512,8 +511,7 @@ int SkillStatusChangeTable(int skill)
else
if (sk >= HM_SKILLBASE) sk = skill - HM_SKILLBASE + SC_HM_BASE;
if (sk < 0 || sk >= MAX_SKILL) {
- if (battle_config.error_log)
- ShowError("add_sc: Unsupported skill id %d\n", skill);
+ ShowError("add_sc: Unsupported skill id %d\n", skill);
return -1;
}
return SkillStatusChangeTableArray[sk];
@@ -4336,7 +4334,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
sd->vd.sex = sd->status.sex;
} else if (vd)
memcpy(&sd->vd, vd, sizeof(struct view_data));
- else if (battle_config.error_log)
+ else
ShowError("status_set_viewdata (PC): No view data for class %d\n", class_);
}
break;
@@ -4345,7 +4343,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
TBL_MOB* md = (TBL_MOB*)bl;
if (vd)
md->vd = vd;
- else if (battle_config.error_log)
+ else
ShowError("status_set_viewdata (MOB): No view data for class %d\n", class_);
}
break;
@@ -4362,7 +4360,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
pd->vd.head_bottom = pd->pet.equip;
}
}
- } else if (battle_config.error_log)
+ } else
ShowError("status_set_viewdata (PET): No view data for class %d\n", class_);
}
break;
@@ -4371,7 +4369,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
TBL_NPC* nd = (TBL_NPC*)bl;
if (vd)
nd->vd = vd;
- else if (battle_config.error_log)
+ else
ShowError("status_set_viewdata (NPC): No view data for class %d\n", class_);
}
break;
@@ -4380,7 +4378,7 @@ void status_set_viewdata(struct block_list *bl, int class_)
struct homun_data *hd = (struct homun_data*)bl;
if (vd)
hd->vd = vd;
- else if (battle_config.error_log)
+ else
ShowError("status_set_viewdata (HOMUNCULUS): No view data for class %d\n", class_);
}
break;
@@ -4606,8 +4604,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
if( type < 0 || type >= SC_MAX )
{
- if( battle_config.error_log )
- ShowError("status_change_start: invalid status change (%d)!\n", type);
+ ShowError("status_change_start: invalid status change (%d)!\n", type);
return 0;
}
@@ -5874,8 +5871,7 @@ int status_change_start(struct block_list* bl,enum sc_type type,int rate,int val
default:
if( calc_flag == SCB_NONE && StatusSkillChangeTable[type] == 0 && StatusIconChangeTable[type] == 0 )
{ //Status change with no calc, no icon, and no skill associated...?
- if(battle_config.error_log)
- ShowError("UnknownStatusChange [%d]\n", type);
+ ShowError("UnknownStatusChange [%d]\n", type);
return 0;
}
}
@@ -6628,8 +6624,7 @@ int kaahi_heal_timer(int tid, unsigned int tick, int id, int data)
if (!sc || !status || data != SC_KAAHI || sc->data[data].timer==-1)
return 0;
if(sc->data[data].val4 != tid) {
- if (battle_config.error_log)
- ShowError("kaahi_heal_timer: Timer mismatch: %d != %d\n", tid, sc->data[data].val4);
+ ShowError("kaahi_heal_timer: Timer mismatch: %d != %d\n", tid, sc->data[data].val4);
sc->data[data].val4=-1;
return 0;
}
@@ -6671,8 +6666,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
if( sc->data[type].timer != tid )
{
- if(battle_config.error_log)
- ShowError("status_change_timer: Mismatch for type %d: %d != %d (bl id %d)\n",type,tid,sc->data[type].timer, bl->id);
+ ShowError("status_change_timer: Mismatch for type %d: %d != %d (bl id %d)\n",type,tid,sc->data[type].timer, bl->id);
return 0;
}