summaryrefslogtreecommitdiff
path: root/src/map/pet.c
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-09-25 01:18:31 +0200
committerHaru <haru@dotalux.com>2013-09-25 01:19:19 +0200
commit66979ef89363c03e3cc02d63feb5248836daff4e (patch)
tree121d8cf0ef1299ca5cb00ca66a2a261156889560 /src/map/pet.c
parenta67007e744f44a74746e0b658160ddc8179d2c0a (diff)
downloadhercules-66979ef89363c03e3cc02d63feb5248836daff4e.tar.gz
hercules-66979ef89363c03e3cc02d63feb5248836daff4e.tar.bz2
hercules-66979ef89363c03e3cc02d63feb5248836daff4e.tar.xz
hercules-66979ef89363c03e3cc02d63feb5248836daff4e.zip
Renamed local variables that would conflict with a rename of iTimer to timer
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pet.c')
-rw-r--r--src/map/pet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/pet.c b/src/map/pet.c
index 8498517ef..6b8ac947e 100644
--- a/src/map/pet.c
+++ b/src/map/pet.c
@@ -1049,7 +1049,7 @@ int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data)
struct map_session_data *sd=iMap->id2sd(id);
struct pet_data *pd;
int bonus;
- int timer = 0;
+ int duration = 0;
if(sd == NULL || sd->pd==NULL || sd->pd->bonus == NULL)
return 1;
@@ -1065,10 +1065,10 @@ int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data)
// determine the time for the next timer
if (pd->state.skillbonus && pd->bonus->delay > 0) {
bonus = 0;
- timer = pd->bonus->delay*1000; // the duration until pet bonuses will be reactivated again
+ duration = pd->bonus->delay*1000; // the duration until pet bonuses will be reactivated again
} else if (pd->pet.intimate) {
bonus = 1;
- timer = pd->bonus->duration*1000; // the duration for pet bonuses to be in effect
+ duration = pd->bonus->duration*1000; // the duration for pet bonuses to be in effect
} else { //Lost pet...
pd->bonus->timer = INVALID_TIMER;
return 0;
@@ -1079,7 +1079,7 @@ int pet_skill_bonus_timer(int tid, unsigned int tick, int id, intptr_t data)
status_calc_pc(sd, 0);
}
// wait for the next timer
- pd->bonus->timer=iTimer->add_timer(tick+timer,pet->skill_bonus_timer,sd->bl.id,0);
+ pd->bonus->timer=iTimer->add_timer(tick+duration,pet->skill_bonus_timer,sd->bl.id,0);
return 0;
}