summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-24 21:00:27 +0200
committerarchshift <admin@archshift.com>2014-04-24 21:18:17 +0200
commit8fc45c57307203a86352bdd7a788fb20cff797ff (patch)
tree57f1476f841c245a8f844784814033f34430339d
parentFixed references to renamed files. (diff)
downloadcuberite-8fc45c57307203a86352bdd7a788fb20cff797ff.tar
cuberite-8fc45c57307203a86352bdd7a788fb20cff797ff.tar.gz
cuberite-8fc45c57307203a86352bdd7a788fb20cff797ff.tar.bz2
cuberite-8fc45c57307203a86352bdd7a788fb20cff797ff.tar.lz
cuberite-8fc45c57307203a86352bdd7a788fb20cff797ff.tar.xz
cuberite-8fc45c57307203a86352bdd7a788fb20cff797ff.tar.zst
cuberite-8fc45c57307203a86352bdd7a788fb20cff797ff.zip
Diffstat (limited to '')
-rw-r--r--src/Mobs/CaveSpider.cpp6
-rw-r--r--src/Mobs/CaveSpider.h4
-rw-r--r--src/Mobs/Monster.cpp2
-rw-r--r--src/WorldStorage/WSSAnvil.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/Mobs/CaveSpider.cpp b/src/Mobs/CaveSpider.cpp
index 8e35102a4..56ecd2d28 100644
--- a/src/Mobs/CaveSpider.cpp
+++ b/src/Mobs/CaveSpider.cpp
@@ -7,7 +7,7 @@
-cCavespider::cCavespider(void) :
+cCaveSpider::cCaveSpider(void) :
super("CaveSpider", mtCaveSpider, "mob.spider.say", "mob.spider.death", 0.7, 0.5)
{
}
@@ -16,7 +16,7 @@ cCavespider::cCavespider(void) :
-void cCavespider::Tick(float a_Dt, cChunk & a_Chunk)
+void cCaveSpider::Tick(float a_Dt, cChunk & a_Chunk)
{
super::Tick(a_Dt, a_Chunk);
@@ -28,7 +28,7 @@ void cCavespider::Tick(float a_Dt, cChunk & a_Chunk)
-void cCavespider::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+void cCaveSpider::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
int LootingLevel = 0;
if (a_Killer != NULL)
diff --git a/src/Mobs/CaveSpider.h b/src/Mobs/CaveSpider.h
index c2aacd2c7..be9f174f9 100644
--- a/src/Mobs/CaveSpider.h
+++ b/src/Mobs/CaveSpider.h
@@ -6,13 +6,13 @@
-class cCavespider :
+class cCaveSpider :
public cAggressiveMonster
{
typedef cAggressiveMonster super;
public:
- cCavespider(void);
+ cCaveSpider(void);
CLASS_PROTODEF(cCaveSpider);
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index 248e88f5d..eb8480268 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -859,7 +859,7 @@ cMonster * cMonster::NewMonsterFromType(cMonster::eType a_MobType)
case mtBat: toReturn = new cBat(); break;
case mtBlaze: toReturn = new cBlaze(); break;
- case mtCaveSpider: toReturn = new cCavespider(); break;
+ case mtCaveSpider: toReturn = new cCaveSpider(); break;
case mtChicken: toReturn = new cChicken(); break;
case mtCow: toReturn = new cCow(); break;
case mtCreeper: toReturn = new cCreeper(); break;
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index 48934d074..66144dbd5 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1757,7 +1757,7 @@ void cWSSAnvil::LoadBlazeFromNBT(cEntityList & a_Entities, const cParsedNBT & a_
void cWSSAnvil::LoadCaveSpiderFromNBT(cEntityList & a_Entities, const cParsedNBT & a_NBT, int a_TagIdx)
{
- std::auto_ptr<cCavespider> Monster(new cCavespider());
+ std::auto_ptr<cCaveSpider> Monster(new cCaveSpider());
if (!LoadEntityBaseFromNBT(*Monster.get(), a_NBT, a_TagIdx))
{
return;