40 files changed, 68 insertions, 68 deletions

diff --git a/source/cAggressiveMonster.cpp b/source/Mobs/AggressiveMonster.cpp
index 3fa61bb33..2a5370968 100644
--- a/source/cAggressiveMonster.cpp
+++ b/source/Mobs/AggressiveMonster.cpp
@@ -1,11 +1,11 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
-#include "Vector3f.h"
-#include "cPlayer.h"
-#include "MersenneTwister.h"
+#include "../Vector3f.h"
+#include "../cPlayer.h"
+#include "../MersenneTwister.h"
 
 
 cAggressiveMonster::cAggressiveMonster()
diff --git a/source/cAggressiveMonster.h b/source/Mobs/AggressiveMonster.h
index 579e712ae..7d741dc9a 100644
--- a/source/cAggressiveMonster.h
+++ b/source/Mobs/AggressiveMonster.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cMonster.h"
+#include "Monster.h"
 
 class cAggressiveMonster : public cMonster
 {
diff --git a/source/cCavespider.cpp b/source/Mobs/Cavespider.cpp
index 8d0285674..b2188da3d 100644
--- a/source/cCavespider.cpp
+++ b/source/Mobs/Cavespider.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cCavespider.h"
+#include "Cavespider.h"
 
 
 
diff --git a/source/cCavespider.h b/source/Mobs/Cavespider.h
index 0630351f0..163bb1f92 100644
--- a/source/cCavespider.h
+++ b/source/Mobs/Cavespider.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cCavespider : public cAggressiveMonster
 {
diff --git a/source/cChicken.cpp b/source/Mobs/Chicken.cpp
index ddc6400e4..940491ad4 100644
--- a/source/cChicken.cpp
+++ b/source/Mobs/Chicken.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cChicken.h"
+#include "Chicken.h"
 
 
 
diff --git a/source/cChicken.h b/source/Mobs/Chicken.h
index b04197414..acfb202e3 100644
--- a/source/cChicken.h
+++ b/source/Mobs/Chicken.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cChicken : public cPassiveMonster
 {
diff --git a/source/cCow.cpp b/source/Mobs/Cow.cpp
index c4f4ed523..0d107e1b5 100644
--- a/source/cCow.cpp
+++ b/source/Mobs/Cow.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cCow.h"
+#include "Cow.h"
 
 
 
diff --git a/source/cCow.h b/source/Mobs/Cow.h
index 83d67e1ad..bb604bad4 100644
--- a/source/cCow.h
+++ b/source/Mobs/Cow.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cCow : public cPassiveMonster
 {
diff --git a/source/cCreeper.cpp b/source/Mobs/Creeper.cpp
index 208d51845..b42d5690b 100644
--- a/source/cCreeper.cpp
+++ b/source/Mobs/Creeper.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cCreeper.h"
+#include "Creeper.h"
 
 
 
diff --git a/source/cCreeper.h b/source/Mobs/Creeper.h
index 4e8b4142e..e5c755103 100644
--- a/source/cCreeper.h
+++ b/source/Mobs/Creeper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cCreeper : public cAggressiveMonster
 {
diff --git a/source/cEnderman.cpp b/source/Mobs/Enderman.cpp
index 61bdfe06b..36ee975b1 100644
--- a/source/cEnderman.cpp
+++ b/source/Mobs/Enderman.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cEnderman.h"
+#include "Enderman.h"
 
 
 
diff --git a/source/cEnderman.h b/source/Mobs/Enderman.h
index d147cc4e7..788cc1314 100644
--- a/source/cEnderman.h
+++ b/source/Mobs/Enderman.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
 class cEnderman : public cPassiveAggressiveMonster
 {
diff --git a/source/cGhast.cpp b/source/Mobs/Ghast.cpp
index 857c1c6fb..4993f25c0 100644
--- a/source/cGhast.cpp
+++ b/source/Mobs/Ghast.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cGhast.h"
+#include "Ghast.h"
 
 
 
diff --git a/source/cGhast.h b/source/Mobs/Ghast.h
index e65a45ba0..6991419e7 100644
--- a/source/cGhast.h
+++ b/source/Mobs/Ghast.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cGhast : public cAggressiveMonster
 {
diff --git a/source/cMonster.cpp b/source/Mobs/Monster.cpp
index 8b1a22bb7..9142bd6a8 100644
--- a/source/cMonster.cpp
+++ b/source/Mobs/Monster.cpp
@@ -1,27 +1,28 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cMonster.h"
-#include "cRoot.h"
-#include "cServer.h"
-#include "cClientHandle.h"
-#include "cWorld.h"
-#include "cPlayer.h"
-#include "Defines.h"
-#include "cMonsterConfig.h"
-#include "MersenneTwister.h"
-
-#include "Vector3f.h"
-#include "Vector3i.h"
-#include "Vector3d.h"
-
-#include "cTracer.h"
-#include "../iniFile/iniFile.h"
-
+#include "Monster.h"
+#include "../cRoot.h"
+#include "../cServer.h"
+#include "../cClientHandle.h"
+#include "../cWorld.h"
+#include "../cPlayer.h"
+#include "../Defines.h"
+#include "../cMonsterConfig.h"
+#include "../MersenneTwister.h"
+
+#include "../Vector3f.h"
+#include "../Vector3i.h"
+#include "../Vector3d.h"
+
+#include "../cTracer.h"
+#include "../../iniFile/iniFile.h"
+
+/*
 #ifndef _WIN32
-	#include <cstdlib> // rand
 	#include <unistd.h>
 #endif
+*/
 
 
 
diff --git a/source/cMonster.h b/source/Mobs/Monster.h
index f16b7aa56..0958d182c 100644
--- a/source/cMonster.h
+++ b/source/Mobs/Monster.h
@@ -1,12 +1,11 @@
 
 #pragma once
 
-#include "cPawn.h"
-#include "Defines.h"
-#include "cWorld.h"
-#include "BlockID.h"
-#include "cItem.h"
-#include "BlockID.h"
+#include "../cPawn.h"
+#include "../Defines.h"
+#include "../cWorld.h"
+#include "../BlockID.h"
+#include "../cItem.h"
 
 
 
diff --git a/source/cPassiveAggressiveMonster.cpp b/source/Mobs/PassiveAggressiveMonster.cpp
index 946ef86e0..abf37ee59 100644
--- a/source/cPassiveAggressiveMonster.cpp
+++ b/source/Mobs/PassiveAggressiveMonster.cpp
@@ -1,9 +1,9 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
-#include "cPlayer.h"
+#include "../cPlayer.h"
 
 
 
diff --git a/source/cPassiveAggressiveMonster.h b/source/Mobs/PassiveAggressiveMonster.h
index 0d1de9fd0..972d2a11d 100644
--- a/source/cPassiveAggressiveMonster.h
+++ b/source/Mobs/PassiveAggressiveMonster.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cPassiveAggressiveMonster : public cAggressiveMonster
 {
diff --git a/source/cPassiveMonster.cpp b/source/Mobs/PassiveMonster.cpp
index 7a4bc6979..bc3f70b4b 100644
--- a/source/cPassiveMonster.cpp
+++ b/source/Mobs/PassiveMonster.cpp
@@ -1,8 +1,8 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cPassiveMonster.h"
-#include "MersenneTwister.h"
+#include "PassiveMonster.h"
+#include "../MersenneTwister.h"
 
 
 
diff --git a/source/cPassiveMonster.h b/source/Mobs/PassiveMonster.h
index ba784b242..1265dc737 100644
--- a/source/cPassiveMonster.h
+++ b/source/Mobs/PassiveMonster.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cMonster.h"
+#include "Monster.h"
 
 class cPassiveMonster : public cMonster
 {
diff --git a/source/cPig.cpp b/source/Mobs/Pig.cpp
index 14a713954..48954dc73 100644
--- a/source/cPig.cpp
+++ b/source/Mobs/Pig.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cPig.h"
+#include "Pig.h"
 
 
 
diff --git a/source/cPig.h b/source/Mobs/Pig.h
index 481aa2969..e701535ba 100644
--- a/source/cPig.h
+++ b/source/Mobs/Pig.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cPig : public cPassiveMonster
 {
diff --git a/source/cSheep.cpp b/source/Mobs/Sheep.cpp
index c9fed280a..1f5f1815f 100644
--- a/source/cSheep.cpp
+++ b/source/Mobs/Sheep.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSheep.h"
+#include "Sheep.h"
 
 
 
diff --git a/source/cSheep.h b/source/Mobs/Sheep.h
index 98faa266c..28c2b97dc 100644
--- a/source/cSheep.h
+++ b/source/Mobs/Sheep.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cSheep : public cPassiveMonster
 {
diff --git a/source/cSilverfish.cpp b/source/Mobs/Silverfish.cpp
index 7302934b6..1525966c4 100644
--- a/source/cSilverfish.cpp
+++ b/source/Mobs/Silverfish.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSilverfish.h"
+#include "Silverfish.h"
 
 
 
diff --git a/source/cSilverfish.h b/source/Mobs/Silverfish.h
index 1cdc89e62..fe23a4ba1 100644
--- a/source/cSilverfish.h
+++ b/source/Mobs/Silverfish.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSilverfish : public cAggressiveMonster
 {
diff --git a/source/cSkeleton.cpp b/source/Mobs/Skeleton.cpp
index 69ee55d23..56bbb9310 100644
--- a/source/cSkeleton.cpp
+++ b/source/Mobs/Skeleton.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSkeleton.h"
+#include "Skeleton.h"
 
 
 
diff --git a/source/cSkeleton.h b/source/Mobs/Skeleton.h
index 78eeb731f..84a434905 100644
--- a/source/cSkeleton.h
+++ b/source/Mobs/Skeleton.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSkeleton : public cAggressiveMonster
 {
diff --git a/source/cSlime.cpp b/source/Mobs/Slime.cpp
index c314caae3..b8dc52d7c 100644
--- a/source/cSlime.cpp
+++ b/source/Mobs/Slime.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSlime.h"
+#include "Slime.h"
 
 //TODO Implement sized slimes
 
diff --git a/source/cSlime.h b/source/Mobs/Slime.h
index e2e108516..cceac617d 100644
--- a/source/cSlime.h
+++ b/source/Mobs/Slime.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSlime : public cAggressiveMonster
 {
diff --git a/source/cSpider.cpp b/source/Mobs/Spider.cpp
index 516a941d4..dfa7a8a6a 100644
--- a/source/cSpider.cpp
+++ b/source/Mobs/Spider.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSpider.h"
+#include "Spider.h"
 
 
 
diff --git a/source/cSpider.h b/source/Mobs/Spider.h
index ea7d4ba4f..12133bdb8 100644
--- a/source/cSpider.h
+++ b/source/Mobs/Spider.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cSpider : public cAggressiveMonster
 {
diff --git a/source/cSquid.cpp b/source/Mobs/Squid.cpp
index 735df1be0..f88c295a4 100644
--- a/source/cSquid.cpp
+++ b/source/Mobs/Squid.cpp
@@ -1,8 +1,8 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cSquid.h"
-#include "Vector3d.h"
+#include "Squid.h"
+#include "../Vector3d.h"
 
 
 
diff --git a/source/cSquid.h b/source/Mobs/Squid.h
index 93b82d0eb..eaf13b5c7 100644
--- a/source/cSquid.h
+++ b/source/Mobs/Squid.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveMonster.h"
+#include "PassiveMonster.h"
 
 class cSquid : public cPassiveMonster
 {
diff --git a/source/cWolf.cpp b/source/Mobs/Wolf.cpp
index fa693bcbd..bd7fa213b 100644
--- a/source/cWolf.cpp
+++ b/source/Mobs/Wolf.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cWolf.h"
+#include "Wolf.h"
 
 cWolf::cWolf()
 {
diff --git a/source/cWolf.h b/source/Mobs/Wolf.h
index 174968cdb..bde5b9d32 100644
--- a/source/cWolf.h
+++ b/source/Mobs/Wolf.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
 class cWolf : public cPassiveAggressiveMonster
 {
diff --git a/source/cZombie.cpp b/source/Mobs/Zombie.cpp
index 94c1d669b..b51931904 100644
--- a/source/cZombie.cpp
+++ b/source/Mobs/Zombie.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cZombie.h"
+#include "Zombie.h"
 
 
 
diff --git a/source/cZombie.h b/source/Mobs/Zombie.h
index 4d6e39fb0..6adaaf41f 100644
--- a/source/cZombie.h
+++ b/source/Mobs/Zombie.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cAggressiveMonster.h"
+#include "AggressiveMonster.h"
 
 class cZombie : public cAggressiveMonster
 {
diff --git a/source/cZombiepigman.cpp b/source/Mobs/Zombiepigman.cpp
index 5aefbae72..65293cfce 100644
--- a/source/cZombiepigman.cpp
+++ b/source/Mobs/Zombiepigman.cpp
@@ -1,7 +1,7 @@
 
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "cZombiepigman.h"
+#include "Zombiepigman.h"
 
 
 
diff --git a/source/cZombiepigman.h b/source/Mobs/Zombiepigman.h
index 76fb34e4b..93fe2d607 100644
--- a/source/cZombiepigman.h
+++ b/source/Mobs/Zombiepigman.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "cPassiveAggressiveMonster.h"
+#include "PassiveAggressiveMonster.h"
 
 class cZombiepigman : public cPassiveAggressiveMonster
 {