From 251c961eea640e18a90aaddc6c787d999dca09dd Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 23 Sep 2012 20:03:26 +0000 Subject: [PATCH] Source files cleanup: Protocol-related files in a separate subfolder git-svn-id: http://mc-server.googlecode.com/svn/trunk@880 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- VC2008/MCServer.vcproj | 14 +++++++------- source/{ => Protocol}/Protocol.h | 4 ++-- source/{ => Protocol}/Protocol125.cpp | 20 ++++++++++---------- source/{ => Protocol}/Protocol125.h | 2 +- source/{ => Protocol}/Protocol132.cpp | 18 +++++++++--------- source/{ => Protocol}/Protocol132.h | 4 ++-- source/{ => Protocol}/ProtocolRecognizer.cpp | 8 ++++---- source/{ => Protocol}/ProtocolRecognizer.h | 2 +- source/cClientHandle.cpp | 2 +- source/cServer.cpp | 2 +- 10 files changed, 38 insertions(+), 38 deletions(-) rename source/{ => Protocol}/Protocol.h (96%) rename source/{ => Protocol}/Protocol125.cpp (94%) rename source/{ => Protocol}/Protocol125.h (97%) rename source/{ => Protocol}/Protocol132.cpp (94%) rename source/{ => Protocol}/Protocol132.h (95%) rename source/{ => Protocol}/ProtocolRecognizer.cpp (93%) rename source/{ => Protocol}/ProtocolRecognizer.h (97%) diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj index 95ae8b2ea..adfa67baa 100644 --- a/VC2008/MCServer.vcproj +++ b/VC2008/MCServer.vcproj @@ -2004,31 +2004,31 @@ Name="Protocol" > diff --git a/source/Protocol.h b/source/Protocol/Protocol.h similarity index 96% rename from source/Protocol.h rename to source/Protocol/Protocol.h index 0823b3189..af915a2bb 100644 --- a/source/Protocol.h +++ b/source/Protocol/Protocol.h @@ -10,8 +10,8 @@ #pragma once -#include "Defines.h" -#include "Endianness.h" +#include "../Defines.h" +#include "../Endianness.h" diff --git a/source/Protocol125.cpp b/source/Protocol/Protocol125.cpp similarity index 94% rename from source/Protocol125.cpp rename to source/Protocol/Protocol125.cpp index 27b559ee1..dc2e39c16 100644 --- a/source/Protocol125.cpp +++ b/source/Protocol/Protocol125.cpp @@ -13,16 +13,16 @@ Documentation: #include "Protocol125.h" -#include "cClientHandle.h" -#include "ChunkDataSerializer.h" -#include "cEntity.h" -#include "cMonster.h" -#include "cPickup.h" -#include "cPlayer.h" -#include "cChatColor.h" -#include "UI/Window.h" -#include "cRoot.h" -#include "cServer.h" +#include "../cClientHandle.h" +#include "../ChunkDataSerializer.h" +#include "../cEntity.h" +#include "../cMonster.h" +#include "../cPickup.h" +#include "../cPlayer.h" +#include "../cChatColor.h" +#include "../UI/Window.h" +#include "../cRoot.h" +#include "../cServer.h" diff --git a/source/Protocol125.h b/source/Protocol/Protocol125.h similarity index 97% rename from source/Protocol125.h rename to source/Protocol/Protocol125.h index daa2a8c55..62c91c2e1 100644 --- a/source/Protocol125.h +++ b/source/Protocol/Protocol125.h @@ -10,7 +10,7 @@ #pragma once #include "Protocol.h" -#include "ByteBuffer.h" +#include "../ByteBuffer.h" diff --git a/source/Protocol132.cpp b/source/Protocol/Protocol132.cpp similarity index 94% rename from source/Protocol132.cpp rename to source/Protocol/Protocol132.cpp index b34ff485a..33f404113 100644 --- a/source/Protocol132.cpp +++ b/source/Protocol/Protocol132.cpp @@ -5,15 +5,15 @@ #include "Globals.h" #include "Protocol132.h" -#include "cRoot.h" -#include "cServer.h" -#include "cClientHandle.h" -#include "CryptoPP/randpool.h" -#include "cItem.h" -#include "ChunkDataSerializer.h" -#include "cPlayer.h" -#include "cMonster.h" -#include "UI/Window.h" +#include "../cRoot.h" +#include "../cServer.h" +#include "../cClientHandle.h" +#include "../../CryptoPP/randpool.h" +#include "../cItem.h" +#include "../ChunkDataSerializer.h" +#include "../cPlayer.h" +#include "../cMonster.h" +#include "../UI/Window.h" diff --git a/source/Protocol132.h b/source/Protocol/Protocol132.h similarity index 95% rename from source/Protocol132.h rename to source/Protocol/Protocol132.h index 8c70d8774..dde34ca30 100644 --- a/source/Protocol132.h +++ b/source/Protocol/Protocol132.h @@ -10,8 +10,8 @@ #pragma once #include "Protocol125.h" -#include "CryptoPP/modes.h" -#include "CryptoPP/aes.h" +#include "../../CryptoPP/modes.h" +#include "../../CryptoPP/aes.h" diff --git a/source/ProtocolRecognizer.cpp b/source/Protocol/ProtocolRecognizer.cpp similarity index 93% rename from source/ProtocolRecognizer.cpp rename to source/Protocol/ProtocolRecognizer.cpp index 31f74e608..18bf3b0b3 100644 --- a/source/ProtocolRecognizer.cpp +++ b/source/Protocol/ProtocolRecognizer.cpp @@ -9,10 +9,10 @@ #include "ProtocolRecognizer.h" #include "Protocol125.h" #include "Protocol132.h" -#include "cClientHandle.h" -#include "cRoot.h" -#include "cWorld.h" -#include "cChatColor.h" +#include "../cClientHandle.h" +#include "../cRoot.h" +#include "../cWorld.h" +#include "../cChatColor.h" diff --git a/source/ProtocolRecognizer.h b/source/Protocol/ProtocolRecognizer.h similarity index 97% rename from source/ProtocolRecognizer.h rename to source/Protocol/ProtocolRecognizer.h index a2941fc7a..3eff8d2ab 100644 --- a/source/ProtocolRecognizer.h +++ b/source/Protocol/ProtocolRecognizer.h @@ -11,7 +11,7 @@ #pragma once #include "Protocol.h" -#include "ByteBuffer.h" +#include "../ByteBuffer.h" diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp index 5aa06eb36..6a1ba695e 100644 --- a/source/cClientHandle.cpp +++ b/source/cClientHandle.cpp @@ -39,7 +39,7 @@ #include "cAuthenticator.h" #include "MersenneTwister.h" -#include "ProtocolRecognizer.h" +#include "Protocol/ProtocolRecognizer.h" diff --git a/source/cServer.cpp b/source/cServer.cpp index a4e2607a5..0ededcf3c 100644 --- a/source/cServer.cpp +++ b/source/cServer.cpp @@ -20,7 +20,7 @@ #include "cFurnaceRecipe.h" #include "cTracer.h" #include "cWebAdmin.h" -#include "ProtocolRecognizer.h" +#include "Protocol/ProtocolRecognizer.h" #include "MersenneTwister.h"