13 files changed, 18 insertions, 24 deletions

diff --git a/MCServer/monsters.ini b/MCServer/monsters.ini
index fa376bfff..b631fc1a9 100644
--- a/MCServer/monsters.ini
+++ b/MCServer/monsters.ini
@@ -55,7 +55,7 @@ SightDistance=25.0
 MaxHealth=20
 IsFireproof=1
 
-[Cavespider]
+[CaveSpider]
 AttackRange=2.0
 AttackRate=1  
 AttackDamage=2.0
diff --git a/src/ByteBuffer.cpp b/src/ByteBuffer.cpp
index 1893d89a8..c634dc308 100644
--- a/src/ByteBuffer.cpp
+++ b/src/ByteBuffer.cpp
@@ -143,7 +143,7 @@ protected:
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // cByteBuffer:
 
-cByteBuffer::cByteBuffer(int a_BufferSize) :
+cByteBuffer::cByteBuffer(size_t a_BufferSize) :
 	m_Buffer(new char[a_BufferSize + 1]),
 	m_BufferSize(a_BufferSize + 1),
 	#ifdef _DEBUG
diff --git a/src/ByteBuffer.h b/src/ByteBuffer.h
index 1915467f3..44f43e17f 100644
--- a/src/ByteBuffer.h
+++ b/src/ByteBuffer.h
@@ -27,7 +27,7 @@ their own synchronization.
 class cByteBuffer
 {
 public:
-	cByteBuffer(int a_BufferSize);
+	cByteBuffer(size_t a_BufferSize);
 	~cByteBuffer();
 	
 	/// Writes the bytes specified to the ringbuffer. Returns true if successful, false if not
diff --git a/src/Mobs/Cavespider.cpp b/src/Mobs/CaveSpider.cpp
index 94e93283d..56ecd2d28 100644
--- a/src/Mobs/Cavespider.cpp
+++ b/src/Mobs/CaveSpider.cpp
@@ -1,15 +1,14 @@
-
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "Cavespider.h"
+#include "CaveSpider.h"
 #include "../World.h"
 
 
 
 
 
-cCavespider::cCavespider(void) :
-	super("Cavespider", mtCaveSpider, "mob.spider.say", "mob.spider.death", 0.7, 0.5)
+cCaveSpider::cCaveSpider(void) :
+	super("CaveSpider", mtCaveSpider, "mob.spider.say", "mob.spider.death", 0.7, 0.5)
 {
 }
 
@@ -17,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);
 
@@ -29,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 10ea03f7b..be9f174f9 100644
--- a/src/Mobs/Cavespider.h
+++ b/src/Mobs/CaveSpider.h
@@ -1,4 +1,3 @@
-
 #pragma once
 
 #include "AggressiveMonster.h"
@@ -7,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/IncludeAllMonsters.h b/src/Mobs/IncludeAllMonsters.h
index 1b436a11f..3460db993 100644
--- a/src/Mobs/IncludeAllMonsters.h
+++ b/src/Mobs/IncludeAllMonsters.h
@@ -1,6 +1,6 @@
 #include "Bat.h"
 #include "Blaze.h"
-#include "Cavespider.h"
+#include "CaveSpider.h"
 #include "Chicken.h"
 #include "Cow.h"
 #include "Creeper.h"
@@ -10,7 +10,7 @@
 #include "Giant.h"
 #include "Horse.h"
 #include "IronGolem.h"
-#include "Magmacube.h"
+#include "MagmaCube.h"
 #include "Mooshroom.h"
 #include "Ocelot.h"
 #include "Pig.h"
@@ -26,4 +26,4 @@
 #include "Wither.h"
 #include "Wolf.h"
 #include "Zombie.h"
-#include "Zombiepigman.h"
+#include "ZombiePigman.h"
diff --git a/src/Mobs/Magmacube.cpp b/src/Mobs/MagmaCube.cpp
index 05405f082..3e9abc108 100644
--- a/src/Mobs/Magmacube.cpp
+++ b/src/Mobs/MagmaCube.cpp
@@ -1,7 +1,6 @@
-
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "Magmacube.h"
+#include "MagmaCube.h"
 
 
 
diff --git a/src/Mobs/Magmacube.h b/src/Mobs/MagmaCube.h
index 130952970..43065cae5 100644
--- a/src/Mobs/Magmacube.h
+++ b/src/Mobs/MagmaCube.h
@@ -1,4 +1,3 @@
-
 #pragma once
 
 #include "AggressiveMonster.h"
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/Mobs/Zombiepigman.cpp b/src/Mobs/ZombiePigman.cpp
index a0142b566..c9d94face 100644
--- a/src/Mobs/Zombiepigman.cpp
+++ b/src/Mobs/ZombiePigman.cpp
@@ -1,7 +1,6 @@
-
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "Zombiepigman.h"
+#include "ZombiePigman.h"
 #include "../World.h"
 
 
diff --git a/src/Mobs/Zombiepigman.h b/src/Mobs/ZombiePigman.h
index 67991d56a..ab3cebf6d 100644
--- a/src/Mobs/Zombiepigman.h
+++ b/src/Mobs/ZombiePigman.h
@@ -1,4 +1,3 @@
-
 #pragma once
 
 #include "PassiveAggressiveMonster.h"
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index 415693ae2..b6c14db9c 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -39,7 +39,7 @@
 #include "../Mobs/Creeper.h"
 #include "../Mobs/Enderman.h"
 #include "../Mobs/Horse.h"
-#include "../Mobs/Magmacube.h"
+#include "../Mobs/MagmaCube.h"
 #include "../Mobs/Sheep.h"
 #include "../Mobs/Slime.h"
 #include "../Mobs/Skeleton.h"
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;