summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-24 00:25:10 +0200
committerarchshift <admin@archshift.com>2014-04-24 00:25:10 +0200
commit06819595b0a5366711bb4aa156a2198650e5c0ff (patch)
treed88b99c795aac0a3bf4d3cdc80cdcc0968cc4807
parentRename mob source files to fit CamelCase. (diff)
downloadcuberite-06819595b0a5366711bb4aa156a2198650e5c0ff.tar
cuberite-06819595b0a5366711bb4aa156a2198650e5c0ff.tar.gz
cuberite-06819595b0a5366711bb4aa156a2198650e5c0ff.tar.bz2
cuberite-06819595b0a5366711bb4aa156a2198650e5c0ff.tar.lz
cuberite-06819595b0a5366711bb4aa156a2198650e5c0ff.tar.xz
cuberite-06819595b0a5366711bb4aa156a2198650e5c0ff.tar.zst
cuberite-06819595b0a5366711bb4aa156a2198650e5c0ff.zip
-rw-r--r--MCServer/monsters.ini2
-rw-r--r--src/Mobs/CaveSpider.cpp4
-rw-r--r--src/Mobs/IncludeAllMonsters.h6
-rw-r--r--src/Mobs/MagmaCube.cpp2
-rw-r--r--src/Mobs/ZombiePigman.cpp2
-rw-r--r--src/WorldStorage/NBTChunkSerializer.cpp2
6 files changed, 9 insertions, 9 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/Mobs/CaveSpider.cpp b/src/Mobs/CaveSpider.cpp
index 4660ae44d..8e35102a4 100644
--- a/src/Mobs/CaveSpider.cpp
+++ b/src/Mobs/CaveSpider.cpp
@@ -1,6 +1,6 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
-#include "Cavespider.h"
+#include "CaveSpider.h"
#include "../World.h"
@@ -8,7 +8,7 @@
cCavespider::cCavespider(void) :
- super("Cavespider", mtCaveSpider, "mob.spider.say", "mob.spider.death", 0.7, 0.5)
+ super("CaveSpider", mtCaveSpider, "mob.spider.say", "mob.spider.death", 0.7, 0.5)
{
}
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 064152072..3e9abc108 100644
--- a/src/Mobs/MagmaCube.cpp
+++ b/src/Mobs/MagmaCube.cpp
@@ -1,6 +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/ZombiePigman.cpp b/src/Mobs/ZombiePigman.cpp
index b6f95a3e1..c9d94face 100644
--- a/src/Mobs/ZombiePigman.cpp
+++ b/src/Mobs/ZombiePigman.cpp
@@ -1,6 +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/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"