diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-15 21:49:21 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-15 21:49:21 +0000 |
| commit | fd6ff31e591191e8f6bbf2dee4bfe9001cc14395 (patch) | |
| tree | 43c82e038c108ff8d6fba03f5b939d9010b6cbcd /src/map/pet.c | |
| parent | 1b0780d6839a63bfaf4ff5b0287aa83605d817d9 (diff) | |
| download | hercules-fd6ff31e591191e8f6bbf2dee4bfe9001cc14395.tar.gz hercules-fd6ff31e591191e8f6bbf2dee4bfe9001cc14395.tar.bz2 hercules-fd6ff31e591191e8f6bbf2dee4bfe9001cc14395.tar.xz hercules-fd6ff31e591191e8f6bbf2dee4bfe9001cc14395.zip | |
Getting some (mostly atcommand) code cleaning out of the way...
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11222 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index ebfbc6a0e..b593cbdff 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -212,11 +212,11 @@ int pet_sc_check(struct map_session_data *sd, int type) nullpo_retr(0, sd); pd = sd->pd; - if (pd == NULL || - (battle_config.pet_equip_required && pd->pet.equip == 0) || - pd->recovery == NULL || - pd->recovery->timer != -1 || - pd->recovery->type != type) + if( pd == NULL + || (battle_config.pet_equip_required && pd->pet.equip == 0) + || pd->recovery == NULL + || pd->recovery->timer != -1 + || pd->recovery->type != type ) return 1; pd->recovery->timer = add_timer(gettick()+pd->recovery->delay*1000,pet_recovery_timer,sd->bl.id,0); |