diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-21 12:04:08 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-12-21 12:04:08 +0100 |
| commit | 912a1e7adc650d20b0302a3dfe45816b5e541bc7 (patch) | |
| tree | 65e7ffbf33d8f1335a4997fc5a727739f9dcdd34 /source/Mobs/Witch.cpp | |
| parent | Extended player inventory by direct r/o access to armor slots (diff) | |
| download | cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.gz cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.bz2 cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.lz cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.xz cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.tar.zst cuberite-912a1e7adc650d20b0302a3dfe45816b5e541bc7.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/Mobs/Witch.cpp | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/source/Mobs/Witch.cpp b/source/Mobs/Witch.cpp index 02d1de4fe..5077f0cdd 100644 --- a/source/Mobs/Witch.cpp +++ b/source/Mobs/Witch.cpp @@ -17,37 +17,24 @@ cWitch::cWitch() -cWitch::~cWitch()
+bool cWitch::IsA(const char * a_EntityType)
{
+ return ((strcmp(a_EntityType, "cWitch") == 0) || super::IsA(a_EntityType));
}
-bool cWitch::IsA( const char* a_EntityType )
+void cWitch::GetDrops(cItems & a_Drops, cPawn * a_Killer)
{
- if( strcmp( a_EntityType, "cWitch" ) == 0 ) return true;
- return cMonster::IsA( a_EntityType );
-}
-
-
-
-
-
-void cWitch::KilledBy( cEntity* a_Killer )
-{
- cItems Drops;
- AddRandomDropItem(Drops, 0, 6, E_ITEM_GLASS_BOTTLE);
- AddRandomDropItem(Drops, 0, 6, E_ITEM_GLOWSTONE_DUST);
- AddRandomDropItem(Drops, 0, 6, E_ITEM_GUNPOWDER);
- AddRandomDropItem(Drops, 0, 6, E_ITEM_REDSTONE_DUST);
- AddRandomDropItem(Drops, 0, 6, E_ITEM_SPIDER_EYE);
- AddRandomDropItem(Drops, 0, 6, E_ITEM_STICK);
- AddRandomDropItem(Drops, 0, 6, E_ITEM_SUGAR);
- m_World->SpawnItemPickups(Drops, m_Pos.x, m_Pos.y, m_Pos.z);
-
- cMonster::KilledBy( a_Killer );
+ AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GLASS_BOTTLE);
+ AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GLOWSTONE_DUST);
+ AddRandomDropItem(a_Drops, 0, 6, E_ITEM_GUNPOWDER);
+ AddRandomDropItem(a_Drops, 0, 6, E_ITEM_REDSTONE_DUST);
+ AddRandomDropItem(a_Drops, 0, 6, E_ITEM_SPIDER_EYE);
+ AddRandomDropItem(a_Drops, 0, 6, E_ITEM_STICK);
+ AddRandomDropItem(a_Drops, 0, 6, E_ITEM_SUGAR);
}
|