summaryrefslogtreecommitdiff
path: root/src/map/pet.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/pet.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/pet.c')
-rw-r--r--src/map/pet.c32
1 files changed, 11 insertions, 21 deletions
diff --git a/src/map/pet.c b/src/map/pet.c
index 64424d7f1..592eee4c0 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -241,8 +241,7 @@ static int pet_hungry(int tid,unsigned int tick,int id,int data)
pd = sd->pd;
if(pd->pet_hungry_timer != tid){
- if(battle_config.error_log)
- ShowError("pet_hungry_timer %d != %d\n",pd->pet_hungry_timer,tid);
+ ShowError("pet_hungry_timer %d != %d\n",pd->pet_hungry_timer,tid);
return 0;
}
pd->pet_hungry_timer = -1;
@@ -480,8 +479,7 @@ int pet_recv_petdata(int account_id,struct s_pet *p,int flag)
break;
}
if(i >= MAX_INVENTORY) {
- if (battle_config.error_log)
- ShowError("pet_recv_petdata: Hatching pet (%d:%s) aborted, couldn't find egg in inventory for removal!\n",p->pet_id, p->name);
+ ShowError("pet_recv_petdata: Hatching pet (%d:%s) aborted, couldn't find egg in inventory for removal!\n",p->pet_id, p->name);
sd->status.pet_id = 0;
return 1;
}
@@ -511,10 +509,9 @@ int pet_select_egg(struct map_session_data *sd,short egg_index)
if(sd->status.inventory[egg_index].card[0] == CARD0_PET)
intif_request_petdata(sd->status.account_id, sd->status.char_id, MakeDWord(sd->status.inventory[egg_index].card[1], sd->status.inventory[egg_index].card[2]) );
- else {
- if(battle_config.error_log)
- ShowError("wrong egg item inventory %d\n",egg_index);
- }
+ else
+ ShowError("wrong egg item inventory %d\n",egg_index);
+
return 0;
}
@@ -831,8 +828,7 @@ static int pet_randomwalk(struct pet_data *pd,unsigned int tick)
if(i+1>=retrycount){
pd->move_fail_count++;
if(pd->move_fail_count>1000){
- if(battle_config.error_log)
- ShowWarning("PET can't move. hold position %d, class = %d\n",pd->bl.id,pd->pet.class_);
+ ShowWarning("PET can't move. hold position %d, class = %d\n",pd->bl.id,pd->pet.class_);
pd->move_fail_count=0;
pd->ud.canmove_tick = tick + 60000;
return 0;
@@ -1088,11 +1084,8 @@ int pet_skill_bonus_timer(int tid,unsigned int tick,int id,int data)
pd=sd->pd;
if(pd->bonus->timer != tid) {
- if(battle_config.error_log)
- {
- ShowError("pet_skill_bonus_timer %d != %d\n",pd->bonus->timer,tid);
- pd->bonus->timer = -1;
- }
+ ShowError("pet_skill_bonus_timer %d != %d\n",pd->bonus->timer,tid);
+ pd->bonus->timer = -1;
return 0;
}
@@ -1131,8 +1124,7 @@ int pet_recovery_timer(int tid,unsigned int tick,int id,int data)
pd=sd->pd;
if(pd->recovery->timer != tid) {
- if(battle_config.error_log)
- ShowError("pet_recovery_timer %d != %d\n",pd->recovery->timer,tid);
+ ShowError("pet_recovery_timer %d != %d\n",pd->recovery->timer,tid);
return 0;
}
@@ -1162,8 +1154,7 @@ int pet_heal_timer(int tid,unsigned int tick,int id,int data)
pd=sd->pd;
if(pd->s_skill->timer != tid) {
- if(battle_config.error_log)
- ShowError("pet_heal_timer %d != %d\n",pd->s_skill->timer,tid);
+ ShowError("pet_heal_timer %d != %d\n",pd->s_skill->timer,tid);
return 0;
}
@@ -1200,8 +1191,7 @@ int pet_skill_support_timer(int tid,unsigned int tick,int id,int data)
pd=sd->pd;
if(pd->s_skill->timer != tid) {
- if(battle_config.error_log)
- ShowError("pet_skill_support_timer %d != %d\n",pd->s_skill->timer,tid);
+ ShowError("pet_skill_support_timer %d != %d\n",pd->s_skill->timer,tid);
return 0;
}