12 files changed, 319 insertions, 319 deletions

diff --git a/source/Mobs/Bat.h b/source/Mobs/Bat.h
index df6745fe5..8e4cde29f 100644
--- a/source/Mobs/Bat.h
+++ b/source/Mobs/Bat.h
@@ -1,27 +1,27 @@
-

-#pragma once

-

-#include "PassiveMonster.h"

-

-

-

-

-

-class cBat :

-	public cPassiveMonster

-{

-	typedef cPassiveMonster super;

-	

-public:

-	cBat(void) :

-		// TODO: The size is only a guesstimate, measure in vanilla and fix the size values here

-		super("Bat", 65, "mob.bat.hurt", "mob.bat.death", 0.7, 0.7)

-	{

-	}

-

-	CLASS_PROTODEF(cBat);

-} ;

-

-

-

-

+
+#pragma once
+
+#include "PassiveMonster.h"
+
+
+
+
+
+class cBat :
+	public cPassiveMonster
+{
+	typedef cPassiveMonster super;
+	
+public:
+	cBat(void) :
+		// TODO: The size is only a guesstimate, measure in vanilla and fix the size values here
+		super("Bat", 65, "mob.bat.hurt", "mob.bat.death", 0.7, 0.7)
+	{
+	}
+
+	CLASS_PROTODEF(cBat);
+} ;
+
+
+
+
diff --git a/source/Mobs/Blaze.cpp b/source/Mobs/Blaze.cpp
index 069ee8934..dbbccf417 100644
--- a/source/Mobs/Blaze.cpp
+++ b/source/Mobs/Blaze.cpp
@@ -1,27 +1,27 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "Blaze.h"

-

-

-

-

-

-cBlaze::cBlaze(void) :

-	// TODO: The size is only a guesstimate, measure in vanilla and fix the size values here

-	super("Blaze", 61, "mob.blaze.hit", "mob.blaze.death", 0.7, 1.8)

-{

-}

-

-

-

-

-

-void cBlaze::GetDrops(cItems & a_Drops, cEntity * a_Killer)

