From e2f1cf51c759f0c70bc1dc9f1db3a8575e1db10f Mon Sep 17 00:00:00 2001 From: faketruth Date: Mon, 31 Oct 2011 00:52:20 +0000 Subject: Prepared some parts of the code for multi world support, I created lots of TODO's git-svn-id: http://mc-server.googlecode.com/svn/trunk@29 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cSkeleton.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/cSkeleton.cpp') diff --git a/source/cSkeleton.cpp b/source/cSkeleton.cpp index 84de27d7a..6cdb7b23b 100644 --- a/source/cSkeleton.cpp +++ b/source/cSkeleton.cpp @@ -41,7 +41,7 @@ bool cSkeleton::IsA( const char* a_EntityType ) void cSkeleton::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 cSkeleton::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 ); } -- cgit v1.2.3