summaryrefslogtreecommitdiffstats
path: root/source/Mobs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Mobs/AggressiveMonster.cpp2
-rw-r--r--source/Mobs/Monster.cpp14
-rw-r--r--source/Mobs/Monster.h6
-rw-r--r--source/Mobs/PassiveAggressiveMonster.cpp2
4 files changed, 12 insertions, 12 deletions
diff --git a/source/Mobs/AggressiveMonster.cpp b/source/Mobs/AggressiveMonster.cpp
index 2a5370968..d178ce8f8 100644
--- a/source/Mobs/AggressiveMonster.cpp
+++ b/source/Mobs/AggressiveMonster.cpp
@@ -4,7 +4,7 @@
#include "AggressiveMonster.h"
#include "../Vector3f.h"
-#include "../cPlayer.h"
+#include "../Player.h"
#include "../MersenneTwister.h"
diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp
index 9142bd6a8..1a93f8d75 100644
--- a/source/Mobs/Monster.cpp
+++ b/source/Mobs/Monster.cpp
@@ -2,20 +2,20 @@
#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
#include "Monster.h"
-#include "../cRoot.h"
-#include "../cServer.h"
-#include "../cClientHandle.h"
-#include "../cWorld.h"
-#include "../cPlayer.h"
+#include "../Root.h"
+#include "../Server.h"
+#include "../ClientHandle.h"
+#include "../World.h"
+#include "../Player.h"
#include "../Defines.h"
-#include "../cMonsterConfig.h"
+#include "../MonsterConfig.h"
#include "../MersenneTwister.h"
#include "../Vector3f.h"
#include "../Vector3i.h"
#include "../Vector3d.h"
-#include "../cTracer.h"
+#include "../Tracer.h"
#include "../../iniFile/iniFile.h"
/*
diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h
index 0958d182c..f0da23977 100644
--- a/source/Mobs/Monster.h
+++ b/source/Mobs/Monster.h
@@ -1,11 +1,11 @@
#pragma once
-#include "../cPawn.h"
+#include "../Pawn.h"
#include "../Defines.h"
-#include "../cWorld.h"
+#include "../World.h"
#include "../BlockID.h"
-#include "../cItem.h"
+#include "../Item.h"
diff --git a/source/Mobs/PassiveAggressiveMonster.cpp b/source/Mobs/PassiveAggressiveMonster.cpp
index abf37ee59..9d9e156ee 100644
--- a/source/Mobs/PassiveAggressiveMonster.cpp
+++ b/source/Mobs/PassiveAggressiveMonster.cpp
@@ -3,7 +3,7 @@
#include "PassiveAggressiveMonster.h"
-#include "../cPlayer.h"
+#include "../Player.h"