summaryrefslogtreecommitdiffstats
path: root/source/Mobs/Cavespider.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Mobs/Cavespider.cpp27
1 files changed, 8 insertions, 19 deletions
diff --git a/source/Mobs/Cavespider.cpp b/source/Mobs/Cavespider.cpp
index 6c7ed0a7a..9336f8f5b 100644
--- a/source/Mobs/Cavespider.cpp
+++ b/source/Mobs/Cavespider.cpp
@@ -7,7 +7,7 @@
-cCavespider::cCavespider()
+cCavespider::cCavespider(void)
{
m_MobType = 59;
GetMonsterConfig("Cavespider");
@@ -17,18 +17,9 @@ cCavespider::cCavespider()
-cCavespider::~cCavespider()
+bool cCavespider::IsA(const char * a_EntityType)
{
-}
-
-
-
-
-
-bool cCavespider::IsA( const char* a_EntityType )
-{
- if( strcmp( a_EntityType, "cCavespider" ) == 0 ) return true;
- return cMonster::IsA( a_EntityType );
+ return ((strcmp(a_EntityType, "cCaveSpider") == 0) || super::IsA(a_EntityType));
}
@@ -37,7 +28,8 @@ bool cCavespider::IsA( const char* a_EntityType )
void cCavespider::Tick(float a_Dt)
{
- cMonster::Tick(a_Dt);
+ super::Tick(a_Dt);
+ // TODO: Check vanilla if cavespiders really get passive during the day
m_EMPersonality = (GetWorld()->GetTimeOfDay() < (12000 + 1000)) ? PASSIVE : AGGRESSIVE;
}
@@ -45,13 +37,10 @@ void cCavespider::Tick(float a_Dt)
-void cCavespider::KilledBy( cEntity* a_Killer )
+void cCavespider::GetDrops(cItems & a_Drops, cPawn * a_Killer)
{
- cItems Drops;
- AddRandomDropItem(Drops, 0, 2, E_ITEM_STRING);
- AddRandomDropItem(Drops, 0, 1, E_ITEM_SPIDER_EYE);
-
- cMonster::KilledBy( a_Killer );
+ AddRandomDropItem(a_Drops, 0, 2, E_ITEM_STRING);
+ AddRandomDropItem(a_Drops, 0, 1, E_ITEM_SPIDER_EYE);
}