OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-13 18:17:49 -04:00
Code Releases Activity

Convert custom HeadSpin integer types to standard types from stdint.h

Browse Source
This commit is contained in:
Adam Johnson
2012-01-19 21:19:26 -05:00
parent a0d54e2644
commit 5027b5a4ac
1301 changed files with 14497 additions and 14532 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Auth/pnNpCli2Auth.cpp
View File

@ -454,7 +454,7 @@ static const NetMsgField kAcctActivateReplyFields[] = {
static const NetMsgField kFileListReplyFields[] = {
kNetMsgFieldTransId, // transId
kNetMsgFieldENetError, // result
NET_MSG_FIELD_VAR_COUNT(sizeof(wchar), 1024 * 1024), // wcharCount
NET_MSG_FIELD_VAR_COUNT(sizeof(wchar_t), 1024 * 1024), // wchar_tCount
NET_MSG_FIELD_VAR_PTR(), // fileData
};
@ -548,7 +548,7 @@ static const NetMsgField kVaultInitAgeReplyFields[] = {
static const NetMsgField kVaultNodeFindReplyFields[] = {
kNetMsgFieldTransId, // transId
kNetMsgFieldENetError, // result
NET_MSG_FIELD_VAR_COUNT(sizeof(dword), 512), // nodeIdCount
NET_MSG_FIELD_VAR_COUNT(sizeof(uint32_t), 512), // nodeIdCount
NET_MSG_FIELD_VAR_PTR(), // nodeIds
};

620
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Auth/pnNpCli2Auth.h
View File

File diff suppressed because it is too large Load Diff

32
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Csr/pnNpCli2Csr.h
View File

@ -75,7 +75,7 @@ enum {
kNumCli2CsrMessages
};
COMPILER_ASSERT_HEADER(Cli2Scr, kNumCli2CsrMessages <= (word)-1);
COMPILER_ASSERT_HEADER(Cli2Scr, kNumCli2CsrMessages <= (uint16_t)-1);
//============================================================================
@ -93,7 +93,7 @@ enum {
kNumCsr2CliMessages
};
COMPILER_ASSERT_HEADER(Cli2Scr, kNumCsr2CliMessages <= (word)-1);
COMPILER_ASSERT_HEADER(Cli2Scr, kNumCsr2CliMessages <= (uint16_t)-1);
/*****************************************************************************
@ -107,7 +107,7 @@ COMPILER_ASSERT_HEADER(Cli2Scr, kNumCsr2CliMessages <= (word)-1);
// Connect packet
struct Cli2Csr_ConnData {
dword dataBytes;
uint32_t dataBytes;
};
struct Cli2Csr_Connect {
AsyncSocketConnectPacket hdr;
@ -118,8 +118,8 @@ struct Cli2Csr_Connect {
// Message header
struct Cli2Csr_MsgHeader {
dword messageId;
dword transId;
uint32_t messageId;
uint32_t transId;
};
//============================================================================
@ -128,9 +128,9 @@ struct Cli2Csr_MsgHeader {
// PingRequest
extern const NetMsg kNetMsg_Cli2Csr_PingRequest;
struct Cli2Csr_PingRequest : Cli2Csr_MsgHeader {
dword pingTimeMs;
dword payloadBytes;
byte payload[1]; // [payloadBytes]
uint32_t pingTimeMs;
uint32_t payloadBytes;
uint8_t payload[1]; // [payloadBytes]
};
// RegisterRequest
@ -141,8 +141,8 @@ struct Cli2Csr_RegisterRequest : Cli2Csr_MsgHeader {
// LoginRequest
extern const NetMsg kNetMsg_Cli2Csr_LoginRequest;
struct Cli2Csr_LoginRequest : Cli2Csr_MsgHeader {
dword clientChallenge;
wchar csrName[kMaxAccountNameLength];
uint32_t clientChallenge;
wchar_t csrName[kMaxAccountNameLength];
ShaDigest challengeHash;
};
@ -153,16 +153,16 @@ struct Cli2Csr_LoginRequest : Cli2Csr_MsgHeader {
// PingReply
extern const NetMsg kNetMsg_Csr2Cli_PingReply;
struct Csr2Cli_PingReply : Cli2Csr_MsgHeader {
dword pingTimeMs;
dword payloadBytes;
byte payload[1]; // [payloadBytes]
uint32_t pingTimeMs;
uint32_t payloadBytes;
uint8_t payload[1]; // [payloadBytes]
};
// RegisterReply
extern const NetMsg kNetMsg_Csr2Cli_RegisterReply;
struct Csr2Cli_RegisterReply : Cli2Csr_MsgHeader {
dword serverChallenge;
dword csrBuildId; // buildId of the latest csr client
uint32_t serverChallenge;
uint32_t csrBuildId; // buildId of the latest csr client
};
// LoginReply
@ -170,7 +170,7 @@ extern const NetMsg kNetMsg_Csr2Cli_LoginReply;
struct Csr2Cli_LoginReply : Cli2Csr_MsgHeader {
ENetError result;
Uuid csrId;
dword csrFlags;
uint32_t csrFlags;
};

52
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2File/pnNpCli2File.h
View File

@ -107,8 +107,8 @@ static const unsigned kFileSrvBuildId = 0;
***/
struct Cli2File_ConnData {
dword dataBytes;
dword buildId;
uint32_t dataBytes;
uint32_t buildId;
unsigned serverType;
};
struct Cli2File_Connect {
@ -117,8 +117,8 @@ struct Cli2File_Connect {
};
struct Cli2File_MsgHeader {
dword messageBytes;
dword messageId;
uint32_t messageBytes;
uint32_t messageId;
};
@ -130,34 +130,34 @@ struct Cli2File_MsgHeader {
// PingRequest
struct Cli2File_PingRequest : Cli2File_MsgHeader {
dword pingTimeMs;
uint32_t pingTimeMs;
};
// BuildIdRequest
struct Cli2File_BuildIdRequest : Cli2File_MsgHeader {
dword transId;
uint32_t transId;
};
// ManifestRequest
struct Cli2File_ManifestRequest : Cli2File_MsgHeader {
dword transId;
wchar group[MAX_PATH];
uint32_t transId;
wchar_t group[MAX_PATH];
unsigned buildId; // 0 = newest
};
struct Cli2File_ManifestEntryAck : Cli2File_MsgHeader {
dword transId;
dword readerId;
uint32_t transId;
uint32_t readerId;
};
// FileDownloadRequest
struct Cli2File_FileDownloadRequest : Cli2File_MsgHeader {
dword transId;
wchar filename[MAX_PATH];
uint32_t transId;
wchar_t filename[MAX_PATH];
unsigned buildId; // 0 = newest
};
struct Cli2File_FileDownloadChunkAck : Cli2File_MsgHeader {
dword transId;
dword readerId;
uint32_t transId;
uint32_t readerId;
};
@ -169,12 +169,12 @@ struct Cli2File_FileDownloadChunkAck : Cli2File_MsgHeader {
// PingReply
struct File2Cli_PingReply : Cli2File_MsgHeader {
dword pingTimeMs;
uint32_t pingTimeMs;
};
// BuildIdReply
struct File2Cli_BuildIdReply : Cli2File_MsgHeader {
dword transId;
uint32_t transId;
ENetError result;
unsigned buildId;
};
@ -186,22 +186,22 @@ struct File2Cli_BuildIdUpdate : Cli2File_MsgHeader {
// ManifestReply
struct File2Cli_ManifestReply : Cli2File_MsgHeader {
dword transId;
uint32_t transId;
ENetError result;
dword readerId;
dword numFiles; // total number of files
dword wcharCount; // size of the buffer
wchar manifestData[1]; // manifestData[wcharCount], actually
uint32_t readerId;
uint32_t numFiles; // total number of files
uint32_t wchar_tCount; // size of the buffer
wchar_t manifestData[1]; // manifestData[wchar_tCount], actually
};
// FileDownloadReply
struct File2Cli_FileDownloadReply : Cli2File_MsgHeader {
dword transId;
uint32_t transId;
ENetError result;
dword readerId;
dword totalFileSize;
dword byteCount;
byte fileData[1]; // fileData[byteCount], actually
uint32_t readerId;
uint32_t totalFileSize;
uint32_t byteCount;
uint8_t fileData[1]; // fileData[byteCount], actually
};

54
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2Game/pnNpCli2Game.h
View File

@ -65,7 +65,7 @@ enum {
kNumCli2GameMessages
};
COMPILER_ASSERT_HEADER(Cli2Game, kNumCli2GameMessages <= (word)-1);
COMPILER_ASSERT_HEADER(Cli2Game, kNumCli2GameMessages <= (uint16_t)-1);
enum {
// Global
@ -80,7 +80,7 @@ enum {
kNumGame2CliMessages
};
COMPILER_ASSERT_HEADER(Cli2Game, kNumGame2CliMessages <= (word)-1);
COMPILER_ASSERT_HEADER(Cli2Game, kNumGame2CliMessages <= (uint16_t)-1);
//============================================================================
@ -96,7 +96,7 @@ COMPILER_ASSERT_HEADER(Cli2Game, kNumGame2CliMessages <= (word)-1);
***/
struct Cli2Game_ConnData {
dword dataBytes;
uint32_t dataBytes;
Uuid accountUuid;
Uuid ageUuid;
};
@ -115,36 +115,36 @@ struct Cli2Game_Connect {
// PingRequest
extern const NetMsg kNetMsg_Cli2Game_PingRequest;
struct Cli2Game_PingRequest {
dword messageId;
dword pingTimeMs;
uint32_t messageId;
uint32_t pingTimeMs;
};
// JoinAgeRequest
extern const NetMsg kNetMsg_Cli2Game_JoinAgeRequest;
struct Cli2Game_JoinAgeRequest {
dword messageId;
dword transId;
dword ageMcpId;
uint32_t messageId;
uint32_t transId;
uint32_t ageMcpId;
Uuid accountUuid;
dword playerInt;
uint32_t playerInt;
};
// PropagateBuffer
extern const NetMsg kNetMsg_Cli2Game_PropagateBuffer;
struct Cli2Game_PropagateBuffer {
dword messageId;
dword type;
dword bytes;
byte buffer[1]; // actually, buffer[bytes]
uint32_t messageId;
uint32_t type;
uint32_t bytes;
uint8_t buffer[1]; // actually, buffer[bytes]
// no more fields
};
// GameMgrMsg
extern const NetMsg kNetMsg_Cli2Game_GameMgrMsg;
struct Cli2Game_GameMgrMsg {
dword messageId;
dword bytes;
byte buffer[1]; // actually: buffer[bytes]
uint32_t messageId;
uint32_t bytes;
uint8_t buffer[1]; // actually: buffer[bytes]
};
@ -157,34 +157,34 @@ struct Cli2Game_GameMgrMsg {
// PingReply
extern const NetMsg kNetMsg_Game2Cli_PingReply;
struct Game2Cli_PingReply{
dword messageId;
dword pingTimeMs;
uint32_t messageId;
uint32_t pingTimeMs;
};
// JoinAgeReply
extern const NetMsg kNetMsg_Game2Cli_JoinAgeReply;
struct Game2Cli_JoinAgeReply {
dword messageId;
dword transId;
uint32_t messageId;
uint32_t transId;
ENetError result;
};
// PropagateBuffer
extern const NetMsg kNetMsg_Game2Cli_PropagateBuffer;
struct Game2Cli_PropagateBuffer {
dword messageId;
dword type;
dword bytes;
byte buffer[1]; // actually, buffer[bytes]
uint32_t messageId;
uint32_t type;
uint32_t bytes;
uint8_t buffer[1]; // actually, buffer[bytes]
// no more fields
};
// GameMgrMsg
extern const NetMsg kNetMsg_Game2Cli_GameMgrMsg;
struct Game2Cli_GameMgrMsg {
dword messageId;
dword bytes;
byte buffer[1]; // actually: buffer[bytes]
uint32_t messageId;
uint32_t bytes;
uint8_t buffer[1]; // actually: buffer[bytes]
};

50
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Cli2GateKeeper/pnNpCli2GateKeeper.h
View File

@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETPROTOCOL_PRIVATE_PROTOCOLS_PNNPCLI2GATEKEEPER_H
// kNetProtocolCli2GateKeeper messages (must be <= (word)-1)
// kNetProtocolCli2GateKeeper messages (must be <= (uint16_t)-1)
enum {
// Global
kCli2GateKeeper_PingRequest,
@ -62,7 +62,7 @@ enum {
kNumCli2GateKeeperMessages
};
COMPILER_ASSERT_HEADER(Cli2GateKeeper, kNumCli2GateKeeperMessages <= (word)-1);
COMPILER_ASSERT_HEADER(Cli2GateKeeper, kNumCli2GateKeeperMessages <= (uint16_t)-1);
enum {
// Global
@ -72,7 +72,7 @@ enum {
kNumGateKeeper2CliMessages
};
COMPILER_ASSERT_HEADER(Cli2GateKeeper, kNumGateKeeper2CliMessages <= (word)-1);
COMPILER_ASSERT_HEADER(Cli2GateKeeper, kNumGateKeeper2CliMessages <= (uint16_t)-1);
//============================================================================
@ -88,7 +88,7 @@ COMPILER_ASSERT_HEADER(Cli2GateKeeper, kNumGateKeeper2CliMessages <= (word)-1);
***/
struct Cli2GateKeeper_ConnData {
dword dataBytes;
uint32_t dataBytes;
Uuid token;
};
@ -103,26 +103,26 @@ struct Cli2GateKeeper_Connect {
// PingRequest
extern const NetMsg kNetMsg_Cli2GateKeeper_PingRequest;
struct Cli2GateKeeper_PingRequest {
dword messageId;
dword transId;
dword pingTimeMs;
dword payloadBytes;
byte payload[1]; // [payloadBytes]
uint32_t messageId;
uint32_t transId;
uint32_t pingTimeMs;
uint32_t payloadBytes;
uint8_t payload[1]; // [payloadBytes]
};
// FileSrvIpAddressRequest
extern const NetMsg kNetMsg_Cli2GateKeeper_FileSrvIpAddressRequest;
struct Cli2GateKeeper_FileSrvIpAddressRequest {
dword messageId;
dword transId;
byte isPatcher;
uint32_t messageId;
uint32_t transId;
uint8_t isPatcher;
};
// AuthSrvIpAddressRequest
extern const NetMsg kNetMsg_Cli2GateKeeper_AuthSrvIpAddressRequest;
struct Cli2GateKeeper_AuthSrvIpAddressRequest {
dword messageId;
dword transId;
uint32_t messageId;
uint32_t transId;
};
@ -132,26 +132,26 @@ struct Cli2GateKeeper_AuthSrvIpAddressRequest {
// PingReply
extern const NetMsg kNetMsg_GateKeeper2Cli_PingReply;
struct GateKeeper2Cli_PingReply {
dword messageId;
dword transId;
dword pingTimeMs;
dword payloadBytes;
byte payload[1]; // [payloadBytes]
uint32_t messageId;
uint32_t transId;
uint32_t pingTimeMs;
uint32_t payloadBytes;
uint8_t payload[1]; // [payloadBytes]
};
// FileSrvIpAddressReply
extern const NetMsg kNetMsg_GateKeeper2Cli_FileSrvIpAddressReply;
struct GateKeeper2Cli_FileSrvIpAddressReply {
dword messageId;
dword transId;
wchar address[24];
uint32_t messageId;
uint32_t transId;
wchar_t address[24];
};
// FileSrvIpAddressReply
extern const NetMsg kNetMsg_GateKeeper2Cli_AuthSrvIpAddressReply;
struct GateKeeper2Cli_AuthSrvIpAddressReply {
dword messageId;
dword transId;
wchar address[24];
uint32_t messageId;
uint32_t transId;
wchar_t address[24];
};

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.cpp
View File

@ -67,7 +67,7 @@ bool Srv2DbValidateConnect (
const Srv2Db_ConnData & connect = * (const Srv2Db_ConnData *) listen->buffer;
// Validate message size
const unsigned kMinStructSize = sizeof(dword) * 1;
const unsigned kMinStructSize = sizeof(uint32_t) * 1;
if (listen->bytes < kMinStructSize)
return false;
if (listen->bytes < connect.dataBytes)

234
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Db/pnNpSrv2Db.h
View File

@ -170,8 +170,8 @@ enum {
***/
struct Srv2Db_ConnData {
dword dataBytes;
dword srvType;
uint32_t dataBytes;
uint32_t srvType;
};
struct Srv2Db_Connect {
AsyncSocketConnectPacket hdr;
@ -187,51 +187,51 @@ struct Srv2Db_Connect {
struct Srv2Db_AccountExistsRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
wchar_t accountName[kMaxAccountNameLength];
};
struct Srv2Db_AccountCreateRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
wchar_t accountName[kMaxAccountNameLength];
ShaDigest namePassHash;
dword billingType;
dword accountFlags;
wchar foreignAcctId[kMaxPublisherAuthKeyLength];
uint32_t billingType;
uint32_t accountFlags;
wchar_t foreignAcctId[kMaxPublisherAuthKeyLength];
};
struct Srv2Db_AccountCreateFromKeyRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
wchar_t accountName[kMaxAccountNameLength];
ShaDigest namePassHash;
Uuid key;
dword billingType;
uint32_t billingType;
};
struct Srv2Db_AccountLoginRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
wchar_t accountName[kMaxAccountNameLength];
};
struct Srv2Db_AccountLoginRequest2 : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
dword buildId;
wchar_t accountName[kMaxAccountNameLength];
uint32_t buildId;
};
struct Srv2Db_AccountLogout : SrvMsgHeader {
Uuid accountUuid;
dword timeLoggedMins;
uint32_t timeLoggedMins;
};
struct Srv2Db_AccountChangePasswordRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
wchar_t accountName[kMaxAccountNameLength];
ShaDigest namePassHash;
};
struct Srv2Db_AccountSetRolesRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
dword accountFlags;
wchar_t accountName[kMaxAccountNameLength];
uint32_t accountFlags;
};
struct Srv2Db_AccountSetBillingTypeRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
dword billingType;
wchar_t accountName[kMaxAccountNameLength];
uint32_t billingType;
};
struct Srv2Db_AccountActivateRequest : SrvMsgHeader {
@ -239,38 +239,38 @@ struct Srv2Db_AccountActivateRequest : SrvMsgHeader {
};
struct Srv2Db_AccountLockPlayerNameRequest :SrvMsgHeader {
wchar playerName[kMaxPlayerNameLength];
wchar_t playerName[kMaxPlayerNameLength];
Uuid accountUuid;
};
struct Srv2Db_VaultNodeCreateRequest : SrvMsgHeader {
Uuid accountUuid;
dword creatorId;
dword nodeBytes;
byte nodeBuffer[1];
uint32_t creatorId;
uint32_t nodeBytes;
uint8_t nodeBuffer[1];
};
struct Srv2Db_VaultNodeFetchRequest : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
};
struct Srv2Db_VaultNodeChanged : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
Uuid revisionId;
};
struct Srv2Db_VaultNodeSaveRequest : SrvMsgHeader {
Uuid revisionId;
dword nodeId;
uint32_t nodeId;
unsigned playerCheckId;
unsigned isRequestFromAuth;
dword nodeBytes;
byte buffer[1]; // buffer[bytes], actually
uint32_t nodeBytes;
uint8_t buffer[1]; // buffer[bytes], actually
// no more fields after var length alloc
};
struct Srv2Db_VaultNodeDeleteRequest : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
unsigned playerCheckId;
unsigned isRequestFromAuth;
};
@ -278,19 +278,19 @@ struct Srv2Db_VaultNodeDeleteRequest : SrvMsgHeader {
struct Srv2Db_VaultNodeFindRequest : SrvMsgHeader {
// Template node to match
dword nodeBytes;
byte nodeBuffer[1]; // [nodeBytes], actually
uint32_t nodeBytes;
uint8_t nodeBuffer[1]; // [nodeBytes], actually
// no more fields after var length alloc
};
struct Srv2Db_VaultNodeAddRefs : SrvMsgHeader {
dword refCount;
uint32_t refCount;
NetVaultNodeRef refs[1];
// no more fields after var length alloc
};
struct Srv2Db_VaultNodeDelRefs : SrvMsgHeader {
dword refCount;
uint32_t refCount;
unsigned playerCheckId;
unsigned isRequestFromAuth;
NetVaultNodeRef refs[1];
@ -298,105 +298,105 @@ struct Srv2Db_VaultNodeDelRefs : SrvMsgHeader {
};
struct Srv2Db_VaultNodeGetChildRefs : SrvMsgHeader {
dword nodeId;
dword maxDepth;
uint32_t nodeId;
uint32_t maxDepth;
};
struct Srv2Db_VaultNodeGetParentRefs : SrvMsgHeader {
dword nodeId;
dword maxDepth;
uint32_t nodeId;
uint32_t maxDepth;
};
struct Srv2Db_VaultSendNode : SrvMsgHeader {
dword srcPlayerId; // sender
dword srcNodeId; // sent item
dword dstPlayerId; // recipient
uint32_t srcPlayerId; // sender
uint32_t srcNodeId; // sent item
uint32_t dstPlayerId; // recipient
};
struct Srv2Db_SetAgeSequenceNumRequest : SrvMsgHeader {
dword nodeId;
wchar ageInstName[kMaxAgeNameLength];
wchar ageUserName[kMaxAgeNameLength];
uint32_t nodeId;
wchar_t ageInstName[kMaxAgeNameLength];
wchar_t ageUserName[kMaxAgeNameLength];
};
struct Srv2Db_StateSaveObject : SrvMsgHeader {
dword buildId;
uint32_t buildId;
Uuid ownerId;
wchar objectName[kMaxStateObjectName];
dword objectDataBytes;
byte objectData[1];
wchar_t objectName[kMaxStateObjectName];
uint32_t objectDataBytes;
uint8_t objectData[1];
// no more fields after var length alloc
};
struct Srv2Db_StateDeleteObject : SrvMsgHeader {
Uuid ownerId;
wchar objectName[kMaxStateObjectName];
wchar_t objectName[kMaxStateObjectName];
};
struct Srv2Db_StateFetchObject : SrvMsgHeader {
Uuid ownerId;
wchar objectName[kMaxStateObjectName];
wchar_t objectName[kMaxStateObjectName];
};
struct Srv2Db_GetPublicAgeInfoIds : SrvMsgHeader {
wchar ageName[kMaxAgeNameLength];
wchar_t ageName[kMaxAgeNameLength];
};
struct Srv2Db_SetAgePublic : SrvMsgHeader {
dword playerId;
dword ageInfoId;
byte publicOrNot;
uint32_t playerId;
uint32_t ageInfoId;
uint8_t publicOrNot;
};
struct Srv2Db_SetPlayerBanStatusRequest : SrvMsgHeader {
dword playerId;
dword banned;
uint32_t playerId;
uint32_t banned;
};
struct Srv2Db_ScoreCreate : SrvMsgHeader {
dword ownerId;
wchar gameName[kMaxGameScoreNameLength];
dword gameType;
dword value;
uint32_t ownerId;
wchar_t gameName[kMaxGameScoreNameLength];
uint32_t gameType;
uint32_t value;
};
struct Srv2Db_ScoreDelete : SrvMsgHeader {
dword scoreId;
uint32_t scoreId;
};
struct Srv2Db_ScoreFindScoreIds : SrvMsgHeader {
dword ownerId;
wchar gameName[kMaxGameScoreNameLength];
uint32_t ownerId;
wchar_t gameName[kMaxGameScoreNameLength];
};
struct Srv2Db_ScoreFetchScores : SrvMsgHeader {
dword scoreCount;
dword scoreIds[1]; // [scoreCount], actually
uint32_t scoreCount;
uint32_t scoreIds[1]; // [scoreCount], actually
// no more fields after var length alloc
};
struct Srv2Db_ScoreSave : SrvMsgHeader {
dword scoreId;
dword value;
uint32_t scoreId;
uint32_t value;
};
struct Srv2Db_ScoreGetRanks : SrvMsgHeader {
dword ownerId;
dword scoreGroup;
dword parentFolderId;
wchar gameName[kMaxGameScoreNameLength];
dword timePeriod;
dword numResults;
dword pageNumber;
dword sortDesc;
uint32_t ownerId;
uint32_t scoreGroup;
uint32_t parentFolderId;
wchar_t gameName[kMaxGameScoreNameLength];
uint32_t timePeriod;
uint32_t numResults;
uint32_t pageNumber;
uint32_t sortDesc;
};
struct Srv2Db_PlayerOnline : SrvMsgHeader {
dword playerId;
uint32_t playerId;
};
struct Srv2Db_PlayerOffline : SrvMsgHeader {
dword playerId;
uint32_t playerId;
};
struct Srv2Db_AgeOnline : SrvMsgHeader {
@ -408,7 +408,7 @@ struct Srv2Db_AgeOffline : SrvMsgHeader {
};
struct Srv2Db_CsrAcctInfoRequest : SrvMsgHeader {
wchar csrName[kMaxAccountNameLength];
wchar_t csrName[kMaxAccountNameLength];
};
struct Srv2Db_FetchInviterInfo : SrvMsgHeader {
@ -423,7 +423,7 @@ struct Srv2Db_FetchInviterInfo : SrvMsgHeader {
***/
struct Db2Srv_AccountExistsReply : SrvMsgHeader {
byte exists;
uint8_t exists;
};
struct Db2Srv_AccountCreateReply : SrvMsgHeader {
@ -437,36 +437,36 @@ struct Db2Srv_AccountCreateFromKeyReply : SrvMsgHeader {
struct Db2Srv_AccountLoginReply : SrvMsgHeader {
Uuid accountUuid;
dword accountFlags;
dword billingType;
uint32_t accountFlags;
uint32_t billingType;
ShaDigest namePassHash;
};
struct Db2Srv_VaultNodeCreateReply : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
};
struct Db2Srv_VaultNodeFetchReply : SrvMsgHeader {
dword nodeBytes;
byte buffer[1];
uint32_t nodeBytes;
uint8_t buffer[1];
// no more fields after var length alloc
};
struct Db2Srv_VaultNodeFindReply : SrvMsgHeader {
// out: ids of matching nodes
dword nodeIdCount;
dword nodeIds[1]; // [nodeIdCount], actually
uint32_t nodeIdCount;
uint32_t nodeIds[1]; // [nodeIdCount], actually
// no more fields after var length alloc
};
struct Db2Srv_VaultNodeRefs : SrvMsgHeader {
dword refCount;
uint32_t refCount;
NetVaultNodeRef refs[1];
// no more fields after var length alloc
};
struct Db2Srv_SetAgeSequenceNumReply : SrvMsgHeader {
dword sequenceNum;
uint32_t sequenceNum;
};
struct Db2Srv_FetchInviterInfoReply : SrvMsgHeader {
@ -474,79 +474,79 @@ struct Db2Srv_FetchInviterInfoReply : SrvMsgHeader {
};
struct Db2Srv_StateObjectFetched : SrvMsgHeader {
dword buildId;
uint32_t buildId;
Uuid ownerId;
wchar objectName[kMaxStateObjectName];
dword objectDataBytes;
byte objectData[1];
wchar_t objectName[kMaxStateObjectName];
uint32_t objectDataBytes;
uint8_t objectData[1];
// no more fields after var length alloc
};
struct Db2Srv_NotifyVaultNodeChanged : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
Uuid revId;
dword notifyIdCount;
dword notifyIds[1];
uint32_t notifyIdCount;
uint32_t notifyIds[1];
};
struct Db2Srv_NotifyVaultNodeAdded : SrvMsgHeader {
NetVaultNodeRef ref;
dword notifyIdCount;
dword notifyIds[1];
uint32_t notifyIdCount;
uint32_t notifyIds[1];
};
struct Db2Srv_NotifyVaultNodeRemoved : SrvMsgHeader {
dword parentId;
dword childId;
dword notifyIdCount;
dword notifyIds[1];
uint32_t parentId;
uint32_t childId;
uint32_t notifyIdCount;
uint32_t notifyIds[1];
};
struct Db2Srv_NotifyVaultNodeDeleted : SrvMsgHeader {
dword nodeId;
dword notifyIdCount;
dword notifyIds[1];
uint32_t nodeId;
uint32_t notifyIdCount;
uint32_t notifyIds[1];
};
struct Db2Srv_PublicAgeInfoIds : SrvMsgHeader {
dword idCount;
dword ids[1]; // [idCount], actually
uint32_t idCount;
uint32_t ids[1]; // [idCount], actually
// no more fields after var length alloc
};
struct Db2Srv_ScoreCreateReply : SrvMsgHeader {
dword scoreId;
dword createdTime;
uint32_t scoreId;
uint32_t createdTime;
};
struct Db2Srv_ScoreDeleteReply : SrvMsgHeader {
dword ownerId;
wchar gameName[kMaxGameScoreNameLength];
uint32_t ownerId;
wchar_t gameName[kMaxGameScoreNameLength];
};
struct Db2Srv_ScoreFindScoreIdsReply : SrvMsgHeader {
dword idCount;
dword scoreIds[1]; // [idCount], actually
uint32_t idCount;
uint32_t scoreIds[1]; // [idCount], actually
// no more fields after var length alloc
};
struct Db2Srv_ScoreFetchScoresReply : SrvMsgHeader {
dword scoreCount;
dword byteCount;
byte buffer[1]; // [byteCount], actually
uint32_t scoreCount;
uint32_t byteCount;
uint8_t buffer[1]; // [byteCount], actually
// no more fields after var length alloc
};
struct Db2Srv_ScoreGetRanksReply : SrvMsgHeader {
dword rankCount;
dword byteCount;
byte buffer[1]; // [byteCount], actually
uint32_t rankCount;
uint32_t byteCount;
uint8_t buffer[1]; // [byteCount], actually
// no more fields after var length alloc
};
struct Db2Srv_CsrAcctInfoReply : SrvMsgHeader {
Uuid csrId;
dword csrFlags;
uint32_t csrFlags;
ShaDigest namePassHash;
};

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.cpp
View File

@ -68,7 +68,7 @@ bool Srv2LogValidateConnect (
const Srv2Log_ConnData & connect = * (const Srv2Log_ConnData *) listen->buffer;
// Validate message size
const unsigned kMinStructSize = sizeof(dword) * 3;
const unsigned kMinStructSize = sizeof(uint32_t) * 3;
if (listen->bytes < kMinStructSize)
return false;
if (listen->bytes < connect.dataBytes)

12
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Log/pnNpSrv2Log.h
View File

@ -74,11 +74,11 @@ enum {
***/
struct Srv2Log_ConnData {
dword dataBytes;
dword buildId;
dword srvType;
dword buildType;
dword productId;
uint32_t dataBytes;
uint32_t buildId;
uint32_t srvType;
uint32_t buildType;
uint32_t productId;
};
struct Srv2Log_Connect {
@ -95,7 +95,7 @@ struct Srv2Log_Connect {
struct Srv2Log_LogMsg : SrvMsgHeader {
unsigned eventType;
qword timestamp;
uint64_t timestamp;
};

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.cpp
View File

@ -67,7 +67,7 @@ bool Srv2McpValidateConnect (
const Srv2Mcp_ConnData & connect = * (const Srv2Mcp_ConnData *) listen->buffer;
// Validate message size
const unsigned kMinStructSize = sizeof(dword) * 3;
const unsigned kMinStructSize = sizeof(uint32_t) * 3;
if (listen->bytes < kMinStructSize)
return false;
if (listen->bytes < connect.dataBytes)

88
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Mcp/pnNpSrv2Mcp.h
View File

@ -106,10 +106,10 @@ enum {
***/
struct Srv2Mcp_ConnData {
dword dataBytes;
dword buildId;
dword srvType;
dword publicAddr;
uint32_t dataBytes;
uint32_t buildId;
uint32_t srvType;
uint32_t publicAddr;
};
struct Srv2Mcp_Connect {
AsyncSocketConnectPacket hdr;
@ -124,41 +124,41 @@ struct Srv2Mcp_Connect {
***/
struct Srv2Mcp_AgeJoinRequest : SrvMsgHeader {
wchar ageName[kMaxAgeNameLength];
wchar_t ageName[kMaxAgeNameLength];
Uuid ageUuid;
Uuid accountUuid;
dword playerInt;
byte ccrLevel;
wchar playerName[kMaxPlayerNameLength];
dword buildId;
uint32_t playerInt;
uint8_t ccrLevel;
wchar_t playerName[kMaxPlayerNameLength];
uint32_t buildId;
};
struct Srv2Mcp_PlayerLoggedIn : SrvMsgHeader {
dword ageMcpId;
uint32_t ageMcpId;
Uuid ageUuid;
Uuid accountUuid;
wchar playerName[kMaxPlayerNameLength];
dword playerInt;
wchar_t playerName[kMaxPlayerNameLength];
uint32_t playerInt;
};
struct Srv2Mcp_PlayerLoggedOut : SrvMsgHeader {
dword ageMcpId;
uint32_t ageMcpId;
Uuid accountUuid;
dword playerInt;
uint32_t playerInt;
};
struct Srv2Mcp_AgeSpawned : SrvMsgHeader {
wchar ageName[kMaxAgeNameLength];
wchar_t ageName[kMaxAgeNameLength];
Uuid ageUuid;
dword buildId;
uint32_t buildId;
};
struct Srv2Mcp_AgeDied : SrvMsgHeader {
dword ageMcpId;
uint32_t ageMcpId;
};
struct Srv2Mcp_AccountLoginRequest : SrvMsgHeader {
wchar accountName[kMaxAccountNameLength];
wchar_t accountName[kMaxAccountNameLength];
Uuid accountUuid;
};
@ -168,20 +168,20 @@ struct Srv2Mcp_AccountLogout : SrvMsgHeader {
struct Srv2Mcp_AccountSetPlayer : SrvMsgHeader {
Uuid accountUuid;
dword playerInt;
uint32_t playerInt;
};
struct Srv2Mcp_PropagateBuffer : SrvMsgHeader {
dword type;
dword bufferLength;
dword numRecvrs;
uint32_t type;
uint32_t bufferLength;
uint32_t numRecvrs;
// packed data:
// byte netMessage[];
// dword playerlist[];
// uint8_t netMessage[];
// uint32_t playerlist[];
};
struct Srv2Mcp_KickPlayer : SrvMsgHeader {
dword playerInt;
uint32_t playerInt;
};
/*****************************************************************************
@ -191,60 +191,60 @@ struct Srv2Mcp_KickPlayer : SrvMsgHeader {
***/
struct Mcp2Srv_AgeJoinReply : SrvMsgHeader {
dword ageMcpId;
uint32_t ageMcpId;
Uuid ageUuid;
NetAddressNode gameSrvNode;
};
struct Mcp2Srv_AgeSpawnRequest : SrvMsgHeader {
wchar ageName[kMaxAgeNameLength];
dword ageMcpId;
wchar_t ageName[kMaxAgeNameLength];
uint32_t ageMcpId;
Uuid ageUuid;
dword buildId;
uint32_t buildId;
};
struct Mcp2Srv_AgeUnspawn : SrvMsgHeader {
dword ageMcpId;
uint32_t ageMcpId;
};
struct Mcp2Srv_AgeAddPlayerRequest : SrvMsgHeader {
dword ageMcpId;
uint32_t ageMcpId;
Uuid accountUuid;
dword playerInt;
byte ccrLevel;
wchar playerName[kMaxPlayerNameLength];
uint32_t playerInt;
uint8_t ccrLevel;
wchar_t playerName[kMaxPlayerNameLength];
};
struct Mcp2Srv_AgeRemovePlayerRequest : SrvMsgHeader {
Uuid ageMcpId;
Uuid accountUuid;
dword playerInt;
uint32_t playerInt;
};
struct Mcp2Srv_AgeSpawnedReply : SrvMsgHeader {
dword ageMcpId; // assigns a new mcpId if age wasn't found (in case of a reconnect)
uint32_t ageMcpId; // assigns a new mcpId if age wasn't found (in case of a reconnect)
};
struct Mcp2Srv_AccountLoginReply : SrvMsgHeader {
dword acctMcpId;
uint32_t acctMcpId;
};
struct Mcp2Srv_AccountNotifyKicked : SrvMsgHeader {
Uuid accountUuid;
dword acctMcpId;
uint32_t acctMcpId;
ENetError reason;
};
struct Mcp2Srv_NotifyAgeSDLChanged : SrvMsgHeader {
dword ageMcpId;
byte global;
uint32_t ageMcpId;
uint8_t global;
};
struct Mcp2Srv_PropagateBuffer : SrvMsgHeader {
dword ageMcpId;
dword type;
dword bytes;
byte buffer[1]; // actually, buffer[bytes]
uint32_t ageMcpId;
uint32_t type;
uint32_t bytes;
uint8_t buffer[1]; // actually, buffer[bytes]
// no more fields
};

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.cpp
View File

@ -68,7 +68,7 @@ bool Srv2ScoreValidateConnect (
const Srv2Score_ConnData & connect = * (const Srv2Score_ConnData *) listen->buffer;
// Validate message size
const unsigned kMinStructSize = sizeof(dword) * 3;
const unsigned kMinStructSize = sizeof(uint32_t) * 3;
if (listen->bytes < kMinStructSize)
return false;
if (listen->bytes < connect.dataBytes)

66
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Score/pnNpSrv2Score.h
View File

@ -82,9 +82,9 @@ enum {
***/
struct Srv2Score_ConnData {
dword dataBytes;
dword buildId;
dword srvType;
uint32_t dataBytes;
uint32_t buildId;
uint32_t srvType;
};
struct Srv2Score_Connect {
AsyncSocketConnectPacket hdr;
@ -99,46 +99,46 @@ struct Srv2Score_Connect {
***/
struct Srv2Score_ScoreCreate : SrvMsgHeader {
dword ownerId;
wchar gameName[kMaxGameScoreNameLength];
dword gameType;
dword value;
uint32_t ownerId;
wchar_t gameName[kMaxGameScoreNameLength];
uint32_t gameType;
uint32_t value;
};
struct Srv2Score_ScoreDelete : SrvMsgHeader {
dword scoreId;
uint32_t scoreId;
};
struct Srv2Score_ScoreGetScores : SrvMsgHeader {
dword ownerId;
wchar gameName[kMaxGameScoreNameLength];
uint32_t ownerId;
wchar_t gameName[kMaxGameScoreNameLength];
};
struct Srv2Score_ScoreAddPoints : SrvMsgHeader {
dword scoreId;
dword numPoints;
uint32_t scoreId;
uint32_t numPoints;
};
struct Srv2Score_ScoreTransferPoints : SrvMsgHeader {
dword srcScoreId;
dword destScoreId;
dword numPoints;
uint32_t srcScoreId;
uint32_t destScoreId;
uint32_t numPoints;
};
struct Srv2Score_ScoreSetPoints : SrvMsgHeader {
dword scoreId;
dword numPoints;
uint32_t scoreId;
uint32_t numPoints;
};
struct Srv2Score_ScoreGetRanks : SrvMsgHeader {
dword ownerId;
dword scoreGroup;
dword parentFolderId;
wchar gameName[kMaxGameScoreNameLength];
dword timePeriod;
dword numResults;
dword pageNumber;
dword sortDesc;
uint32_t ownerId;
uint32_t scoreGroup;
uint32_t parentFolderId;
wchar_t gameName[kMaxGameScoreNameLength];
uint32_t timePeriod;
uint32_t numResults;
uint32_t pageNumber;
uint32_t sortDesc;
};
@ -149,20 +149,20 @@ struct Srv2Score_ScoreGetRanks : SrvMsgHeader {
***/
struct Score2Srv_ScoreCreateReply : SrvMsgHeader {
dword scoreId;
dword createdTime;
uint32_t scoreId;
uint32_t createdTime;
};
struct Score2Srv_ScoreGetScoresReply : SrvMsgHeader {
dword scoreCount;
dword byteCount;
byte buffer[1];
uint32_t scoreCount;
uint32_t byteCount;
uint8_t buffer[1];
};
struct Score2Srv_ScoreGetRanksReply : SrvMsgHeader {
dword rankCount;
dword byteCount;
byte buffer[1];
uint32_t rankCount;
uint32_t byteCount;
uint8_t buffer[1];
};

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.cpp
View File

@ -68,7 +68,7 @@ bool Srv2StateValidateConnect (
const Srv2State_ConnData & connect = * (const Srv2State_ConnData *) listen->buffer;
// Validate message size
const unsigned kMinStructSize = sizeof(dword) * 3;
const unsigned kMinStructSize = sizeof(uint32_t) * 3;
if (listen->bytes < kMinStructSize)
return false;
if (listen->bytes < connect.dataBytes)

20
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2State/pnNpSrv2State.h
View File

@ -78,9 +78,9 @@ enum {
***/
struct Srv2State_ConnData {
dword dataBytes;
dword buildId;
dword srvType;
uint32_t dataBytes;
uint32_t buildId;
uint32_t srvType;
};
struct Srv2State_Connect {
AsyncSocketConnectPacket hdr;
@ -96,20 +96,20 @@ struct Srv2State_Connect {
struct Srv2State_FetchObject : SrvMsgHeader {
Uuid ownerId;
wchar objectName[kMaxStateObjectName];
wchar_t objectName[kMaxStateObjectName];
};
struct Srv2State_SaveObject : SrvMsgHeader {
Uuid ownerId;
wchar objectName[kMaxStateObjectName];
dword objectDataBytes;
byte objectData[1]; // objectData[objectDataBytes], actually
wchar_t objectName[kMaxStateObjectName];
uint32_t objectDataBytes;
uint8_t objectData[1]; // objectData[objectDataBytes], actually
// no more fields after var length alloc
};
struct Srv2State_DeleteObject : SrvMsgHeader {
Uuid ownerId;
wchar objectName[kMaxStateObjectName];
wchar_t objectName[kMaxStateObjectName];
};
@ -120,8 +120,8 @@ struct Srv2State_DeleteObject : SrvMsgHeader {
***/
struct State2Srv_ObjectFetched : SrvMsgHeader {
dword objectDataBytes;
byte objectData[1];
uint32_t objectDataBytes;
uint8_t objectData[1];
// no more fields after var length alloc
};

2
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.cpp
View File

@ -67,7 +67,7 @@ bool Srv2VaultValidateConnect (
const Srv2Vault_ConnData & connect = * (const Srv2Vault_ConnData *) listen->buffer;
// Validate message size
const unsigned kMinStructSize = sizeof(dword) * 3;
const unsigned kMinStructSize = sizeof(uint32_t) * 3;
if (listen->bytes < kMinStructSize)
return false;
if (listen->bytes < connect.dataBytes)

156
Sources/Plasma/NucleusLib/pnNetProtocol/Private/Protocols/Srv2Vault/pnNpSrv2Vault.h
View File

@ -152,9 +152,9 @@ enum {
***/
struct Srv2Vault_ConnData {
dword dataBytes;
dword buildId;
dword srvType;
uint32_t dataBytes;
uint32_t buildId;
uint32_t srvType;
};
struct Srv2Vault_Connect {
AsyncSocketConnectPacket hdr;
@ -170,20 +170,20 @@ struct Srv2Vault_Connect {
struct Srv2Vault_PlayerCreateRequest : SrvMsgHeader {
Uuid accountUuid;
wchar playerName[kMaxPlayerNameLength];
wchar avatarShape[MAX_PATH];
wchar friendInvite[MAX_PATH];
byte explorer;
wchar_t playerName[kMaxPlayerNameLength];
wchar_t avatarShape[MAX_PATH];
wchar_t friendInvite[MAX_PATH];
uint8_t explorer;
};
struct Srv2Vault_PlayerDeleteRequest : SrvMsgHeader {
Uuid accountId;
dword playerId;
uint32_t playerId;
};
struct Srv2Vault_UpgradeVisitorRequest : SrvMsgHeader {
Uuid accountId;
dword playerId;
uint32_t playerId;
};
struct Srv2Vault_AccountLoginRequest : SrvMsgHeader {
@ -195,43 +195,43 @@ struct Srv2Vault_AccountLogout : SrvMsgHeader {
};
struct Srv2Vault_FetchChildNodeRefs : SrvMsgHeader {
dword parentId;
dword maxDepth;
uint32_t parentId;
uint32_t maxDepth;
};
struct Srv2Vault_NodeFetch : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
};
struct Srv2Vault_CreateNodeRequest : SrvMsgHeader {
Uuid accountId;
dword creatorId;
dword nodeBytes;
byte nodeBuffer[1];
uint32_t creatorId;
uint32_t nodeBytes;
uint8_t nodeBuffer[1];
};
struct Srv2Vault_DeleteNodeRequest : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
unsigned playerCheckId;
unsigned isRequestFromAuth;
};
struct Srv2Vault_NodeSave : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
unsigned playerCheckId;
unsigned isRequestFromAuth;
Uuid revisionId;
dword nodeBytes;
byte nodeBuffer[1];
uint32_t nodeBytes;
uint8_t nodeBuffer[1];
};
struct Srv2Vault_NodeSave2 : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
unsigned playerCheckId;
unsigned isRequestFromAuth;
Uuid revisionId;
dword nodeBytes;
byte nodeBuffer[1];
uint32_t nodeBytes;
uint8_t nodeBuffer[1];
};
struct Srv2Vault_NodeAdd : SrvMsgHeader {
@ -243,35 +243,35 @@ struct Srv2Vault_NodeAdd2 : SrvMsgHeader {
};
struct Srv2Vault_NodeRemove : SrvMsgHeader {
dword parentId;
dword childId;
uint32_t parentId;
uint32_t childId;
unsigned playerCheckId;
unsigned isRequestFromAuth;
};
struct Srv2Vault_NodeRemove2 : SrvMsgHeader {
dword parentId;
dword childId;
uint32_t parentId;
uint32_t childId;
unsigned playerCheckId;
unsigned isRequestFromAuth;
};
struct Srv2Vault_NodeFindRequest : SrvMsgHeader {
// Template node to match
dword nodeBytes;
byte nodeBuffer[1]; // [nodeBytes], actually
uint32_t nodeBytes;
uint8_t nodeBuffer[1]; // [nodeBytes], actually
// no more fields after var length alloc
};
struct Srv2Vault_SendNode : SrvMsgHeader {
dword srcPlayerId; // sender
dword srcNodeId; // sent item
dword dstPlayerId; // recipient
uint32_t srcPlayerId; // sender
uint32_t srcNodeId; // sent item
uint32_t dstPlayerId; // recipient
};
struct Srv2Vault_RegisterPlayerVault : SrvMsgHeader {
Uuid accountId;
dword playerId;
uint32_t playerId;
};
struct Srv2Vault_UnregisterPlayerVault : SrvMsgHeader {
@ -280,7 +280,7 @@ struct Srv2Vault_UnregisterPlayerVault : SrvMsgHeader {
struct Srv2Vault_RegisterAgeVault : SrvMsgHeader {
Uuid accountId;
dword ageId; // age's vault node id
uint32_t ageId; // age's vault node id
};
struct Srv2Vault_UnregisterAgeVault : SrvMsgHeader {
@ -289,82 +289,82 @@ struct Srv2Vault_UnregisterAgeVault : SrvMsgHeader {
struct Srv2Vault_AgeInitRequest : SrvMsgHeader {
Uuid accountId;
dword playerId;
uint32_t playerId;
Uuid ageInstId;
Uuid parentAgeInstId;
dword ageLanguage;
dword ageSequenceNumber;
uint32_t ageLanguage;
uint32_t ageSequenceNumber;
// packed fields:
// wchar ageFilename[]
// wchar ageInstName[]
// wchar ageUserName[]
// wchar ageDesc[]
// wchar_t ageFilename[]
// wchar_t ageInstName[]
// wchar_t ageUserName[]
// wchar_t ageDesc[]
};
struct Srv2Vault_GetPublicAgeList : SrvMsgHeader {
wchar ageName[kMaxAgeNameLength];
wchar_t ageName[kMaxAgeNameLength];
};
struct Srv2Vault_SetAgePublic : SrvMsgHeader {
dword playerId;
dword ageInfoId;
byte publicOrNot;
uint32_t playerId;
uint32_t ageInfoId;
uint8_t publicOrNot;
};
struct Srv2Vault_CurrentPopulationReply : SrvMsgHeader {
dword ageCount;
uint32_t ageCount;
unsigned agePopulations[1]; // [ageCount], actually
// no more fields after var length alloc
};
struct Srv2Vault_ChangePlayerNameRequest : SrvMsgHeader {
Uuid accountId;
dword playerId;
wchar newName[kMaxPlayerNameLength];
uint32_t playerId;
wchar_t newName[kMaxPlayerNameLength];
};
struct Srv2Vault_AccountOnline : SrvMsgHeader {
Uuid acctId;
dword buildId;
dword authNode;
uint32_t buildId;
uint32_t authNode;
};
struct Srv2Vault_AccountOffline : SrvMsgHeader {
Uuid acctId;
dword buildId;
uint32_t buildId;
};
struct Srv2Vault_PlayerOnline : SrvMsgHeader {
Uuid acctId;
dword buildId;
dword playerId;
uint32_t buildId;
uint32_t playerId;
};
struct Srv2Vault_PlayerOffline : SrvMsgHeader {
dword playerId;
dword buildId;
uint32_t playerId;
uint32_t buildId;
};
struct Srv2Vault_AgeOnline : SrvMsgHeader {
Uuid ageInstId;
dword buildId;
dword gameNode;
uint32_t buildId;
uint32_t gameNode;
};
struct Srv2Vault_AgeOffline : SrvMsgHeader {
Uuid ageInstId;
dword buildId;
uint32_t buildId;
};
struct Srv2Vault_PlayerJoinedAge : SrvMsgHeader {
dword playerId;
uint32_t playerId;
Uuid ageInstId;
dword buildId;
uint32_t buildId;
};
struct Srv2Vault_PlayerLeftAge : SrvMsgHeader {
dword playerId;
dword buildId;
uint32_t playerId;
uint32_t buildId;
};
@ -376,30 +376,30 @@ struct Srv2Vault_PlayerLeftAge : SrvMsgHeader {
***/
struct Vault2Srv_PlayerCreateReply : SrvMsgHeader {
dword playerId;
uint32_t playerId;
};
struct Vault2Srv_AccountLoginReply : SrvMsgHeader {
dword playerInfoCount;
uint32_t playerInfoCount;
SrvPlayerInfo playerInfos[1];
};
struct Vault2Srv_NodeRefsFetched : SrvMsgHeader {
dword refCount;
uint32_t refCount;
NetVaultNodeRef refs[1];
};
struct Vault2Srv_NodeFetched : SrvMsgHeader {
dword nodeBytes;
byte nodeBuffer[1];
uint32_t nodeBytes;
uint8_t nodeBuffer[1];
};
struct Vault2Srv_NodeCreated : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
};
struct Vault2Srv_NodeChanged : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
Uuid revisionId;
Uuid accountId; // the notify target
};
@ -410,42 +410,42 @@ struct Vault2Srv_NodeAdded : SrvMsgHeader {
};
struct Vault2Srv_NodeRemoved : SrvMsgHeader {
dword parentId;
dword childId;
uint32_t parentId;
uint32_t childId;
Uuid accountId; // the notify target
};
struct Vault2Srv_NodeDeleted : SrvMsgHeader {
dword nodeId;
uint32_t nodeId;
Uuid accountId; // the notify target
};
struct Vault2Srv_NodeFindReply : SrvMsgHeader {
// out: ids of matching nodes
dword nodeIdCount;
dword nodeIds[1]; // [nodeIdCount], actually
uint32_t nodeIdCount;
uint32_t nodeIds[1]; // [nodeIdCount], actually
// no more fields after var length alloc
};
struct Vault2Srv_AgeInitReply : SrvMsgHeader {
dword ageNodeId;
dword ageInfoNodeId;
uint32_t ageNodeId;
uint32_t ageInfoNodeId;
Uuid accountId; // the requestor
};
struct Vault2Srv_PublicAgeList : SrvMsgHeader {
dword ageCount;
uint32_t ageCount;
NetAgeInfo ages[1]; // [ageCount], actually
// no more fields after var length alloc
};
struct Vault2Srv_NotifyAgeSDLChanged : SrvMsgHeader {
wchar ageName[kMaxAgeNameLength];
wchar_t ageName[kMaxAgeNameLength];
Uuid ageInstId;
};
struct Vault2Srv_CurrentPopulationRequest : SrvMsgHeader {
dword ageCount;
uint32_t ageCount;
Uuid ageInstIds[1]; // [ageCount], actually
// no more fields after var length alloc
};