From 85b5842ece3544f5f3a9534cd574ffcc32ab8357 Mon Sep 17 00:00:00 2001 From: Darryl Pogue Date: Sun, 29 Jan 2012 00:19:37 -0800 Subject: [PATCH] Fix all the packed structures. Now we actually build a significant amount of stuff on Linux. --- Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp | 2 +- Sources/Plasma/FeatureLib/pfConsole/pfConsole.h | 2 +- Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h | 4 ++-- Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcLog.cpp | 4 ++-- .../Plasma/NucleusLib/pnAsyncCore/Private/pnAcThread.h | 2 +- Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h | 4 ++-- .../NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.h | 4 ++-- .../NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.h | 4 ++-- Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.h | 6 +++--- Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.h | 4 ++-- .../Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.h | 4 ++-- Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.h | 4 ++-- Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h | 4 ++-- Sources/Plasma/NucleusLib/pnMail/pnMail.cpp | 4 ++-- Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp | 4 ++-- .../Private/Protocols/Cli2Auth/pnNpCli2Auth.h | 4 ++-- .../pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h | 4 ++-- .../Private/Protocols/Cli2File/pnNpCli2File.h | 4 ++-- .../Private/Protocols/Cli2Game/pnNpCli2Game.h | 4 ++-- .../Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h | 5 +++-- .../pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.h | 4 ++-- .../pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.h | 4 ++-- .../pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h | 4 ++-- .../Private/Protocols/Srv2Score/pnNpSrv2Score.h | 4 ++-- .../Private/Protocols/Srv2State/pnNpSrv2State.h | 4 ++-- .../Private/Protocols/Srv2Vault/pnNpSrv2Vault.h | 4 ++-- .../Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h | 8 ++++---- Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.h | 3 ++- 28 files changed, 57 insertions(+), 55 deletions(-) diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp index b6c37b98..c51b06d8 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.cpp @@ -1214,7 +1214,7 @@ void pfConsole::AddLineF(const char * fmt, ...) { char str[1024]; va_list args; va_start(args, fmt); - _vsnprintf(str, arrsize(str), fmt, args); + hsVsnprintf(str, arrsize(str), fmt, args); va_end(args); AddLine(str); } diff --git a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h index c1e9803d..a6241e81 100644 --- a/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h +++ b/Sources/Plasma/FeatureLib/pfConsole/pfConsole.h @@ -114,7 +114,7 @@ class pfConsole : public hsKeyedObject static uint32_t fConsoleTextColor; static pfConsole *fTheConsole; - static void _cdecl IAddLineCallback( const char *string ); + static void CDECL IAddLineCallback( const char *string ); static plPipeline *fPipeline; diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h index 56bd5b9b..287e3a4b 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h +++ b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcIo.h @@ -238,7 +238,7 @@ bool AsyncFileSeek ( * ***/ -#include +#pragma pack(push,1) struct AsyncSocketConnectPacket { uint8_t connType; uint16_t hdrBytes; @@ -247,7 +247,7 @@ struct AsyncSocketConnectPacket { uint32_t branchId; Uuid productId; }; -#include +#pragma pack(pop) /**************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcLog.cpp b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcLog.cpp index e6e02354..edcca438 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcLog.cpp +++ b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcLog.cpp @@ -122,7 +122,7 @@ void LogUnregisterHandler (FLogHandler callback) { } //=========================================================================== -void __cdecl LogMsg (ELogSeverity severity, const char format[], ...) { +void CDECL LogMsg (ELogSeverity severity, const char format[], ...) { ASSERT(format); va_list args; @@ -132,7 +132,7 @@ void __cdecl LogMsg (ELogSeverity severity, const char format[], ...) { } //=========================================================================== -void __cdecl LogMsg (ELogSeverity severity, const wchar_t format[], ...) { +void CDECL LogMsg (ELogSeverity severity, const wchar_t format[], ...) { ASSERT(format); va_list args; diff --git a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcThread.h b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcThread.h index f81feac0..81ca9c24 100644 --- a/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcThread.h +++ b/Sources/Plasma/NucleusLib/pnAsyncCore/Private/pnAcThread.h @@ -63,7 +63,7 @@ const unsigned kAsyncTimeInfinite = (unsigned) -1; #ifdef _MSC_VER #define THREADCALL __stdcall #else -#define THREADCALL __cdecl +#define THREADCALL CDECL #endif struct AsyncThread; diff --git a/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h b/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h index d72d7225..f5de1923 100644 --- a/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h +++ b/Sources/Plasma/NucleusLib/pnCsrNet/pnCsrNet.h @@ -67,7 +67,7 @@ enum { //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) #define CSRNET_MSG(a) \ CsrNet_##a () : SimpleNet_MsgHeader(kSimpleNetChannelCsr, kCsrNet_##a) { } @@ -82,7 +82,7 @@ struct CsrNet_ExecConsoleCmd : SimpleNet_MsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) #endif // PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNCSRNET_PNCSRNET_H diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.h b/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.h index 1003a0ce..3210c765 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/BlueSpiral/pnGmBlueSpiral.h @@ -93,7 +93,7 @@ enum { //============================================================================ // Begin networked data scructures -#include +#pragma pack(push,1) //============================================================================ //======================================================================== @@ -134,5 +134,5 @@ enum { //============================================================================ // End networked data structures -#include +#pragma pack(pop) //============================================================================ diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.h b/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.h index 6bf5a2de..9afccb28 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/ClimbingWall/pnGmClimbingWall.h @@ -106,7 +106,7 @@ enum { //============================================================================ // Begin networked data structures -#include +#pragma pack(push,1) //============================================================================ //======================================================================== @@ -180,5 +180,5 @@ enum { //============================================================================ // End networked data structures -#include +#pragma pack(pop) //============================================================================ diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.h b/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.h index d48304d8..6511680e 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/Heek/pnGmHeek.h @@ -124,7 +124,7 @@ enum { //============================================================================ // Begin networked data structures -#include +#pragma pack(push,1) //============================================================================ //======================================================================== @@ -199,5 +199,5 @@ enum { //============================================================================ // End networked data structures -#include -//============================================================================ \ No newline at end of file +#pragma pack(pop) +//============================================================================ diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.h b/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.h index 78215554..a90f39ae 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/Marker/pnGmMarker.h @@ -117,7 +117,7 @@ enum { //============================================================================ // Begin networked data structures -#include +#pragma pack(push,1) //============================================================================ //======================================================================== @@ -225,5 +225,5 @@ enum { //============================================================================ // End networked data structures -#include +#pragma pack(pop) //============================================================================ diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.h b/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.h index a0643073..68e85305 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/TicTacToe/pnGmTicTacToe.h @@ -96,7 +96,7 @@ enum { //============================================================================ // Begin networked data scructures -#include +#pragma pack(push,1) //============================================================================ //======================================================================== @@ -132,5 +132,5 @@ enum { //============================================================================ // End networked data structures -#include +#pragma pack(pop) //============================================================================ diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.h b/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.h index 75c3de39..892a62d7 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/VarSync/pnGmVarSync.h @@ -96,7 +96,7 @@ enum { //============================================================================ // Begin networked data structures -#include +#pragma pack(push,1) //============================================================================ //======================================================================== @@ -153,5 +153,5 @@ enum { //============================================================================ // End networked data structures -#include +#pragma pack(pop) //============================================================================ diff --git a/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h b/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h index 5797fd7e..3aa9bd66 100644 --- a/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h +++ b/Sources/Plasma/NucleusLib/pnGameMgr/pnGameMgr.h @@ -165,7 +165,7 @@ enum { //============================================================================ // Begin networked data scructures -#include +#pragma pack(push,1) //============================================================================ struct GameMsgHeader { @@ -247,7 +247,7 @@ enum { //============================================================================ // End networked data structures -#include +#pragma pack(pop) //============================================================================ diff --git a/Sources/Plasma/NucleusLib/pnMail/pnMail.cpp b/Sources/Plasma/NucleusLib/pnMail/pnMail.cpp index 30a36f4a..bed2d193 100644 --- a/Sources/Plasma/NucleusLib/pnMail/pnMail.cpp +++ b/Sources/Plasma/NucleusLib/pnMail/pnMail.cpp @@ -95,7 +95,7 @@ static bool MailNotifyProc ( void ** userState ); -static void __cdecl Send ( +static void CDECL Send ( AsyncSocket sock, const char str[], ... @@ -431,7 +431,7 @@ static bool MailNotifyProc ( } //=========================================================================== -static void __cdecl Send ( +static void CDECL Send ( AsyncSocket sock, const char str[], ... diff --git a/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp b/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp index 8d557b9d..6ca95acb 100644 --- a/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp +++ b/Sources/Plasma/NucleusLib/pnNetCli/pnNcCli.cpp @@ -603,7 +603,7 @@ namespace Connect { * ***/ -#include +#pragma pack(push,1) enum { kNetCliCli2SrvConnect, kNetCliSrv2CliEncrypt, @@ -627,7 +627,7 @@ struct NetCli_Srv2Cli_Encrypt : NetCli_PacketHeader { struct NetCli_Srv2Cli_Error : NetCli_PacketHeader { uint32_t error; // ENetError }; -#include +#pragma pack(pop) //=========================================================================== diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Auth/pnNpCli2Auth.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Auth/pnNpCli2Auth.h index de66c9f7..1aaef9cb 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Auth/pnNpCli2Auth.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Auth/pnNpCli2Auth.h @@ -218,7 +218,7 @@ COMPILER_ASSERT_HEADER(Cli2Auth, kNumAuth2CliMessages <= (uint16_t)-1); //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -1046,4 +1046,4 @@ struct Auth2Cli_ScoreGetRanksReply { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h index 49986ec9..df373048 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h @@ -101,7 +101,7 @@ COMPILER_ASSERT_HEADER(Cli2Scr, kNumCsr2CliMessages <= (uint16_t)-1); * Networked structures * ***/ -#include +#pragma pack(push,1) //============================================================================ // Connect packet @@ -174,5 +174,5 @@ struct Csr2Cli_LoginReply : Cli2Csr_MsgHeader { }; -#include +#pragma pack(pop) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.h index 2207db6a..df08897c 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.h @@ -97,7 +97,7 @@ static const unsigned kFileSrvBuildId = 0; //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -208,4 +208,4 @@ struct File2Cli_FileDownloadReply : Cli2File_MsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Game/pnNpCli2Game.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Game/pnNpCli2Game.h index 80665418..f01b2798 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Game/pnNpCli2Game.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Game/pnNpCli2Game.h @@ -86,7 +86,7 @@ COMPILER_ASSERT_HEADER(Cli2Game, kNumGame2CliMessages <= (uint16_t)-1); //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -191,4 +191,4 @@ struct Game2Cli_GameMgrMsg { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h index 69b7c71c..7e04142f 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h @@ -78,7 +78,7 @@ COMPILER_ASSERT_HEADER(Cli2GateKeeper, kNumGateKeeper2CliMessages <= (uint16_t)- //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -154,4 +154,5 @@ struct GateKeeper2Cli_AuthSrvIpAddressReply { uint32_t messageId; uint32_t transId; wchar_t address[24]; -}; \ No newline at end of file +}; +#pragma pack(pop) diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.h index e51a7bc7..3bd0a089 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.h @@ -160,7 +160,7 @@ enum { //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -554,7 +554,7 @@ struct Db2Srv_CsrAcctInfoReply : SrvMsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) /***************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.h index b7ac0b01..8f8edb68 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.h @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) // Srv2Log enum { @@ -103,7 +103,7 @@ struct Srv2Log_LogMsg : SrvMsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) /***************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h index bcc59484..2296b069 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h @@ -96,7 +96,7 @@ enum { //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -252,7 +252,7 @@ struct Mcp2Srv_PropagateBuffer : SrvMsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) /***************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.h index cfd69d80..27a5d646 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.h @@ -54,7 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) // kNetProtocolSrv2Score messages enum { @@ -169,7 +169,7 @@ struct Score2Srv_ScoreGetRanksReply : SrvMsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) /***************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.h index dfb4ab06..31b364e9 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.h @@ -68,7 +68,7 @@ enum { //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -129,7 +129,7 @@ struct State2Srv_ObjectFetched : SrvMsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) /***************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.h index 6c7f519d..1187f2d0 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.h @@ -142,7 +142,7 @@ enum { //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) /***************************************************************************** @@ -453,7 +453,7 @@ struct Vault2Srv_CurrentPopulationRequest : SrvMsgHeader { //============================================================================ // END PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(pop) /***************************************************************************** diff --git a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h index 7666945d..1a3cef0c 100644 --- a/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h +++ b/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.h @@ -79,14 +79,14 @@ const NetMsgField kNetMsgFieldBuildId = NET_MSG_FIELD_DWORD(); * ***/ -#include +#pragma pack(push,1) struct SrvPlayerInfo { unsigned playerInt; wchar_t playerName[kMaxPlayerNameLength]; wchar_t avatarShape[kMaxVaultNodeStringLength]; unsigned explorer; }; -#include +#pragma pack(pop) /***************************************************************************** @@ -441,14 +441,14 @@ struct NetVaultNodeFieldArray { //============================================================================ // NetVaultNodeRef (packed because is sent over wire directly) //============================================================================ -#include +#pragma pack(push,1) struct NetVaultNodeRef { unsigned parentId; unsigned childId; unsigned ownerId; bool seen; }; -#include +#pragma pack(pop) //============================================================================ // SrvPackBuffer diff --git a/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.h b/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.h index 6690c09c..b857e998 100644 --- a/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.h +++ b/Sources/Plasma/NucleusLib/pnSimpleNet/pnSimpleNet.h @@ -84,7 +84,7 @@ COMPILER_ASSERT_HEADER(ESimpleNetChannel, kMaxSimpleNetChannels <= 0xff); //============================================================================ // BEGIN PACKED DATA STRUCTURES //============================================================================ -#include +#pragma pack(push,1) //============================================================================ // Connect packet @@ -179,5 +179,6 @@ void SimpleNetSend ( SimpleNetConn * conn, SimpleNet_MsgHeader * msg ); +#pragma pack(pop) #endif // PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNSIMPLENET_PNSIMPLENET_H