diff options
Diffstat (limited to 'source')
64 files changed, 89 insertions, 87 deletions
diff --git a/source/MemoryLeak.h b/source/MemoryLeak.h index 6ac06a302..a7f0c316b 100644 --- a/source/MemoryLeak.h +++ b/source/MemoryLeak.h @@ -1,18 +1,19 @@ #pragma once
#ifdef _WIN32
-
-#ifdef _DEBUG
-
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
-
-#ifndef DEBUG_NEW
-#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
-#define new DEBUG_NEW
-#endif
-
-#endif
-
-#endif
+ #ifdef _DEBUG
+ // Enable the CRT debugging features:
+ #define _CRTDBG_MAP_ALLOC
+ #include <stdlib.h>
+ #include <crtdbg.h>
+
+ // This works only in MSVC 2010+:
+ #if _MSC_VER >= 1600
+ // Map the new operator
+ #ifndef DEBUG_NEW
+ #define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
+ #define new DEBUG_NEW
+ #endif // _CRTDBG_MAP_ALLOC
+ #endif // _MSC_VER
+ #endif // _DEBUG
+#endif // _WIN32
diff --git a/source/cChunkMap.cpp b/source/cChunkMap.cpp index fb23096d8..a6bf6bda0 100644 --- a/source/cChunkMap.cpp +++ b/source/cChunkMap.cpp @@ -4,11 +4,11 @@ #include "cWorld.h"
#include "cRoot.h"
#include "cMakeDir.h"
+#include <math.h> // floorf
#ifndef _WIN32
#include <cstring> // memcpy
#include <cstdlib> // abs
-#include <math.h> // floorf
#include <stdio.h> // sprintf and stuff
diff --git a/source/cSemaphore.h b/source/cSemaphore.h index 86e473d11..42966b410 100644 --- a/source/cSemaphore.h +++ b/source/cSemaphore.h @@ -9,9 +9,9 @@ public: void Wait();
void Signal();
private:
- void* m_Handle; // HANDLE pointer - -#ifndef _WIN32 - bool m_bNamed; + void* m_Handle; // HANDLE pointer
+
+#ifndef _WIN32
+ bool m_bNamed;
#endif
-}; +};
diff --git a/source/packets/cPacket.cpp b/source/packets/cPacket.cpp index 7775ede73..a22e27d41 100644 --- a/source/packets/cPacket.cpp +++ b/source/packets/cPacket.cpp @@ -1,6 +1,6 @@ #include "cPacket.h"
-#include "cMCLogger.h"
-#include "Endianness.h"
+#include "../cMCLogger.h"
+#include "../Endianness.h"
#ifdef _WIN32
#define MSG_NOSIGNAL (0)
diff --git a/source/packets/cPacket.h b/source/packets/cPacket.h index 304d6b8d3..5f226cfcf 100644 --- a/source/packets/cPacket.h +++ b/source/packets/cPacket.h @@ -1,6 +1,8 @@ #pragma once
-#include "cSocket.h"
+#include "../cSocket.h"
+#include "../PacketID.h"
+
#ifdef _WIN32
#include <xstring>
#else
diff --git a/source/packets/cPacket_13.h b/source/packets/cPacket_13.h index ec9aedc3c..fb001166e 100644 --- a/source/packets/cPacket_13.h +++ b/source/packets/cPacket_13.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_13 : public cPacket
{
diff --git a/source/packets/cPacket_AddToInventory.cpp b/source/packets/cPacket_AddToInventory.cpp index 72f099e2f..e8701cb7b 100644 --- a/source/packets/cPacket_AddToInventory.cpp +++ b/source/packets/cPacket_AddToInventory.cpp @@ -1,6 +1,6 @@ #include "cPacket_AddToInventory.h"
#include "cPacket_WholeInventory.h"
-#include "cItem.h"
+#include "../cItem.h"
#include "cPacket_ItemData.h"
bool cPacket_AddToInventory::Send( cSocket & a_Socket )
diff --git a/source/packets/cPacket_AddToInventory.h b/source/packets/cPacket_AddToInventory.h index f6710e521..5dbfcf6a5 100644 --- a/source/packets/cPacket_AddToInventory.h +++ b/source/packets/cPacket_AddToInventory.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
#include "../BlockID.h"
class cPacket_AddToInventory : public cPacket
diff --git a/source/packets/cPacket_ArmAnim.h b/source/packets/cPacket_ArmAnim.h index e22d88506..b8e2f2139 100644 --- a/source/packets/cPacket_ArmAnim.h +++ b/source/packets/cPacket_ArmAnim.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_ArmAnim : public cPacket
{
diff --git a/source/packets/cPacket_BlockAction.h b/source/packets/cPacket_BlockAction.h index 11633859d..2d05f8944 100644 --- a/source/packets/cPacket_BlockAction.h +++ b/source/packets/cPacket_BlockAction.h @@ -1,7 +1,7 @@ #pragma once #include "cPacket.h" -#include "PacketID.h" + class cPacket_BlockAction : public cPacket { diff --git a/source/packets/cPacket_BlockChange.h b/source/packets/cPacket_BlockChange.h index 0cd6cfb6f..ca118b58d 100644 --- a/source/packets/cPacket_BlockChange.h +++ b/source/packets/cPacket_BlockChange.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_BlockChange : public cPacket
{
diff --git a/source/packets/cPacket_BlockDig.h b/source/packets/cPacket_BlockDig.h index 7ea847aa1..7f6e1f4d2 100644 --- a/source/packets/cPacket_BlockDig.h +++ b/source/packets/cPacket_BlockDig.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_BlockDig : public cPacket //tolua_export
{ //tolua_export
diff --git a/source/packets/cPacket_BlockPlace.h b/source/packets/cPacket_BlockPlace.h index c7f72bacf..fb8907622 100644 --- a/source/packets/cPacket_BlockPlace.h +++ b/source/packets/cPacket_BlockPlace.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_BlockPlace : public cPacket //tolua_export
{ //tolua_export
diff --git a/source/packets/cPacket_Chat.h b/source/packets/cPacket_Chat.h index 0de5c9343..521c21a9b 100644 --- a/source/packets/cPacket_Chat.h +++ b/source/packets/cPacket_Chat.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_Chat : public cPacket
{
diff --git a/source/packets/cPacket_CollectItem.h b/source/packets/cPacket_CollectItem.h index 5f11500b5..390da80dc 100644 --- a/source/packets/cPacket_CollectItem.h +++ b/source/packets/cPacket_CollectItem.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_CollectItem : public cPacket
{
diff --git a/source/packets/cPacket_CreativeInventoryAction.h b/source/packets/cPacket_CreativeInventoryAction.h index bb50c25db..4dd029a05 100644 --- a/source/packets/cPacket_CreativeInventoryAction.h +++ b/source/packets/cPacket_CreativeInventoryAction.h @@ -1,7 +1,7 @@ #pragma once #include "cPacket.h" -#include "PacketID.h" + //Sure itīs not Creative Inventory? diff --git a/source/packets/cPacket_DestroyEntity.cpp b/source/packets/cPacket_DestroyEntity.cpp index e0ee22c76..6dfd059c8 100644 --- a/source/packets/cPacket_DestroyEntity.cpp +++ b/source/packets/cPacket_DestroyEntity.cpp @@ -1,5 +1,5 @@ #include "cPacket_DestroyEntity.h"
-#include "cEntity.h"
+#include "../cEntity.h"
cPacket_DestroyEntity::cPacket_DestroyEntity(cEntity* a_Entity)
{
diff --git a/source/packets/cPacket_DestroyEntity.h b/source/packets/cPacket_DestroyEntity.h index 0b852e727..7410bd8eb 100644 --- a/source/packets/cPacket_DestroyEntity.h +++ b/source/packets/cPacket_DestroyEntity.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cEntity;
class cPacket_DestroyEntity : public cPacket
diff --git a/source/packets/cPacket_Disconnect.h b/source/packets/cPacket_Disconnect.h index 0711851f4..42497e639 100644 --- a/source/packets/cPacket_Disconnect.h +++ b/source/packets/cPacket_Disconnect.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_Disconnect : public cPacket
{
diff --git a/source/packets/cPacket_EntityEquipment.h b/source/packets/cPacket_EntityEquipment.h index 253786140..1358db7ee 100644 --- a/source/packets/cPacket_EntityEquipment.h +++ b/source/packets/cPacket_EntityEquipment.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_EntityEquipment : public cPacket
{
diff --git a/source/packets/cPacket_EntityLook.cpp b/source/packets/cPacket_EntityLook.cpp index 7dcbf61c2..f4caf7191 100644 --- a/source/packets/cPacket_EntityLook.cpp +++ b/source/packets/cPacket_EntityLook.cpp @@ -1,6 +1,6 @@ #include "cPacket_EntityLook.h"
-#include "cEntity.h"
+#include "../cEntity.h"
cPacket_EntityLook::cPacket_EntityLook(cEntity* a_Entity)
{
diff --git a/source/packets/cPacket_EntityLook.h b/source/packets/cPacket_EntityLook.h index 215620f07..e1e7c1a93 100644 --- a/source/packets/cPacket_EntityLook.h +++ b/source/packets/cPacket_EntityLook.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cEntity;
class cPacket_EntityLook : public cPacket
diff --git a/source/packets/cPacket_EntityStatus.h b/source/packets/cPacket_EntityStatus.h index 2511e2935..53fced00a 100644 --- a/source/packets/cPacket_EntityStatus.h +++ b/source/packets/cPacket_EntityStatus.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_EntityStatus : public cPacket
{
diff --git a/source/packets/cPacket_Explosion.h b/source/packets/cPacket_Explosion.h index 587f1683b..c37783115 100644 --- a/source/packets/cPacket_Explosion.h +++ b/source/packets/cPacket_Explosion.h @@ -1,7 +1,7 @@ #pragma once #include "cPacket.h" -#include "PacketID.h" + class cPacket_Explosion : public cPacket { diff --git a/source/packets/cPacket_Flying.h b/source/packets/cPacket_Flying.h index 7e30ebd73..63395204e 100644 --- a/source/packets/cPacket_Flying.h +++ b/source/packets/cPacket_Flying.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_Flying : public cPacket
{
diff --git a/source/packets/cPacket_Handshake.h b/source/packets/cPacket_Handshake.h index b14d829f4..f9fd7c367 100644 --- a/source/packets/cPacket_Handshake.h +++ b/source/packets/cPacket_Handshake.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_Handshake : public cPacket
{
diff --git a/source/packets/cPacket_InventoryProgressBar.h b/source/packets/cPacket_InventoryProgressBar.h index c9b5e196e..401ec1f6e 100644 --- a/source/packets/cPacket_InventoryProgressBar.h +++ b/source/packets/cPacket_InventoryProgressBar.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_InventoryProgressBar : public cPacket
{
diff --git a/source/packets/cPacket_InventorySlot.h b/source/packets/cPacket_InventorySlot.h index 47672989e..b02444593 100644 --- a/source/packets/cPacket_InventorySlot.h +++ b/source/packets/cPacket_InventorySlot.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
#include "../BlockID.h"
class cPacket_InventorySlot : public cPacket // Set item [S -> C] ?
diff --git a/source/packets/cPacket_ItemData.h b/source/packets/cPacket_ItemData.h index 86bdb9af2..26f07b54d 100644 --- a/source/packets/cPacket_ItemData.h +++ b/source/packets/cPacket_ItemData.h @@ -1,8 +1,8 @@ #pragma once
-#include "PacketID.h"
+
#include "cPacket.h"
-#include "cItem.h"
+#include "../cItem.h"
class cPacket_ItemData : public cPacket
{
diff --git a/source/packets/cPacket_ItemSwitch.h b/source/packets/cPacket_ItemSwitch.h index 8fee397c7..c1342c0dd 100644 --- a/source/packets/cPacket_ItemSwitch.h +++ b/source/packets/cPacket_ItemSwitch.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_ItemSwitch : public cPacket
{
diff --git a/source/packets/cPacket_KeepAlive.h b/source/packets/cPacket_KeepAlive.h index 85bd14083..5ef56c20b 100644 --- a/source/packets/cPacket_KeepAlive.h +++ b/source/packets/cPacket_KeepAlive.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_KeepAlive : public cPacket
{
diff --git a/source/packets/cPacket_Login.h b/source/packets/cPacket_Login.h index 71fa6e9c1..c92c22838 100644 --- a/source/packets/cPacket_Login.h +++ b/source/packets/cPacket_Login.h @@ -2,7 +2,7 @@ #include "cPacket.h"
#include <string>
-#include "PacketID.h"
+
class cPacket_Login : public cPacket //tolua_export
{ //tolua_export
diff --git a/source/packets/cPacket_MapChunk.h b/source/packets/cPacket_MapChunk.h index 48e2cbf1f..9c5a6b58f 100644 --- a/source/packets/cPacket_MapChunk.h +++ b/source/packets/cPacket_MapChunk.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cChunk;
class cPacket_MapChunk : public cPacket
diff --git a/source/packets/cPacket_Metadata.h b/source/packets/cPacket_Metadata.h index 00d0ae7d3..23d16f7df 100644 --- a/source/packets/cPacket_Metadata.h +++ b/source/packets/cPacket_Metadata.h @@ -1,7 +1,7 @@ #pragma once #include "cPacket.h" -#include "PacketID.h" -#include "cPawn.h" + +#include "../cPawn.h" class cPacket_Metadata : public cPacket { diff --git a/source/packets/cPacket_MultiBlock.h b/source/packets/cPacket_MultiBlock.h index fb5e50d93..9dbebe3d2 100644 --- a/source/packets/cPacket_MultiBlock.h +++ b/source/packets/cPacket_MultiBlock.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_MultiBlock : public cPacket
{
diff --git a/source/packets/cPacket_NamedEntitySpawn.h b/source/packets/cPacket_NamedEntitySpawn.h index 1a404f693..4cd690bfe 100644 --- a/source/packets/cPacket_NamedEntitySpawn.h +++ b/source/packets/cPacket_NamedEntitySpawn.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_NamedEntitySpawn : public cPacket
{
diff --git a/source/packets/cPacket_NewInvalidState.h b/source/packets/cPacket_NewInvalidState.h index a83cb8080..fc86840de 100644 --- a/source/packets/cPacket_NewInvalidState.h +++ b/source/packets/cPacket_NewInvalidState.h @@ -1,7 +1,7 @@ #pragma once #include "cPacket.h" -#include "PacketID.h" + class cPacket_NewInvalidState : public cPacket diff --git a/source/packets/cPacket_PickupSpawn.h b/source/packets/cPacket_PickupSpawn.h index c4152eedd..a6226474e 100644 --- a/source/packets/cPacket_PickupSpawn.h +++ b/source/packets/cPacket_PickupSpawn.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_PickupSpawn : public cPacket
{
diff --git a/source/packets/cPacket_Ping.h b/source/packets/cPacket_Ping.h index abab822a4..68b96faa5 100644 --- a/source/packets/cPacket_Ping.h +++ b/source/packets/cPacket_Ping.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_Ping : public cPacket
{
diff --git a/source/packets/cPacket_PlayerListItem.cpp b/source/packets/cPacket_PlayerListItem.cpp index 03eea157d..85970b7ca 100644 --- a/source/packets/cPacket_PlayerListItem.cpp +++ b/source/packets/cPacket_PlayerListItem.cpp @@ -1,5 +1,5 @@ #include "cPacket_PlayerListItem.h"
-#include "cChatColor.h"
+#include "../cChatColor.h"
cPacket_PlayerListItem::cPacket_PlayerListItem(std::string a_PlayerName, bool a_Online, short a_Ping)
{
diff --git a/source/packets/cPacket_PlayerListItem.h b/source/packets/cPacket_PlayerListItem.h index 19eee3d1f..840b4b81f 100644 --- a/source/packets/cPacket_PlayerListItem.h +++ b/source/packets/cPacket_PlayerListItem.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_PlayerListItem : public cPacket
{
diff --git a/source/packets/cPacket_PlayerLook.h b/source/packets/cPacket_PlayerLook.h index 1f315a78b..f1be2fb8b 100644 --- a/source/packets/cPacket_PlayerLook.h +++ b/source/packets/cPacket_PlayerLook.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPlayer;
class cPacket_PlayerLook : public cPacket
diff --git a/source/packets/cPacket_PlayerMoveLook.h b/source/packets/cPacket_PlayerMoveLook.h index aff958927..ca2d51f1a 100644 --- a/source/packets/cPacket_PlayerMoveLook.h +++ b/source/packets/cPacket_PlayerMoveLook.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPlayer;
class cPacket_PlayerMoveLook : public cPacket
diff --git a/source/packets/cPacket_PlayerPosition.cpp b/source/packets/cPacket_PlayerPosition.cpp index eb17bc7e5..e1d6877bb 100644 --- a/source/packets/cPacket_PlayerPosition.cpp +++ b/source/packets/cPacket_PlayerPosition.cpp @@ -1,5 +1,5 @@ #include "cPacket_PlayerPosition.h"
-#include "cPlayer.h"
+#include "../cPlayer.h"
cPacket_PlayerPosition::cPacket_PlayerPosition( cPlayer* a_Player )
{
diff --git a/source/packets/cPacket_PlayerPosition.h b/source/packets/cPacket_PlayerPosition.h index d9c68a2e6..87fc127d5 100644 --- a/source/packets/cPacket_PlayerPosition.h +++ b/source/packets/cPacket_PlayerPosition.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPlayer;
class cPacket_PlayerPosition : public cPacket
diff --git a/source/packets/cPacket_PreChunk.h b/source/packets/cPacket_PreChunk.h index a6bd4897e..e1ac82f39 100644 --- a/source/packets/cPacket_PreChunk.h +++ b/source/packets/cPacket_PreChunk.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_PreChunk: public cPacket
{
diff --git a/source/packets/cPacket_RelativeEntityMove.h b/source/packets/cPacket_RelativeEntityMove.h index 03d895b38..5b45ccd94 100644 --- a/source/packets/cPacket_RelativeEntityMove.h +++ b/source/packets/cPacket_RelativeEntityMove.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_RelativeEntityMove : public cPacket
{
diff --git a/source/packets/cPacket_RelativeEntityMoveLook.h b/source/packets/cPacket_RelativeEntityMoveLook.h index cb54db159..e918041ae 100644 --- a/source/packets/cPacket_RelativeEntityMoveLook.h +++ b/source/packets/cPacket_RelativeEntityMoveLook.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_RelativeEntityMoveLook : public cPacket
{
diff --git a/source/packets/cPacket_Respawn.h b/source/packets/cPacket_Respawn.h index a9a838167..f0faba9f5 100644 --- a/source/packets/cPacket_Respawn.h +++ b/source/packets/cPacket_Respawn.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
#include "cPacket_Login.h"
#include <string>
diff --git a/source/packets/cPacket_SoundEffect.h b/source/packets/cPacket_SoundEffect.h index f502e6d0f..973023d41 100644 --- a/source/packets/cPacket_SoundEffect.h +++ b/source/packets/cPacket_SoundEffect.h @@ -1,7 +1,7 @@ #pragma once #include "cPacket.h" -#include "PacketID.h" + class cPacket_SoundEffect : public cPacket { diff --git a/source/packets/cPacket_SpawnMob.cpp b/source/packets/cPacket_SpawnMob.cpp index 8de03f04b..0055e74db 100644 --- a/source/packets/cPacket_SpawnMob.cpp +++ b/source/packets/cPacket_SpawnMob.cpp @@ -1,7 +1,7 @@ #include "cPacket_SpawnMob.h"
-#include "Vector3i.h"
+#include "../Vector3i.h"
-#include "cMCLogger.h"
+#include "../cMCLogger.h"
cPacket_SpawnMob::~cPacket_SpawnMob()
{
diff --git a/source/packets/cPacket_SpawnMob.h b/source/packets/cPacket_SpawnMob.h index bd7c75464..bd475bfb1 100644 --- a/source/packets/cPacket_SpawnMob.h +++ b/source/packets/cPacket_SpawnMob.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class Vector3i;
class cPacket_SpawnMob : public cPacket
diff --git a/source/packets/cPacket_TeleportEntity.cpp b/source/packets/cPacket_TeleportEntity.cpp index 73c7c0524..f5be680aa 100644 --- a/source/packets/cPacket_TeleportEntity.cpp +++ b/source/packets/cPacket_TeleportEntity.cpp @@ -1,6 +1,6 @@ #include "cPacket_TeleportEntity.h"
-#include "cEntity.h"
+#include "../cEntity.h"
cPacket_TeleportEntity::cPacket_TeleportEntity(cEntity* a_Client)
{
diff --git a/source/packets/cPacket_TeleportEntity.h b/source/packets/cPacket_TeleportEntity.h index da1f61c60..8433609bd 100644 --- a/source/packets/cPacket_TeleportEntity.h +++ b/source/packets/cPacket_TeleportEntity.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cEntity;
class cPacket_TeleportEntity : public cPacket
diff --git a/source/packets/cPacket_Thunderbolt.h b/source/packets/cPacket_Thunderbolt.h index 8f7dfb60a..94939c543 100644 --- a/source/packets/cPacket_Thunderbolt.h +++ b/source/packets/cPacket_Thunderbolt.h @@ -1,7 +1,7 @@ #pragma once #include "cPacket.h" -#include "PacketID.h" + class cPacket_Thunderbolt : public cPacket { diff --git a/source/packets/cPacket_TimeUpdate.h b/source/packets/cPacket_TimeUpdate.h index 9913eba2c..b320321cb 100644 --- a/source/packets/cPacket_TimeUpdate.h +++ b/source/packets/cPacket_TimeUpdate.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_TimeUpdate : public cPacket
{
diff --git a/source/packets/cPacket_UpdateHealth.cpp b/source/packets/cPacket_UpdateHealth.cpp index f46d159ad..fe4929cc9 100644 --- a/source/packets/cPacket_UpdateHealth.cpp +++ b/source/packets/cPacket_UpdateHealth.cpp @@ -1,6 +1,6 @@ #include "cPacket_UpdateHealth.h"
-#include "cMCLogger.h"
+#include "../cMCLogger.h"
bool cPacket_UpdateHealth::Send(cSocket & a_Socket)
{
diff --git a/source/packets/cPacket_UpdateHealth.h b/source/packets/cPacket_UpdateHealth.h index 97081e645..49c06b1b6 100644 --- a/source/packets/cPacket_UpdateHealth.h +++ b/source/packets/cPacket_UpdateHealth.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_UpdateHealth : public cPacket
{
diff --git a/source/packets/cPacket_UpdateSign.h b/source/packets/cPacket_UpdateSign.h index f23da1540..6c86fadfb 100644 --- a/source/packets/cPacket_UpdateSign.h +++ b/source/packets/cPacket_UpdateSign.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_UpdateSign : public cPacket
{
diff --git a/source/packets/cPacket_UseEntity.h b/source/packets/cPacket_UseEntity.h index cd7b45e79..6e5bf5691 100644 --- a/source/packets/cPacket_UseEntity.h +++ b/source/packets/cPacket_UseEntity.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_UseEntity : public cPacket
{
diff --git a/source/packets/cPacket_WholeInventory.h b/source/packets/cPacket_WholeInventory.h index 766342cd2..cee102055 100644 --- a/source/packets/cPacket_WholeInventory.h +++ b/source/packets/cPacket_WholeInventory.h @@ -1,8 +1,8 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
-#include "BlockID.h"
+
+#include "../BlockID.h"
class cInventory;
class cWindow;
diff --git a/source/packets/cPacket_WindowClick.h b/source/packets/cPacket_WindowClick.h index e330584e1..fc380d9fc 100644 --- a/source/packets/cPacket_WindowClick.h +++ b/source/packets/cPacket_WindowClick.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_WindowClick : public cPacket // [C -> S]
{
diff --git a/source/packets/cPacket_WindowClose.h b/source/packets/cPacket_WindowClose.h index 4784586a2..a2f09fd09 100644 --- a/source/packets/cPacket_WindowClose.h +++ b/source/packets/cPacket_WindowClose.h @@ -1,7 +1,7 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
+
class cPacket_WindowClose : public cPacket
{
diff --git a/source/packets/cPacket_WindowOpen.h b/source/packets/cPacket_WindowOpen.h index df05799d5..dd9436cc5 100644 --- a/source/packets/cPacket_WindowOpen.h +++ b/source/packets/cPacket_WindowOpen.h @@ -1,7 +1,6 @@ #pragma once
#include "cPacket.h"
-#include "PacketID.h"
class cPacket_WindowOpen : public cPacket
{
|