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

Replace Uuid with plUUID EVERYWHERE.

Browse Source
This commit is contained in:
Darryl Pogue
2012-12-29 02:05:23 -08:00
parent a0641ba66b
commit bcf6e97d23
78 changed files with 427 additions and 892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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;
};

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

@ -89,7 +89,7 @@ static_assert(kNumGateKeeper2CliMessages <= 0xFFFF, "GateKeeper2Cli message type
struct Cli2GateKeeper_ConnData {
uint32_t dataBytes;
Uuid token;
plUUID token;
};
struct Cli2GateKeeper_Connect {

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

@ -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;
};

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

@ -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;
};

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

@ -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];
};

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

@ -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
};