mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-17 10:52:46 +00:00
Replace Uuid with plUUID EVERYWHERE.
This commit is contained in:
Darryl Pogue
@ -55,6 +55,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "pnNetBase/pnNetBase.h"
|
||||
#include "pnAsyncCore/pnAsyncCore.h"
|
||||
#include "pnNetCli/pnNetCli.h"
|
||||
#include "pnUUID/pnUUID.h"
|
||||
|
||||
#ifdef SERVER
|
||||
#include "psUtils/psUtils.h" // for SrvMsgHeader, ugh
|
||||
|
||||
@ -229,7 +229,7 @@ static_assert(kNumAuth2CliMessages <= 0xFFFF, "Auth2Cli message types overflow u
|
||||
|
||||
struct Cli2Auth_ConnData {
|
||||
uint32_t dataBytes;
|
||||
Uuid token;
|
||||
plUUID token;
|
||||
};
|
||||
struct Cli2Auth_Connect {
|
||||
AsyncSocketConnectPacket hdr;
|
||||
@ -286,7 +286,7 @@ struct Cli2Auth_AgeRequest {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
wchar_t ageName[kMaxAgeNameLength];
|
||||
Uuid ageUuid;
|
||||
plUUID ageUuid;
|
||||
};
|
||||
|
||||
// AcctCreateRequest
|
||||
@ -307,7 +307,7 @@ struct Cli2Auth_AcctCreateFromKeyRequest {
|
||||
uint32_t transId;
|
||||
wchar_t accountName[kMaxAccountNameLength];
|
||||
ShaDigest namePassHash;
|
||||
Uuid key;
|
||||
plUUID key;
|
||||
uint32_t billingType;
|
||||
};
|
||||
|
||||
@ -375,7 +375,7 @@ extern const NetMsg kNetMsg_Cli2Auth_AcctActivateRequest;
|
||||
struct Cli2Auth_AcctActivateRequest {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
Uuid activationKey;
|
||||
plUUID activationKey;
|
||||
};
|
||||
|
||||
// FileListRequest
|
||||
@ -435,7 +435,7 @@ struct Cli2Auth_VaultNodeSave {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
uint32_t nodeId;
|
||||
Uuid revisionId;
|
||||
plUUID revisionId;
|
||||
uint32_t nodeBytes;
|
||||
uint8_t nodeBuffer[1];
|
||||
};
|
||||
@ -462,8 +462,8 @@ extern const NetMsg kNetMsg_Cli2Auth_VaultInitAgeRequest;
|
||||
struct Cli2Auth_VaultInitAgeRequest {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
Uuid ageInstId;
|
||||
Uuid parentAgeInstId;
|
||||
plUUID ageInstId;
|
||||
plUUID parentAgeInstId;
|
||||
wchar_t ageFilename[MAX_PATH];
|
||||
wchar_t ageInstName[MAX_PATH];
|
||||
wchar_t ageUserName[MAX_PATH];
|
||||
@ -572,7 +572,7 @@ extern const NetMsg kNetMsg_Cli2Auth_SendFriendInviteRequest;
|
||||
struct Cli2Auth_SendFriendInviteRequest {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
Uuid inviteUuid;
|
||||
plUUID inviteUuid;
|
||||
wchar_t emailAddress[kMaxEmailAddressLength];
|
||||
wchar_t toName[kMaxPlayerNameLength];
|
||||
};
|
||||
@ -679,7 +679,7 @@ extern const NetMsg kNetMsg_Auth2Cli_ServerAddr;
|
||||
struct Auth2Cli_ServerAddr {
|
||||
uint32_t messageId;
|
||||
uint32_t srvAddr;
|
||||
Uuid token;
|
||||
plUUID token;
|
||||
};
|
||||
|
||||
extern const NetMsg kNetMsg_Auth2Cli_NotifyNewBuild;
|
||||
@ -704,7 +704,7 @@ struct Auth2Cli_AcctLoginReply {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
ENetError result;
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t accountFlags;
|
||||
uint32_t billingType;
|
||||
uint32_t encryptionKey[4];
|
||||
@ -717,7 +717,7 @@ struct Auth2Cli_AgeReply {
|
||||
uint32_t transId;
|
||||
ENetError result;
|
||||
uint32_t ageMcpId;
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
uint32_t ageVaultId;
|
||||
uint32_t gameSrvNode;
|
||||
};
|
||||
@ -728,7 +728,7 @@ struct Auth2Cli_AcctCreateReply {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
ENetError result;
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
};
|
||||
|
||||
// AcctCreateFromKeyReply
|
||||
@ -737,8 +737,8 @@ struct Auth2Cli_AcctCreateFromKeyReply {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
ENetError result;
|
||||
Uuid accountId;
|
||||
Uuid activationKey;
|
||||
plUUID accountId;
|
||||
plUUID activationKey;
|
||||
};
|
||||
|
||||
// CreatePlayerReply
|
||||
@ -870,7 +870,7 @@ extern const NetMsg kNetMsg_Auth2Cli_VaultNodeChanged;
|
||||
struct Auth2Cli_VaultNodeChanged {
|
||||
uint32_t messageId;
|
||||
uint32_t nodeId;
|
||||
Uuid revisionId;
|
||||
plUUID revisionId;
|
||||
};
|
||||
|
||||
extern const NetMsg kNetMsg_Auth2Cli_VaultNodeAdded;
|
||||
|
||||
@ -97,8 +97,8 @@ static_assert(kNumGame2CliMessages <= 0xFFFF, "Game2Cli message types overflow u
|
||||
|
||||
struct Cli2Game_ConnData {
|
||||
uint32_t dataBytes;
|
||||
Uuid accountUuid;
|
||||
Uuid ageUuid;
|
||||
plUUID accountUuid;
|
||||
plUUID ageUuid;
|
||||
};
|
||||
struct Cli2Game_Connect {
|
||||
AsyncSocketConnectPacket hdr;
|
||||
@ -125,7 +125,7 @@ struct Cli2Game_JoinAgeRequest {
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
uint32_t ageMcpId;
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t playerInt;
|
||||
};
|
||||
|
||||
|
||||
@ -89,7 +89,7 @@ static_assert(kNumGateKeeper2CliMessages <= 0xFFFF, "GateKeeper2Cli message type
|
||||
|
||||
struct Cli2GateKeeper_ConnData {
|
||||
uint32_t dataBytes;
|
||||
Uuid token;
|
||||
plUUID token;
|
||||
};
|
||||
|
||||
struct Cli2GateKeeper_Connect {
|
||||
|
||||
@ -201,7 +201,7 @@ struct Srv2Db_AccountCreateRequest : SrvMsgHeader {
|
||||
struct Srv2Db_AccountCreateFromKeyRequest : SrvMsgHeader {
|
||||
wchar_t accountName[kMaxAccountNameLength];
|
||||
ShaDigest namePassHash;
|
||||
Uuid key;
|
||||
plUUID key;
|
||||
uint32_t billingType;
|
||||
};
|
||||
|
||||
@ -215,7 +215,7 @@ struct Srv2Db_AccountLoginRequest2 : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Db_AccountLogout : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t timeLoggedMins;
|
||||
};
|
||||
|
||||
@ -235,16 +235,16 @@ struct Srv2Db_AccountSetBillingTypeRequest : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Db_AccountActivateRequest : SrvMsgHeader {
|
||||
Uuid activationKey;
|
||||
plUUID activationKey;
|
||||
};
|
||||
|
||||
struct Srv2Db_AccountLockPlayerNameRequest :SrvMsgHeader {
|
||||
wchar_t playerName[kMaxPlayerNameLength];
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
};
|
||||
|
||||
struct Srv2Db_VaultNodeCreateRequest : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t creatorId;
|
||||
uint32_t nodeBytes;
|
||||
uint8_t nodeBuffer[1];
|
||||
@ -256,11 +256,11 @@ struct Srv2Db_VaultNodeFetchRequest : SrvMsgHeader {
|
||||
|
||||
struct Srv2Db_VaultNodeChanged : SrvMsgHeader {
|
||||
uint32_t nodeId;
|
||||
Uuid revisionId;
|
||||
plUUID revisionId;
|
||||
};
|
||||
|
||||
struct Srv2Db_VaultNodeSaveRequest : SrvMsgHeader {
|
||||
Uuid revisionId;
|
||||
plUUID revisionId;
|
||||
uint32_t nodeId;
|
||||
unsigned playerCheckId;
|
||||
unsigned isRequestFromAuth;
|
||||
@ -321,7 +321,7 @@ struct Srv2Db_SetAgeSequenceNumRequest : SrvMsgHeader {
|
||||
|
||||
struct Srv2Db_StateSaveObject : SrvMsgHeader {
|
||||
uint32_t buildId;
|
||||
Uuid ownerId;
|
||||
plUUID ownerId;
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
uint32_t objectDataBytes;
|
||||
uint8_t objectData[1];
|
||||
@ -329,12 +329,12 @@ struct Srv2Db_StateSaveObject : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Db_StateDeleteObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
plUUID ownerId;
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
};
|
||||
|
||||
struct Srv2Db_StateFetchObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
plUUID ownerId;
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
};
|
||||
|
||||
@ -400,11 +400,11 @@ struct Srv2Db_PlayerOffline : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Db_AgeOnline : SrvMsgHeader {
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
};
|
||||
|
||||
struct Srv2Db_AgeOffline : SrvMsgHeader {
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
};
|
||||
|
||||
struct Srv2Db_CsrAcctInfoRequest : SrvMsgHeader {
|
||||
@ -412,7 +412,7 @@ struct Srv2Db_CsrAcctInfoRequest : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Db_FetchInviterInfo : SrvMsgHeader {
|
||||
Uuid inviteUuid;
|
||||
plUUID inviteUuid;
|
||||
};
|
||||
|
||||
|
||||
@ -427,16 +427,16 @@ struct Db2Srv_AccountExistsReply : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Db2Srv_AccountCreateReply : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
};
|
||||
|
||||
struct Db2Srv_AccountCreateFromKeyReply : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
Uuid activationKey;
|
||||
plUUID accountUuid;
|
||||
plUUID activationKey;
|
||||
};
|
||||
|
||||
struct Db2Srv_AccountLoginReply : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t accountFlags;
|
||||
uint32_t billingType;
|
||||
ShaDigest namePassHash;
|
||||
@ -470,12 +470,12 @@ struct Db2Srv_SetAgeSequenceNumReply : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Db2Srv_FetchInviterInfoReply : SrvMsgHeader {
|
||||
Uuid hoodInstance;
|
||||
plUUID hoodInstance;
|
||||
};
|
||||
|
||||
struct Db2Srv_StateObjectFetched : SrvMsgHeader {
|
||||
uint32_t buildId;
|
||||
Uuid ownerId;
|
||||
plUUID ownerId;
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
uint32_t objectDataBytes;
|
||||
uint8_t objectData[1];
|
||||
@ -484,7 +484,7 @@ struct Db2Srv_StateObjectFetched : SrvMsgHeader {
|
||||
|
||||
struct Db2Srv_NotifyVaultNodeChanged : SrvMsgHeader {
|
||||
uint32_t nodeId;
|
||||
Uuid revId;
|
||||
plUUID revId;
|
||||
uint32_t notifyIdCount;
|
||||
uint32_t notifyIds[1];
|
||||
};
|
||||
@ -545,7 +545,7 @@ struct Db2Srv_ScoreGetRanksReply : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Db2Srv_CsrAcctInfoReply : SrvMsgHeader {
|
||||
Uuid csrId;
|
||||
plUUID csrId;
|
||||
uint32_t csrFlags;
|
||||
ShaDigest namePassHash;
|
||||
};
|
||||
|
||||
@ -125,8 +125,8 @@ struct Srv2Mcp_Connect {
|
||||
|
||||
struct Srv2Mcp_AgeJoinRequest : SrvMsgHeader {
|
||||
wchar_t ageName[kMaxAgeNameLength];
|
||||
Uuid ageUuid;
|
||||
Uuid accountUuid;
|
||||
plUUID ageUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t playerInt;
|
||||
uint8_t ccrLevel;
|
||||
wchar_t playerName[kMaxPlayerNameLength];
|
||||
@ -135,21 +135,21 @@ struct Srv2Mcp_AgeJoinRequest : SrvMsgHeader {
|
||||
|
||||
struct Srv2Mcp_PlayerLoggedIn : SrvMsgHeader {
|
||||
uint32_t ageMcpId;
|
||||
Uuid ageUuid;
|
||||
Uuid accountUuid;
|
||||
plUUID ageUuid;
|
||||
plUUID accountUuid;
|
||||
wchar_t playerName[kMaxPlayerNameLength];
|
||||
uint32_t playerInt;
|
||||
};
|
||||
|
||||
struct Srv2Mcp_PlayerLoggedOut : SrvMsgHeader {
|
||||
uint32_t ageMcpId;
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t playerInt;
|
||||
};
|
||||
|
||||
struct Srv2Mcp_AgeSpawned : SrvMsgHeader {
|
||||
wchar_t ageName[kMaxAgeNameLength];
|
||||
Uuid ageUuid;
|
||||
plUUID ageUuid;
|
||||
uint32_t buildId;
|
||||
};
|
||||
|
||||
@ -159,15 +159,15 @@ struct Srv2Mcp_AgeDied : SrvMsgHeader {
|
||||
|
||||
struct Srv2Mcp_AccountLoginRequest : SrvMsgHeader {
|
||||
wchar_t accountName[kMaxAccountNameLength];
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
};
|
||||
|
||||
struct Srv2Mcp_AccountLogout : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
};
|
||||
|
||||
struct Srv2Mcp_AccountSetPlayer : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t playerInt;
|
||||
};
|
||||
|
||||
@ -192,14 +192,14 @@ struct Srv2Mcp_KickPlayer : SrvMsgHeader {
|
||||
|
||||
struct Mcp2Srv_AgeJoinReply : SrvMsgHeader {
|
||||
uint32_t ageMcpId;
|
||||
Uuid ageUuid;
|
||||
plUUID ageUuid;
|
||||
uint32_t gameSrvNode;
|
||||
};
|
||||
|
||||
struct Mcp2Srv_AgeSpawnRequest : SrvMsgHeader {
|
||||
wchar_t ageName[kMaxAgeNameLength];
|
||||
uint32_t ageMcpId;
|
||||
Uuid ageUuid;
|
||||
plUUID ageUuid;
|
||||
uint32_t buildId;
|
||||
};
|
||||
|
||||
@ -209,15 +209,15 @@ struct Mcp2Srv_AgeUnspawn : SrvMsgHeader {
|
||||
|
||||
struct Mcp2Srv_AgeAddPlayerRequest : SrvMsgHeader {
|
||||
uint32_t ageMcpId;
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t playerInt;
|
||||
uint8_t ccrLevel;
|
||||
wchar_t playerName[kMaxPlayerNameLength];
|
||||
};
|
||||
|
||||
struct Mcp2Srv_AgeRemovePlayerRequest : SrvMsgHeader {
|
||||
Uuid ageMcpId;
|
||||
Uuid accountUuid;
|
||||
plUUID ageMcpId;
|
||||
plUUID accountUuid;
|
||||
uint32_t playerInt;
|
||||
};
|
||||
|
||||
@ -230,7 +230,7 @@ struct Mcp2Srv_AccountLoginReply : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Mcp2Srv_AccountNotifyKicked : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
uint32_t acctMcpId;
|
||||
ENetError reason;
|
||||
};
|
||||
|
||||
@ -95,12 +95,12 @@ struct Srv2State_Connect {
|
||||
***/
|
||||
|
||||
struct Srv2State_FetchObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
plUUID ownerId;
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
};
|
||||
|
||||
struct Srv2State_SaveObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
plUUID ownerId;
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
uint32_t objectDataBytes;
|
||||
uint8_t objectData[1]; // objectData[objectDataBytes], actually
|
||||
@ -108,7 +108,7 @@ struct Srv2State_SaveObject : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2State_DeleteObject : SrvMsgHeader {
|
||||
Uuid ownerId;
|
||||
plUUID ownerId;
|
||||
wchar_t objectName[kMaxStateObjectName];
|
||||
};
|
||||
|
||||
|
||||
@ -169,7 +169,7 @@ struct Srv2Vault_Connect {
|
||||
***/
|
||||
|
||||
struct Srv2Vault_PlayerCreateRequest : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
wchar_t playerName[kMaxPlayerNameLength];
|
||||
wchar_t avatarShape[MAX_PATH];
|
||||
wchar_t friendInvite[MAX_PATH];
|
||||
@ -177,21 +177,21 @@ struct Srv2Vault_PlayerCreateRequest : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Vault_PlayerDeleteRequest : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
|
||||
struct Srv2Vault_UpgradeVisitorRequest : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
|
||||
struct Srv2Vault_AccountLoginRequest : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
};
|
||||
|
||||
struct Srv2Vault_AccountLogout : SrvMsgHeader {
|
||||
Uuid accountUuid;
|
||||
plUUID accountUuid;
|
||||
};
|
||||
|
||||
struct Srv2Vault_FetchChildNodeRefs : SrvMsgHeader {
|
||||
@ -204,7 +204,7 @@ struct Srv2Vault_NodeFetch : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Vault_CreateNodeRequest : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t creatorId;
|
||||
uint32_t nodeBytes;
|
||||
uint8_t nodeBuffer[1];
|
||||
@ -220,7 +220,7 @@ struct Srv2Vault_NodeSave : SrvMsgHeader {
|
||||
uint32_t nodeId;
|
||||
unsigned playerCheckId;
|
||||
unsigned isRequestFromAuth;
|
||||
Uuid revisionId;
|
||||
plUUID revisionId;
|
||||
uint32_t nodeBytes;
|
||||
uint8_t nodeBuffer[1];
|
||||
};
|
||||
@ -229,7 +229,7 @@ struct Srv2Vault_NodeSave2 : SrvMsgHeader {
|
||||
uint32_t nodeId;
|
||||
unsigned playerCheckId;
|
||||
unsigned isRequestFromAuth;
|
||||
Uuid revisionId;
|
||||
plUUID revisionId;
|
||||
uint32_t nodeBytes;
|
||||
uint8_t nodeBuffer[1];
|
||||
};
|
||||
@ -270,28 +270,28 @@ struct Srv2Vault_SendNode : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Vault_RegisterPlayerVault : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
|
||||
struct Srv2Vault_UnregisterPlayerVault : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
};
|
||||
|
||||
struct Srv2Vault_RegisterAgeVault : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t ageId; // age's vault node id
|
||||
};
|
||||
|
||||
struct Srv2Vault_UnregisterAgeVault : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
};
|
||||
|
||||
struct Srv2Vault_AgeInitRequest : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t playerId;
|
||||
Uuid ageInstId;
|
||||
Uuid parentAgeInstId;
|
||||
plUUID ageInstId;
|
||||
plUUID parentAgeInstId;
|
||||
uint32_t ageLanguage;
|
||||
uint32_t ageSequenceNumber;
|
||||
// packed fields:
|
||||
@ -318,24 +318,24 @@ struct Srv2Vault_CurrentPopulationReply : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Vault_ChangePlayerNameRequest : SrvMsgHeader {
|
||||
Uuid accountId;
|
||||
plUUID accountId;
|
||||
uint32_t playerId;
|
||||
wchar_t newName[kMaxPlayerNameLength];
|
||||
};
|
||||
|
||||
struct Srv2Vault_AccountOnline : SrvMsgHeader {
|
||||
Uuid acctId;
|
||||
plUUID acctId;
|
||||
uint32_t buildId;
|
||||
uint32_t authNode;
|
||||
};
|
||||
|
||||
struct Srv2Vault_AccountOffline : SrvMsgHeader {
|
||||
Uuid acctId;
|
||||
plUUID acctId;
|
||||
uint32_t buildId;
|
||||
};
|
||||
|
||||
struct Srv2Vault_PlayerOnline : SrvMsgHeader {
|
||||
Uuid acctId;
|
||||
plUUID acctId;
|
||||
uint32_t buildId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
@ -346,19 +346,19 @@ struct Srv2Vault_PlayerOffline : SrvMsgHeader {
|
||||
};
|
||||
|
||||
struct Srv2Vault_AgeOnline : SrvMsgHeader {
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
uint32_t buildId;
|
||||
uint32_t gameNode;
|
||||
};
|
||||
|
||||
struct Srv2Vault_AgeOffline : SrvMsgHeader {
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
uint32_t buildId;
|
||||
};
|
||||
|
||||
struct Srv2Vault_PlayerJoinedAge : SrvMsgHeader {
|
||||
uint32_t playerId;
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
uint32_t buildId;
|
||||
};
|
||||
|
||||
@ -400,24 +400,24 @@ struct Vault2Srv_NodeCreated : SrvMsgHeader {
|
||||
|
||||
struct Vault2Srv_NodeChanged : SrvMsgHeader {
|
||||
uint32_t nodeId;
|
||||
Uuid revisionId;
|
||||
Uuid accountId; // the notify target
|
||||
plUUID revisionId;
|
||||
plUUID accountId; // the notify target
|
||||
};
|
||||
|
||||
struct Vault2Srv_NodeAdded : SrvMsgHeader {
|
||||
NetVaultNodeRef ref;
|
||||
Uuid accountId; // the notify target
|
||||
plUUID accountId; // the notify target
|
||||
};
|
||||
|
||||
struct Vault2Srv_NodeRemoved : SrvMsgHeader {
|
||||
uint32_t parentId;
|
||||
uint32_t childId;
|
||||
Uuid accountId; // the notify target
|
||||
plUUID accountId; // the notify target
|
||||
};
|
||||
|
||||
struct Vault2Srv_NodeDeleted : SrvMsgHeader {
|
||||
uint32_t nodeId;
|
||||
Uuid accountId; // the notify target
|
||||
plUUID accountId; // the notify target
|
||||
};
|
||||
|
||||
struct Vault2Srv_NodeFindReply : SrvMsgHeader {
|
||||
@ -430,7 +430,7 @@ struct Vault2Srv_NodeFindReply : SrvMsgHeader {
|
||||
struct Vault2Srv_AgeInitReply : SrvMsgHeader {
|
||||
uint32_t ageNodeId;
|
||||
uint32_t ageInfoNodeId;
|
||||
Uuid accountId; // the requestor
|
||||
plUUID accountId; // the requestor
|
||||
};
|
||||
|
||||
struct Vault2Srv_PublicAgeList : SrvMsgHeader {
|
||||
@ -441,12 +441,12 @@ struct Vault2Srv_PublicAgeList : SrvMsgHeader {
|
||||
|
||||
struct Vault2Srv_NotifyAgeSDLChanged : SrvMsgHeader {
|
||||
wchar_t ageName[kMaxAgeNameLength];
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
};
|
||||
|
||||
struct Vault2Srv_CurrentPopulationRequest : SrvMsgHeader {
|
||||
uint32_t ageCount;
|
||||
Uuid ageInstIds[1]; // [ageCount], actually
|
||||
plUUID ageInstIds[1]; // [ageCount], actually
|
||||
// no more fields after var length alloc
|
||||
};
|
||||
|
||||
|
||||
@ -42,10 +42,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
/*****************************************************************************
|
||||
*
|
||||
* $/Plasma20/Sources/Plasma/NucleusLib/pnNetProtocol/Private/pnNpCommon.cpp
|
||||
*
|
||||
*
|
||||
***/
|
||||
|
||||
#include "../Pch.h"
|
||||
#include "pnUUID/pnUUID.h"
|
||||
#pragma hdrstop
|
||||
|
||||
|
||||
@ -599,8 +600,8 @@ void NetVaultNode::CopyFrom (const NetVaultNode * other, unsigned copyOpts) {
|
||||
_ZERO(kCreateTime, IVaultNodeSetValue, createTime, (unsigned)0);
|
||||
_ZERO(kModifyTime, IVaultNodeSetValue, modifyTime, (unsigned)0);
|
||||
_ZEROSTRING(kCreateAgeName, IVaultNodeSetString, createAgeName, L"");
|
||||
_ZERO(kCreateAgeUuid, IVaultNodeSetValue, createAgeUuid, kNilGuid);
|
||||
_ZERO(kCreatorAcct, IVaultNodeSetValue, creatorAcct, kNilGuid);
|
||||
_ZERO(kCreateAgeUuid, IVaultNodeSetValue, createAgeUuid, kNilUuid);
|
||||
_ZERO(kCreatorAcct, IVaultNodeSetValue, creatorAcct, kNilUuid);
|
||||
_ZERO(kCreatorId, IVaultNodeSetValue, creatorId, (unsigned)0);
|
||||
_ZERO(kNodeType, IVaultNodeSetValue, nodeType, (unsigned)0);
|
||||
_ZERO(kInt32_1, IVaultNodeSetValue, int32_1, (signed)0);
|
||||
@ -611,10 +612,10 @@ void NetVaultNode::CopyFrom (const NetVaultNode * other, unsigned copyOpts) {
|
||||
_ZERO(kUInt32_2, IVaultNodeSetValue, uint32_2, (unsigned)0);
|
||||
_ZERO(kUInt32_3, IVaultNodeSetValue, uint32_3, (unsigned)0);
|
||||
_ZERO(kUInt32_4, IVaultNodeSetValue, uint32_4, (unsigned)0);
|
||||
_ZERO(kUuid_1, IVaultNodeSetValue, uuid_1, kNilGuid);
|
||||
_ZERO(kUuid_2, IVaultNodeSetValue, uuid_2, kNilGuid);
|
||||
_ZERO(kUuid_3, IVaultNodeSetValue, uuid_3, kNilGuid);
|
||||
_ZERO(kUuid_4, IVaultNodeSetValue, uuid_4, kNilGuid);
|
||||
_ZERO(kUuid_1, IVaultNodeSetValue, uuid_1, kNilUuid);
|
||||
_ZERO(kUuid_2, IVaultNodeSetValue, uuid_2, kNilUuid);
|
||||
_ZERO(kUuid_3, IVaultNodeSetValue, uuid_3, kNilUuid);
|
||||
_ZERO(kUuid_4, IVaultNodeSetValue, uuid_4, kNilUuid);
|
||||
_ZEROSTRING(kString64_1, IVaultNodeSetString, string64_1, L"");
|
||||
_ZEROSTRING(kString64_2, IVaultNodeSetString, string64_2, L"");
|
||||
_ZEROSTRING(kString64_3, IVaultNodeSetString, string64_3, L"");
|
||||
@ -706,12 +707,12 @@ void NetVaultNode::SetCreateAgeName (const wchar_t v[]) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void NetVaultNode::SetCreateAgeUuid (const Uuid & v) {
|
||||
void NetVaultNode::SetCreateAgeUuid (const plUUID& v) {
|
||||
IVaultNodeSetValue(kCreateAgeUuid, this, &createAgeUuid, v);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void NetVaultNode::SetCreatorAcct (const Uuid & v) {
|
||||
void NetVaultNode::SetCreatorAcct (const plUUID& v) {
|
||||
IVaultNodeSetValue(kCreatorAcct, this, &creatorAcct, v);
|
||||
}
|
||||
|
||||
@ -766,22 +767,22 @@ void NetVaultNode::SetUInt32_4 (unsigned v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void NetVaultNode::SetUuid_1 (const Uuid & v) {
|
||||
void NetVaultNode::SetUuid_1 (const plUUID& v) {
|
||||
IVaultNodeSetValue(kUuid_1, this, &uuid_1, v);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void NetVaultNode::SetUuid_2 (const Uuid & v) {
|
||||
void NetVaultNode::SetUuid_2 (const plUUID& v) {
|
||||
IVaultNodeSetValue(kUuid_2, this, &uuid_2, v);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void NetVaultNode::SetUuid_3 (const Uuid & v) {
|
||||
void NetVaultNode::SetUuid_3 (const plUUID& v) {
|
||||
IVaultNodeSetValue(kUuid_3, this, &uuid_3, v);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void NetVaultNode::SetUuid_4 (const Uuid & v) {
|
||||
void NetVaultNode::SetUuid_4 (const plUUID& v) {
|
||||
IVaultNodeSetValue(kUuid_4, this, &uuid_4, v);
|
||||
}
|
||||
|
||||
@ -976,7 +977,7 @@ void NetVaultNodeFieldArray::GetFieldValueString_LCS (
|
||||
case NetVaultNode::kUuid_2:
|
||||
case NetVaultNode::kUuid_3:
|
||||
case NetVaultNode::kUuid_4: {
|
||||
plString tmp = plUUID(fieldAddr).AsString();
|
||||
plString tmp = plUUID((char*)fieldAddr).AsString();
|
||||
|
||||
StrPrintf(dst, dstChars, L"hextoraw('%s')", tmp.c_str());
|
||||
}
|
||||
|
||||
@ -50,6 +50,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#endif
|
||||
#define PLASMA20_SOURCES_PLASMA_NUCLEUSLIB_PNNETPROTOCOL_PRIVATE_PNNPCOMMON_H
|
||||
|
||||
#include "pnUUID/pnUUID.h"
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
@ -62,7 +64,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
const NetMsgField kNetMsgFieldAccountName = NET_MSG_FIELD_STRING(kMaxAccountNameLength);
|
||||
const NetMsgField kNetMsgFieldPlayerName = NET_MSG_FIELD_STRING(kMaxPlayerNameLength);
|
||||
const NetMsgField kNetMsgFieldShaDigest = NET_MSG_FIELD_RAW_DATA(sizeof(ShaDigest));
|
||||
const NetMsgField kNetMsgFieldUuid = NET_MSG_FIELD_DATA(sizeof(Uuid));
|
||||
const NetMsgField kNetMsgFieldUuid = NET_MSG_FIELD_DATA(sizeof(plUUID));
|
||||
const NetMsgField kNetMsgFieldTransId = NET_MSG_FIELD_DWORD();
|
||||
const NetMsgField kNetMsgFieldTimeMs = NET_MSG_FIELD_DWORD();
|
||||
const NetMsgField kNetMsgFieldENetError = NET_MSG_FIELD_DWORD();
|
||||
@ -96,7 +98,7 @@ struct SrvPlayerInfo {
|
||||
***/
|
||||
|
||||
struct NetAgeInfo {
|
||||
Uuid ageInstId;
|
||||
plUUID ageInstId;
|
||||
wchar_t ageFilename[kMaxAgeNameLength];
|
||||
wchar_t ageInstName[kMaxAgeNameLength];
|
||||
wchar_t ageUserName[kMaxAgeNameLength];
|
||||
@ -209,7 +211,7 @@ struct NetVaultNode : AtomicRef {
|
||||
uint64_t fieldFlags;
|
||||
uint64_t dirtyFlags;
|
||||
|
||||
Uuid revisionId;
|
||||
plUUID revisionId;
|
||||
|
||||
// Treat these as read-only or node flag fields will become invalid
|
||||
// Threaded apps: Must be accessed with node->critsect locked
|
||||
@ -217,8 +219,8 @@ struct NetVaultNode : AtomicRef {
|
||||
unsigned createTime;
|
||||
unsigned modifyTime;
|
||||
wchar_t * createAgeName;
|
||||
Uuid createAgeUuid;
|
||||
Uuid creatorAcct; // accountId of node creator
|
||||
plUUID createAgeUuid;
|
||||
plUUID creatorAcct; // accountId of node creator
|
||||
unsigned creatorId; // playerId of node creator
|
||||
unsigned nodeType;
|
||||
int int32_1;
|
||||
@ -229,10 +231,10 @@ struct NetVaultNode : AtomicRef {
|
||||
unsigned uint32_2;
|
||||
unsigned uint32_3;
|
||||
unsigned uint32_4;
|
||||
Uuid uuid_1;
|
||||
Uuid uuid_2;
|
||||
Uuid uuid_3;
|
||||
Uuid uuid_4;
|
||||
plUUID uuid_1;
|
||||
plUUID uuid_2;
|
||||
plUUID uuid_3;
|
||||
plUUID uuid_4;
|
||||
wchar_t * string64_1;
|
||||
wchar_t * string64_2;
|
||||
wchar_t * string64_3;
|
||||
@ -261,8 +263,8 @@ struct NetVaultNode : AtomicRef {
|
||||
void SetCreateTime (unsigned v);
|
||||
void SetModifyTime (unsigned v);
|
||||
void SetCreateAgeName (const wchar_t v[]);
|
||||
void SetCreateAgeUuid (const Uuid & v);
|
||||
void SetCreatorAcct (const Uuid & v);
|
||||
void SetCreateAgeUuid (const plUUID& v);
|
||||
void SetCreatorAcct (const plUUID& v);
|
||||
void SetCreatorId (unsigned v);
|
||||
void SetNodeType (unsigned v);
|
||||
void SetInt32_1 (int v);
|
||||
@ -273,10 +275,10 @@ struct NetVaultNode : AtomicRef {
|
||||
void SetUInt32_2 (unsigned v);
|
||||
void SetUInt32_3 (unsigned v);
|
||||
void SetUInt32_4 (unsigned v);
|
||||
void SetUuid_1 (const Uuid & v);
|
||||
void SetUuid_2 (const Uuid & v);
|
||||
void SetUuid_3 (const Uuid & v);
|
||||
void SetUuid_4 (const Uuid & v);
|
||||
void SetUuid_1 (const plUUID& v);
|
||||
void SetUuid_2 (const plUUID& v);
|
||||
void SetUuid_3 (const plUUID& v);
|
||||
void SetUuid_4 (const plUUID& v);
|
||||
void SetString64_1 (const wchar_t v[]);
|
||||
void SetString64_2 (const wchar_t v[]);
|
||||
void SetString64_3 (const wchar_t v[]);
|
||||
@ -298,8 +300,8 @@ struct NetVaultNode : AtomicRef {
|
||||
inline unsigned GetCreateTime () const { return createTime; }
|
||||
inline unsigned GetModifyTime () const { return modifyTime; }
|
||||
inline wchar_t * GetCreateAgeName () const { return createAgeName; }
|
||||
inline Uuid GetCreateAgeUuid () const { return createAgeUuid; }
|
||||
inline Uuid GetCreatorAcct () const { return creatorAcct; }
|
||||
inline plUUID GetCreateAgeUuid () const { return createAgeUuid; }
|
||||
inline plUUID GetCreatorAcct () const { return creatorAcct; }
|
||||
inline unsigned GetCreatorId () const { return creatorId; }
|
||||
inline unsigned GetNodeType () const { return nodeType; }
|
||||
inline int GetInt32_1 () const { return int32_1; }
|
||||
@ -310,10 +312,10 @@ struct NetVaultNode : AtomicRef {
|
||||
inline unsigned GetUInt32_2 () const { return uint32_2; }
|
||||
inline unsigned GetUInt32_3 () const { return uint32_3; }
|
||||
inline unsigned GetUInt32_4 () const { return uint32_4; }
|
||||
inline Uuid GetUuid_1 () const { return uuid_1; }
|
||||
inline Uuid GetUuid_2 () const { return uuid_2; }
|
||||
inline Uuid GetUuid_3 () const { return uuid_3; }
|
||||
inline Uuid GetUuid_4 () const { return uuid_4; }
|
||||
inline plUUID GetUuid_1 () const { return uuid_1; }
|
||||
inline plUUID GetUuid_2 () const { return uuid_2; }
|
||||
inline plUUID GetUuid_3 () const { return uuid_3; }
|
||||
inline plUUID GetUuid_4 () const { return uuid_4; }
|
||||
inline wchar_t * GetString64_1 () const { return string64_1; }
|
||||
inline wchar_t * GetString64_2 () const { return string64_2; }
|
||||
inline wchar_t * GetString64_3 () const { return string64_3; }
|
||||
|
||||
Reference in New Issue
Block a user