-{

-	AddRandomDropItem(a_Drops, 0, 1, E_ITEM_BLAZE_ROD);

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "Blaze.h"
+
+
+
+
+
+cBlaze::cBlaze(void) :
+	// TODO: The size is only a guesstimate, measure in vanilla and fix the size values here
+	super("Blaze", 61, "mob.blaze.hit", "mob.blaze.death", 0.7, 1.8)
+{
+}
+
+
+
+
+
+void cBlaze::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+{
+	AddRandomDropItem(a_Drops, 0, 1, E_ITEM_BLAZE_ROD);
+}
+
+
+
+
diff --git a/source/Mobs/Blaze.h b/source/Mobs/Blaze.h
index 8b7a15848..9df57530e 100644
--- a/source/Mobs/Blaze.h
+++ b/source/Mobs/Blaze.h
@@ -1,25 +1,25 @@
-

-#pragma once

-

-#include "AggressiveMonster.h"

-

-

-

-

-

-class cBlaze :

-	public cAggressiveMonster

-{

-	typedef cAggressiveMonster super;

-	

-public:

-	cBlaze(void);

-

-	CLASS_PROTODEF(cBlaze);

-	

-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;

-} ;

-

-

-

-

+
+#pragma once
+
+#include "AggressiveMonster.h"
+
+
+
+
+
+class cBlaze :
+	public cAggressiveMonster
+{
+	typedef cAggressiveMonster super;
+	
+public:
+	cBlaze(void);
+
+	CLASS_PROTODEF(cBlaze);
+	
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/source/Mobs/Magmacube.cpp b/source/Mobs/Magmacube.cpp
index 156a29607..0b9b57e3c 100644
--- a/source/Mobs/Magmacube.cpp
+++ b/source/Mobs/Magmacube.cpp
@@ -1,27 +1,27 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "Magmacube.h"

-

-

-

-

-

-cMagmacube::cMagmacube(int a_Size) :

-	super("Magmacube", 62, "mob.magmacube.big", "mob.magmacube.big", 0.6 * a_Size, 0.6 * a_Size),

-	m_Size(a_Size)

-{

-}

-

-

-

-

-

-void cMagmacube::GetDrops(cItems & a_Drops, cEntity * a_Killer)

-{

-	AddRandomDropItem(a_Drops, 0, 1, E_ITEM_MAGMA_CREAM);

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "Magmacube.h"
+
+
+
+
+
+cMagmacube::cMagmacube(int a_Size) :
+	super("Magmacube", 62, "mob.magmacube.big", "mob.magmacube.big", 0.6 * a_Size, 0.6 * a_Size),
+	m_Size(a_Size)
+{
+}
+
+
+
+
+
+void cMagmacube::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+{
+	AddRandomDropItem(a_Drops, 0, 1, E_ITEM_MAGMA_CREAM);
+}
+
+
+
+
diff --git a/source/Mobs/Magmacube.h b/source/Mobs/Magmacube.h
index da62b9615..e4df4f33d 100644
--- a/source/Mobs/Magmacube.h
+++ b/source/Mobs/Magmacube.h
@@ -1,31 +1,31 @@
-

-#pragma once

-

-#include "AggressiveMonster.h"

-

-

-

-

-

-class cMagmacube :

-	public cAggressiveMonster

-{

-	typedef cAggressiveMonster super;

-	

-public:

-	/// Creates a magmacube of the specified size; size is 1 .. 3, with 1 being the smallest

-	cMagmacube(int a_Size);

-

-	CLASS_PROTODEF(cMagmacube);

-

-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;

-	

-protected:

-

-	/// Size of the magmacube, 1 .. 3, with 1 being the smallest

-	int m_Size;

-} ;

-

-

-

-

+
+#pragma once
+
+#include "AggressiveMonster.h"
+
+
+
+
+
+class cMagmacube :
+	public cAggressiveMonster
+{
+	typedef cAggressiveMonster super;
+	
+public:
+	/// Creates a magmacube of the specified size; size is 1 .. 3, with 1 being the smallest
+	cMagmacube(int a_Size);
+
+	CLASS_PROTODEF(cMagmacube);
+
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+	
+protected:
+
+	/// Size of the magmacube, 1 .. 3, with 1 being the smallest
+	int m_Size;
+} ;
+
+
+
+
diff --git a/source/Mobs/Mooshroom.cpp b/source/Mobs/Mooshroom.cpp
index c85ceda3a..5d2c901ba 100644
--- a/source/Mobs/Mooshroom.cpp
+++ b/source/Mobs/Mooshroom.cpp
@@ -1,33 +1,33 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "Mooshroom.h"

-

-

-

-

-

-// TODO: Milk Cow

-

-

-

-

-

-cMooshroom::cMooshroom(void) :

-	super("Mooshroom", 96, "mob.cow.hurt", "mob.cow.hurt", 0.9, 1.3)

-{

-}

-

-

-

-

-

-void cMooshroom::GetDrops(cItems & a_Drops, cEntity * a_Killer)

-{

-	AddRandomDropItem(a_Drops, 0, 2, E_ITEM_LEATHER);

-	AddRandomDropItem(a_Drops, 1, 3, IsOnFire() ? E_ITEM_STEAK : E_ITEM_RAW_BEEF);

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "Mooshroom.h"
+
+
+
+
+
+// TODO: Milk Cow
+
+
+
+
+
+cMooshroom::cMooshroom(void) :
+	super("Mooshroom", 96, "mob.cow.hurt", "mob.cow.hurt", 0.9, 1.3)
+{
+}
+
+
+
+
+
+void cMooshroom::GetDrops(cItems & a_Drops, cEntity * a_Killer)
+{
+	AddRandomDropItem(a_Drops, 0, 2, E_ITEM_LEATHER);
+	AddRandomDropItem(a_Drops, 1, 3, IsOnFire() ? E_ITEM_STEAK : E_ITEM_RAW_BEEF);
+}
+
+
+
+
diff --git a/source/Mobs/Mooshroom.h b/source/Mobs/Mooshroom.h
index 20fc293b9..73f6348b6 100644
--- a/source/Mobs/Mooshroom.h
+++ b/source/Mobs/Mooshroom.h
@@ -1,25 +1,25 @@
-

-#pragma once

-

-#include "PassiveMonster.h"

-

-

-

-

-

-class cMooshroom :

-	public cPassiveMonster

-{

-	typedef cPassiveMonster super;

-	

-public:

-	cMooshroom(void);

-

-	CLASS_PROTODEF(cMooshroom);

-

-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;

-} ;

-

-

-

-

+
+#pragma once
+
+#include "PassiveMonster.h"
+
+
+
+
+
+class cMooshroom :
+	public cPassiveMonster
+{
+	typedef cPassiveMonster super;
+	
+public:
+	cMooshroom(void);
+
+	CLASS_PROTODEF(cMooshroom);
+
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+
diff --git a/source/Mobs/Ocelot.h b/source/Mobs/Ocelot.h
index 4d22575f2..98ea224e2 100644
--- a/source/Mobs/Ocelot.h
+++ b/source/Mobs/Ocelot.h
@@ -1,27 +1,27 @@
-

-#pragma once

-

-#include "PassiveMonster.h"

-

-

-

-

-

-class cOcelot :

-	public cPassiveMonster

-{

-	typedef cPassiveMonster super;

-	

-public:

-	cOcelot(void) :

-		// TODO: The size is only a guesstimate, measure in vanilla and fix the size values here

-		super("Ocelot", 98, "mob.cat.hitt", "mob.cat.hitt", 0.9, 0.5)

-	{

-	}

-

-	CLASS_PROTODEF(cOcelot);

-} ;

-

-

-

-

+
+#pragma once
+
+#include "PassiveMonster.h"
+
+
+
+
+
+class cOcelot :
+	public cPassiveMonster
+{
+	typedef cPassiveMonster super;
+	
+public:
+	cOcelot(void) :
+		// TODO: The size is only a guesstimate, measure in vanilla and fix the size values here
+		super("Ocelot", 98, "mob.cat.hitt", "mob.cat.hitt", 0.9, 0.5)
+	{
+	}
+
+	CLASS_PROTODEF(cOcelot);
+} ;
+
+
+
+
diff --git a/source/Mobs/Villager.cpp b/source/Mobs/Villager.cpp
index 0ec2cf76c..98e5276e1 100644
--- a/source/Mobs/Villager.cpp
+++ b/source/Mobs/Villager.cpp
@@ -1,17 +1,17 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "Villager.h"

-

-

-

-

-

-cVillager::cVillager(void) :

-	super("Villager", 120, "", "", 0.6, 1.8)

-{

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "Villager.h"
+
+
+
+
+
+cVillager::cVillager(void) :
+	super("Villager", 120, "", "", 0.6, 1.8)
+{
+}
+
+
+
+
diff --git a/source/Mobs/Villager.h b/source/Mobs/Villager.h
index 4b50ed35e..92267a979 100644
--- a/source/Mobs/Villager.h
+++ b/source/Mobs/Villager.h
@@ -1,23 +1,23 @@
-

-#pragma once

-

-#include "PassiveMonster.h"

-

-

-

-

-

-class cVillager :

-	public cPassiveMonster

-{

-	typedef cPassiveMonster super;

-	

-public:

-	cVillager();

-

-	CLASS_PROTODEF(cVillager);

-} ;

-

-

-

-

+
+#pragma once
+
+#include "PassiveMonster.h"
+
+
+
+
+
+class cVillager :
+	public cPassiveMonster
+{
+	typedef cPassiveMonster super;
+	
+public:
+	cVillager();
+
+	CLASS_PROTODEF(cVillager);
+} ;
+
+
+
+
diff --git a/source/Mobs/Witch.cpp b/source/Mobs/Witch.cpp
index 66295ed1b..b29783853 100644
--- a/source/Mobs/Witch.cpp
+++ b/source/Mobs/Witch.cpp
@@ -1,32 +1,32 @@
-

-#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules

-

-#include "Witch.h"

-

-

-

-

-

-cWitch::cWitch(void) :

-	super("Witch", 66, "", "", 0.6, 1.8)

-{

-}

-

-

-

-

-

-void cWitch::GetDrops(cItems & a_Drops, cEntity * 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);

-}

-

-

-

-

+
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "Witch.h"
+
+
+
+
+
+cWitch::cWitch(void) :
+	super("Witch", 66, "", "", 0.6, 1.8)
+{
+}
+
+
+
+
+
+void cWitch::GetDrops(cItems & a_Drops, cEntity * 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);
+}
+
+
+
+
diff --git a/source/Mobs/Witch.h b/source/Mobs/Witch.h
index 2ca2c081f..ce0b49deb 100644
--- a/source/Mobs/Witch.h
+++ b/source/Mobs/Witch.h
@@ -1,25 +1,25 @@
-

-#pragma once

-

-#include "AggressiveMonster.h"

-

-

-

-

-

-class cWitch :

-	public cAggressiveMonster

-{

-	typedef cAggressiveMonster super;

-	

-public:

-	cWitch();

-

-	CLASS_PROTODEF(cWitch);

-

-	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;

-} ;

-

-

-

-

+
+#pragma once
+
+#include "AggressiveMonster.h"
+
+
+
+
+
+class cWitch :
+	public cAggressiveMonster
+{
+	typedef cAggressiveMonster super;
+	
+public:
+	cWitch();
+
+	CLASS_PROTODEF(cWitch);
+
+	virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override;
+} ;
+
+
+
+