diff options
| author | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-10-31 01:52:20 +0100 |
|---|---|---|
| committer | faketruth <faketruth@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-10-31 01:52:20 +0100 |
| commit | e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f (patch) | |
| tree | 2519b9736038f7d5374719122b4ba7937d2e309c /source/cZombie.cpp | |
| parent | put the timer and quicksort functions into their own files. Made a few changes to the converter. Converter doesn't understand Entity tags and some chunks cause it to segfault for a currently unknown reason. (diff) | |
| download | cuberite-e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f.tar cuberite-e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f.tar.gz cuberite-e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f.tar.bz2 cuberite-e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f.tar.lz cuberite-e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f.tar.xz cuberite-e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f.tar.zst cuberite-e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/cZombie.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/cZombie.cpp b/source/cZombie.cpp index 23953f274..10fb609bb 100644 --- a/source/cZombie.cpp +++ b/source/cZombie.cpp @@ -41,7 +41,7 @@ bool cZombie::IsA( const char* a_EntityType ) void cZombie::Tick(float a_Dt)
{
cMonster::Tick(a_Dt);
- if (cRoot::Get()->GetWorld()->GetWorldTime() < (12000 + 1000) ) { //if daylight
+ if (GetWorld()->GetWorldTime() < (12000 + 1000) ) { //if daylight
m_EMMetaState = BURNING; // BURN, BABY, BURN! >:D
}
}
@@ -51,12 +51,12 @@ void cZombie::KilledBy( cEntity* a_Killer ) if( (rand() % 5) == 0 )
{
cPickup* Pickup = new cPickup( (int)(m_Pos->x*32), (int)(m_Pos->y*32), (int)(m_Pos->z*32), cItem( E_ITEM_EGG, 1 ) );
- Pickup->Initialize();
+ Pickup->Initialize( GetWorld() );
}
if( (rand() % 1) == 0 )
{
cPickup* Pickup = new cPickup( (int)(m_Pos->x*32), (int)(m_Pos->y*32), (int)(m_Pos->z*32), cItem( E_ITEM_FEATHER, 1 ) );
- Pickup->Initialize();
+ Pickup->Initialize( GetWorld() );
}
cMonster::KilledBy( a_Killer );
}
|