summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-23 23:37:46 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-23 23:37:46 +0200
commit96bc0a2c792220923ce8c57a3bf7f88b203d8fea (patch)
treefc1664d206ed7c54f6afa75e1d37a63fd9c88c05
parentSource files cleanup: OSSupport-related files in a separate subfolder, renamed. (diff)
downloadcuberite-96bc0a2c792220923ce8c57a3bf7f88b203d8fea.tar
cuberite-96bc0a2c792220923ce8c57a3bf7f88b203d8fea.tar.gz
cuberite-96bc0a2c792220923ce8c57a3bf7f88b203d8fea.tar.bz2
cuberite-96bc0a2c792220923ce8c57a3bf7f88b203d8fea.tar.lz
cuberite-96bc0a2c792220923ce8c57a3bf7f88b203d8fea.tar.xz
cuberite-96bc0a2c792220923ce8c57a3bf7f88b203d8fea.tar.zst
cuberite-96bc0a2c792220923ce8c57a3bf7f88b203d8fea.zip
Diffstat (limited to '')
-rw-r--r--VC2008/MCServer.vcproj16
-rw-r--r--source/ChunkSender.cpp2
-rw-r--r--source/Protocol/ChunkDataSerializer.cpp (renamed from source/ChunkDataSerializer.cpp)0
-rw-r--r--source/Protocol/ChunkDataSerializer.h (renamed from source/ChunkDataSerializer.h)0
-rw-r--r--source/Protocol/Protocol125.cpp2
-rw-r--r--source/Protocol/Protocol132.cpp2
-rw-r--r--source/cClientHandle.cpp1
7 files changed, 11 insertions, 12 deletions
diff --git a/VC2008/MCServer.vcproj b/VC2008/MCServer.vcproj
index 2acef09df..cafb18701 100644
--- a/VC2008/MCServer.vcproj
+++ b/VC2008/MCServer.vcproj
@@ -397,14 +397,6 @@
>
</File>
<File
- RelativePath="..\source\ChunkDataSerializer.cpp"
- >
- </File>
- <File
- RelativePath="..\source\ChunkDataSerializer.h"
- >
- </File>
- <File
RelativePath="..\source\ChunkDef.h"
>
</File>
@@ -1996,6 +1988,14 @@
Name="Protocol"
>
<File
+ RelativePath="..\source\Protocol\ChunkDataSerializer.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\source\Protocol\ChunkDataSerializer.h"
+ >
+ </File>
+ <File
RelativePath="..\source\Protocol\Protocol.h"
>
</File>
diff --git a/source/ChunkSender.cpp b/source/ChunkSender.cpp
index 25fb94e17..922d77ad6 100644
--- a/source/ChunkSender.cpp
+++ b/source/ChunkSender.cpp
@@ -11,7 +11,7 @@
#include "ChunkSender.h"
#include "cWorld.h"
#include "cBlockEntity.h"
-#include "ChunkDataSerializer.h"
+#include "Protocol/ChunkDataSerializer.h"
diff --git a/source/ChunkDataSerializer.cpp b/source/Protocol/ChunkDataSerializer.cpp
index 7af07f331..7af07f331 100644
--- a/source/ChunkDataSerializer.cpp
+++ b/source/Protocol/ChunkDataSerializer.cpp
diff --git a/source/ChunkDataSerializer.h b/source/Protocol/ChunkDataSerializer.h
index 513a232b9..513a232b9 100644
--- a/source/ChunkDataSerializer.h
+++ b/source/Protocol/ChunkDataSerializer.h
diff --git a/source/Protocol/Protocol125.cpp b/source/Protocol/Protocol125.cpp
index 0a3814f47..67c8f53b3 100644
--- a/source/Protocol/Protocol125.cpp
+++ b/source/Protocol/Protocol125.cpp
@@ -14,7 +14,7 @@ Documentation:
#include "Protocol125.h"
#include "../cClientHandle.h"
-#include "../ChunkDataSerializer.h"
+#include "ChunkDataSerializer.h"
#include "../cEntity.h"
#include "../Mobs/Monster.h"
#include "../cPickup.h"
diff --git a/source/Protocol/Protocol132.cpp b/source/Protocol/Protocol132.cpp
index 0d21ca01f..9e6af0729 100644
--- a/source/Protocol/Protocol132.cpp
+++ b/source/Protocol/Protocol132.cpp
@@ -10,7 +10,7 @@
#include "../cClientHandle.h"
#include "../../CryptoPP/randpool.h"
#include "../cItem.h"
-#include "../ChunkDataSerializer.h"
+#include "ChunkDataSerializer.h"
#include "../cPlayer.h"
#include "../Mobs/Monster.h"
#include "../UI/Window.h"
diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp
index a910d53d7..2d97cfa01 100644
--- a/source/cClientHandle.cpp
+++ b/source/cClientHandle.cpp
@@ -25,7 +25,6 @@
#include "OSSupport/Timer.h"
#include "items/Item.h"
#include "blocks/Block.h"
-#include "ChunkDataSerializer.h"
#include "cTracer.h"
#include "Vector3f.h"