From 37276a4430e26f5b3ab56e07d5f30a194f75982e Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 1 Jul 2013 10:39:56 +0000 Subject: Rewritten entity-on-fire management ("forever on fire" bugs) Fixes FS #297 and part of FS #403. Added sizes to all entities. Moved all damage-related functions from cPawn to cEntity API change: renamed cPawn:TeleportTo() to cEntity:TeleportToCoords() git-svn-id: http://mc-server.googlecode.com/svn/trunk@1635 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Mobs/Zombie.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source/Mobs/Zombie.cpp') diff --git a/source/Mobs/Zombie.cpp b/source/Mobs/Zombie.cpp index cf0391b4c..d0a929519 100644 --- a/source/Mobs/Zombie.cpp +++ b/source/Mobs/Zombie.cpp @@ -8,7 +8,7 @@ cZombie::cZombie(void) : - super("Zombie", 54, "mob.zombie.hurt", "mob.zombie.death") + super("Zombie", 54, "mob.zombie.hurt", "mob.zombie.death", 0.6, 1.8) { } @@ -21,9 +21,10 @@ void cZombie::Tick(float a_Dt, cChunk & a_Chunk) super::Tick(a_Dt, a_Chunk); // TODO Same as in cSkeleton :D - if ((GetWorld()->GetTimeOfDay() < (12000 + 1000)) && !IsBurning()) + if ((GetWorld()->GetTimeOfDay() < (12000 + 1000)) && !IsOnFire()) { - SetMetaData(BURNING); // BURN, BABY, BURN! >:D + // Burn for 10 ticks, then decide again + StartBurning(10); } } @@ -31,7 +32,7 @@ void cZombie::Tick(float a_Dt, cChunk & a_Chunk) -void cZombie::GetDrops(cItems & a_Drops, cPawn * a_Killer) +void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer) { AddRandomDropItem(a_Drops, 0, 2, E_ITEM_ROTTEN_FLESH); -- cgit v1.2.3