Merge pull request #78 from WushR00M/patch-2

Optimize file paths in some include files to use relative paths

4 files changed, 20 insertions, 20 deletions

diff --git a/Minecraft.Client/Common/ConsoleGameMode.cpp b/Minecraft.Client/Common/ConsoleGameMode.cpp
index b080e628..703d3f55 100644
--- a/Minecraft.Client/Common/ConsoleGameMode.cpp
+++ b/Minecraft.Client/Common/ConsoleGameMode.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
 #include "ConsoleGameMode.h"
-#include "..\Common\Tutorial\Tutorial.h"
+#include ".\Tutorial\Tutorial.h"
 
 ConsoleGameMode::ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection)
 	: TutorialMode(iPad, minecraft, connection)
 {
 	tutorial = new Tutorial(iPad);
-}
\ No newline at end of file
+}
diff --git a/Minecraft.Client/Common/ConsoleGameMode.h b/Minecraft.Client/Common/ConsoleGameMode.h
index 3e486cbf..983381b5 100644
--- a/Minecraft.Client/Common/ConsoleGameMode.h
+++ b/Minecraft.Client/Common/ConsoleGameMode.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "..\Common\Tutorial\TutorialMode.h"
+#include ".\Tutorial\TutorialMode.h"
 
 class ConsoleGameMode : public TutorialMode
 {
@@ -7,4 +7,4 @@ public:
 	ConsoleGameMode(int iPad, Minecraft *minecraft, ClientConnection *connection);
 
 	virtual bool isImplemented() { return true; }
-};
\ No newline at end of file
+};
diff --git a/Minecraft.Client/Common/Consoles_App.cpp b/Minecraft.Client/Common/Consoles_App.cpp
index c2082965..b047f58e 100644
--- a/Minecraft.Client/Common/Consoles_App.cpp
+++ b/Minecraft.Client/Common/Consoles_App.cpp
@@ -9,12 +9,12 @@
 #include "..\MultiPlayerLevel.h"
 #include "..\GameRenderer.h"
 #include "..\ProgressRenderer.h"
-#include "..\..\Minecraft.Client\LevelRenderer.h"
-#include "..\..\Minecraft.Client\MobSkinMemTextureProcessor.h"
-#include "..\..\Minecraft.Client\Minecraft.h"
+#include "..\LevelRenderer.h"
+#include "..\MobSkinMemTextureProcessor.h"
+#include "..\Minecraft.h"
 #include "..\ClientConnection.h"
 #include "..\MultiPlayerLocalPlayer.h"
-#include "..\..\Minecraft.Client\LocalPlayer.h"
+#include "..\LocalPlayer.h"
 #include "..\..\Minecraft.World\Player.h"
 #include "..\..\Minecraft.World\Inventory.h"
 #include "..\..\Minecraft.World\Level.h"
@@ -22,17 +22,17 @@
 #include "..\..\Minecraft.World\Container.h"
 #include "..\..\Minecraft.World\DispenserTileEntity.h"
 #include "..\..\Minecraft.World\SignTileEntity.h"
-#include "..\..\Minecraft.Client\StatsCounter.h"
+#include "..\StatsCounter.h"
 #include "..\GameMode.h"
 #include "..\Xbox\Social\SocialManager.h"
 #include "Tutorial\TutorialMode.h"
 #if defined _XBOX || defined _WINDOWS64
-#include "..\..\Minecraft.Client\Xbox\XML\ATGXmlParser.h"
-#include "..\..\Minecraft.Client\Xbox\XML\xmlFilesCallback.h"
+#include "..\Xbox\XML\ATGXmlParser.h"
+#include "..\Xbox\XML\xmlFilesCallback.h"
 #endif
 #include "Minecraft_Macros.h"
-#include "..\..\Minecraft.Client\PlayerList.h"
-#include "..\..\Minecraft.Client\ServerPlayer.h"
+#include "..\PlayerList.h"
+#include "..\ServerPlayer.h"
 #include "GameRules\ConsoleGameRules.h"
 #include "GameRules\ConsoleSchematicFile.h"
 #include "..\..\Minecraft.World\InputOutputStream.h"
@@ -40,7 +40,7 @@
 #include "..\User.h"
 #include "..\..\Minecraft.World\LevelData.h"
 #include "..\..\Minecraft.World\net.minecraft.world.entity.player.h"
-#include "..\..\Minecraft.Client\EntityRenderDispatcher.h"
+#include "..\EntityRenderDispatcher.h"
 #include "..\..\Minecraft.World\compression.h"
 #include "..\TexturePackRepository.h"
 #include "..\DLCTexturePack.h"
diff --git a/Minecraft.Client/Common/Consoles_App.h b/Minecraft.Client/Common/Consoles_App.h
index 14356010..110054f2 100644
--- a/Minecraft.Client/Common/Consoles_App.h
+++ b/Minecraft.Client/Common/Consoles_App.h
@@ -5,11 +5,11 @@ using namespace std;
 #include "Audio/Consoles_SoundEngine.h"
 
 #include <xuiapp.h>
-#include "..\Common\Tutorial\TutorialEnum.h"
+#include ".\Tutorial\TutorialEnum.h"
 
 #ifdef _XBOX
-#include "..\Common\XUI\XUI_Helper.h"
-#include "..\Common\XUI\XUI_HelpCredits.h"
+#include ".\XUI\XUI_Helper.h"
+#include ".\XUI\XUI_HelpCredits.h"
 #endif
 #include "UI\UIStructs.h"
 
@@ -17,9 +17,9 @@ using namespace std;
 #include <xsocialpost.h>
 
 #include "..\StringTable.h"
-#include "..\Common\DLC\DLCManager.h"
-#include "..\Common\GameRules\ConsoleGameRulesConstants.h"
-#include "..\Common\GameRules\GameRuleManager.h"
+#include ".\DLC\DLCManager.h"
+#include ".\GameRules\ConsoleGameRulesConstants.h"
+#include ".\GameRules\GameRuleManager.h"
 #include "..\SkinBox.h"
 #include "..\ArchiveFile.h"