mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 19:29:09 +00:00
Convert custom HeadSpin integer types to standard types from stdint.h
This commit is contained in:
@ -52,7 +52,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#ifdef CLIENT
|
||||
///////////////////////////////////////////////////////////////////
|
||||
|
||||
const UInt8 plDniCoordinateInfo::StreamVersion = 1;
|
||||
const uint8_t plDniCoordinateInfo::StreamVersion = 1;
|
||||
|
||||
|
||||
plDniCoordinateInfo::plDniCoordinateInfo()
|
||||
@ -73,7 +73,7 @@ void plDniCoordinateInfo::CopyFrom( const plDniCoordinateInfo * other )
|
||||
|
||||
void plDniCoordinateInfo::Read( hsStream* s, hsResMgr* mgr )
|
||||
{
|
||||
UInt8 streamVer;
|
||||
uint8_t streamVer;
|
||||
s->ReadLE( &streamVer );
|
||||
if ( streamVer==StreamVersion )
|
||||
{
|
||||
|
||||
@ -54,7 +54,7 @@ class hsResMgr;
|
||||
|
||||
class plDniCoordinateInfo : public plCreatable
|
||||
{
|
||||
static const UInt8 StreamVersion;
|
||||
static const uint8_t StreamVersion;
|
||||
|
||||
protected:
|
||||
// spherical coords (rho,theta,phi)
|
||||
|
||||
@ -76,9 +76,9 @@ struct INotifyAfterDownload : THashKeyVal<unsigned> {
|
||||
|
||||
struct DeviceInbox : CHashKeyStr {
|
||||
HASHLINK(DeviceInbox) link;
|
||||
wchar inboxName[kMaxVaultNodeStringLength];
|
||||
wchar_t inboxName[kMaxVaultNodeStringLength];
|
||||
|
||||
DeviceInbox (const wchar device[], const wchar inbox[])
|
||||
DeviceInbox (const wchar_t device[], const wchar_t inbox[])
|
||||
: CHashKeyStr(device)
|
||||
{
|
||||
StrCopy(inboxName, inbox, arrsize(inboxName));
|
||||
@ -175,7 +175,7 @@ struct VaultDownloadTrans {
|
||||
FVaultProgressCallback progressCallback;
|
||||
void * cbProgressParam;
|
||||
|
||||
wchar tag[MAX_PATH];
|
||||
wchar_t tag[MAX_PATH];
|
||||
unsigned nodeCount;
|
||||
unsigned nodesLeft;
|
||||
unsigned vaultId;
|
||||
@ -315,7 +315,7 @@ static void VaultNodeAddedDownloadCallback(ENetError result, void * param) {
|
||||
//============================================================================
|
||||
static void __cdecl LogDumpProc (
|
||||
void * ,
|
||||
const wchar fmt[],
|
||||
const wchar_t fmt[],
|
||||
...
|
||||
) {
|
||||
va_list args;
|
||||
@ -1393,8 +1393,8 @@ void RelVaultNode::SetSeen (unsigned parentId, bool seen) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void RelVaultNode::Print (const wchar tag[], FStateDump dumpProc, unsigned level) {
|
||||
wchar str[1024];
|
||||
void RelVaultNode::Print (const wchar_t tag[], FStateDump dumpProc, unsigned level) {
|
||||
wchar_t str[1024];
|
||||
StrPrintf(
|
||||
str,
|
||||
arrsize(str),
|
||||
@ -1409,7 +1409,7 @@ void RelVaultNode::Print (const wchar tag[], FStateDump dumpProc, unsigned level
|
||||
);
|
||||
|
||||
NetVaultNodeFieldArray fields(this);
|
||||
for (qword bit = 1; bit; bit <<= 1) {
|
||||
for (uint64_t bit = 1; bit; bit <<= 1) {
|
||||
if (!(fieldFlags & bit))
|
||||
continue;
|
||||
if (bit > fieldFlags)
|
||||
@ -1809,7 +1809,7 @@ void VaultDeleteNode (
|
||||
//============================================================================
|
||||
void VaultPublishNode (
|
||||
unsigned nodeId,
|
||||
const wchar deviceName[]
|
||||
const wchar_t deviceName[]
|
||||
) {
|
||||
RelVaultNode * rvn;
|
||||
|
||||
@ -2125,10 +2125,10 @@ void VaultInitAge (
|
||||
trans->cbState = state;
|
||||
trans->cbParam = param;
|
||||
|
||||
wchar ageFilename[MAX_PATH];
|
||||
wchar ageInstName[MAX_PATH];
|
||||
wchar ageUserName[MAX_PATH];
|
||||
wchar ageDesc[1024];
|
||||
wchar_t ageFilename[MAX_PATH];
|
||||
wchar_t ageInstName[MAX_PATH];
|
||||
wchar_t ageUserName[MAX_PATH];
|
||||
wchar_t ageDesc[1024];
|
||||
|
||||
StrToUnicode(ageFilename, info->GetAgeFilename(), arrsize(ageFilename));
|
||||
StrToUnicode(ageInstName, info->GetAgeInstanceName(), arrsize(ageInstName));
|
||||
@ -2259,7 +2259,7 @@ bool VaultGetLinkToMyNeighborhood (plAgeLinkStruct * link) {
|
||||
|
||||
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, kNeighborhoodAgeFilename, arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
|
||||
@ -2286,7 +2286,7 @@ bool VaultGetLinkToMyPersonalAge (plAgeLinkStruct * link) {
|
||||
|
||||
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, kPersonalAgeFilename, arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
|
||||
@ -2313,7 +2313,7 @@ bool VaultGetLinkToCity (plAgeLinkStruct * link) {
|
||||
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
|
||||
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, kCityAgeFilename, arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
|
||||
@ -2342,7 +2342,7 @@ RelVaultNode * VaultGetOwnedAgeLinkIncRef (const plAgeInfoStruct * info) {
|
||||
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
if (info->HasAgeFilename()) {
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, info->GetAgeFilename(), arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
}
|
||||
@ -2377,7 +2377,7 @@ RelVaultNode * VaultGetOwnedAgeInfoIncRef (const plAgeInfoStruct * info) {
|
||||
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
if (info->HasAgeFilename()) {
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, info->GetAgeFilename(), arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
}
|
||||
@ -2412,7 +2412,7 @@ bool VaultGetOwnedAgeLink (const plAgeInfoStruct * info, plAgeLinkStruct * link)
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
bool VaultFindOrCreateChildAgeLinkAndWait (const wchar ownedAgeName[], const plAgeInfoStruct * info, plAgeLinkStruct * link) {
|
||||
bool VaultFindOrCreateChildAgeLinkAndWait (const wchar_t ownedAgeName[], const plAgeInfoStruct * info, plAgeLinkStruct * link) {
|
||||
hsAssert(false, "eric, implement me");
|
||||
return false;
|
||||
}
|
||||
@ -2510,7 +2510,7 @@ RelVaultNode * VaultGetVisitAgeLinkIncRef (const plAgeInfoStruct * info) {
|
||||
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
if (info->HasAgeFilename()) {
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, info->GetAgeFilename(), arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
}
|
||||
@ -2846,10 +2846,10 @@ namespace _VaultRegisterOwnedAge {
|
||||
RelVaultNode* agesIOwn = VaultGetAgesIOwnFolderIncRef();
|
||||
RelVaultNode* plyrInfo = VaultGetPlayerInfoNodeIncRef();
|
||||
VaultAddChildNode(agesIOwn->nodeId, node->nodeId, 0, (FVaultAddChildNodeCallback)_AddAgeLinkNode, nil);
|
||||
VaultAddChildNode(node->nodeId, (UInt32)p->fAgeInfoId, 0, (FVaultAddChildNodeCallback)_AddAgeInfoNode, nil);
|
||||
VaultAddChildNode(node->nodeId, (uint32_t)p->fAgeInfoId, 0, (FVaultAddChildNodeCallback)_AddAgeInfoNode, nil);
|
||||
|
||||
// Add our PlayerInfo to important places
|
||||
if (RelVaultNode* rvnAgeInfo = VaultGetNodeIncRef((UInt32)p->fAgeInfoId)) {
|
||||
if (RelVaultNode* rvnAgeInfo = VaultGetNodeIncRef((uint32_t)p->fAgeInfoId)) {
|
||||
if (RelVaultNode* rvnAgeOwners = rvnAgeInfo->GetChildPlayerInfoListNodeIncRef(plVault::kAgeOwnersFolder, 1)) {
|
||||
VaultAddChildNode(rvnAgeOwners->nodeId, plyrInfo->nodeId, 0, (FVaultAddChildNodeCallback)_AddPlayerInfoNode, nil);
|
||||
rvnAgeOwners->DecRef();
|
||||
@ -2879,7 +2879,7 @@ namespace _VaultRegisterOwnedAge {
|
||||
VaultCreateNode(plVault::kNodeType_AgeLink, (FVaultCreateNodeCallback)_CreateAgeLinkNode, nil, param);
|
||||
}
|
||||
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, UInt32 ageVaultId, UInt32 ageInfoVaultId) {
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, uint32_t ageVaultId, uint32_t ageInfoVaultId) {
|
||||
if (IS_NET_SUCCESS(result)) {
|
||||
_Params* p = TRACKED_NEW _Params();
|
||||
p->fAgeInfoId = (void*)ageInfoVaultId;
|
||||
@ -3195,7 +3195,7 @@ namespace _VaultRegisterVisitAge {
|
||||
}
|
||||
|
||||
_Params* p = (_Params*)param;
|
||||
RelVaultNode* ageInfo = VaultGetNodeIncRef((UInt32)p->fAgeInfoId);
|
||||
RelVaultNode* ageInfo = VaultGetNodeIncRef((uint32_t)p->fAgeInfoId);
|
||||
|
||||
// Add ourselves to the Can Visit folder of the age
|
||||
if (RelVaultNode * playerInfo = VaultGetPlayerInfoNodeIncRef()) {
|
||||
@ -3239,7 +3239,7 @@ namespace _VaultRegisterVisitAge {
|
||||
VaultCreateNode(plVault::kNodeType_AgeLink, (FVaultCreateNodeCallback)_CreateAgeLinkNode, nil, param);
|
||||
}
|
||||
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, UInt32 ageVaultId, UInt32 ageInfoId) {
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, uint32_t ageVaultId, uint32_t ageInfoId) {
|
||||
if (IS_NET_ERROR(result)) {
|
||||
LogMsg(kLogError, "RegisterVisitAge: Failed to init age vault (async)");
|
||||
DEL(param);
|
||||
@ -3411,7 +3411,7 @@ bool VaultUnregisterVisitAgeAndWait (const plAgeInfoStruct * info) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
RelVaultNode * VaultFindChronicleEntryIncRef (const wchar entryName[], int entryType) {
|
||||
RelVaultNode * VaultFindChronicleEntryIncRef (const wchar_t entryName[], int entryType) {
|
||||
|
||||
RelVaultNode * result = nil;
|
||||
if (RelVaultNode * rvnFldr = GetChildFolderNode(GetPlayerNode(), plVault::kChronicleFolder, 1)) {
|
||||
@ -3430,7 +3430,7 @@ RelVaultNode * VaultFindChronicleEntryIncRef (const wchar entryName[], int entry
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
bool VaultHasChronicleEntry (const wchar entryName[], int entryType) {
|
||||
bool VaultHasChronicleEntry (const wchar_t entryName[], int entryType) {
|
||||
if (RelVaultNode * rvn = VaultFindChronicleEntryIncRef(entryName, entryType)) {
|
||||
rvn->DecRef();
|
||||
return true;
|
||||
@ -3440,9 +3440,9 @@ bool VaultHasChronicleEntry (const wchar entryName[], int entryType) {
|
||||
|
||||
//============================================================================
|
||||
void VaultAddChronicleEntryAndWait (
|
||||
const wchar entryName[],
|
||||
const wchar_t entryName[],
|
||||
int entryType,
|
||||
const wchar entryValue[]
|
||||
const wchar_t entryValue[]
|
||||
) {
|
||||
if (RelVaultNode * rvnChrn = VaultFindChronicleEntryIncRef(entryName, entryType)) {
|
||||
VaultChronicleNode chrnNode(rvnChrn);
|
||||
@ -3523,7 +3523,7 @@ bool VaultSetCCRStatus (bool online) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultDump (const wchar tag[], unsigned vaultId, FStateDump dumpProc) {
|
||||
void VaultDump (const wchar_t tag[], unsigned vaultId, FStateDump dumpProc) {
|
||||
LogMsg(kLogDebug, L"<---- ID:%u, Begin Vault%*s%s ---->", vaultId, tag ? 1 : 0, L" ", tag);
|
||||
|
||||
if (RelVaultNode * rvn = GetNode(vaultId))
|
||||
@ -3533,7 +3533,7 @@ void VaultDump (const wchar tag[], unsigned vaultId, FStateDump dumpProc) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultDump (const wchar tag[], unsigned vaultId) {
|
||||
void VaultDump (const wchar_t tag[], unsigned vaultId) {
|
||||
VaultDump (tag, vaultId, LogDumpProc);
|
||||
}
|
||||
|
||||
@ -3649,8 +3649,8 @@ bool VaultAmCzarOfAge (const Uuid & ageInstId) {
|
||||
|
||||
//============================================================================
|
||||
bool VaultRegisterMTStationAndWait (
|
||||
const wchar stationName[],
|
||||
const wchar linkBackSpawnPtObjName[]
|
||||
const wchar_t stationName[],
|
||||
const wchar_t linkBackSpawnPtObjName[]
|
||||
) {
|
||||
plAgeInfoStruct info;
|
||||
info.SetAgeFilename(kCityAgeFilename);
|
||||
@ -3901,7 +3901,7 @@ RelVaultNode * VaultFindAgeSubAgeLinkIncRef (const plAgeInfoStruct * info) {
|
||||
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
|
||||
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, info->GetAgeFilename(), arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
|
||||
@ -3920,22 +3920,22 @@ RelVaultNode * VaultFindAgeSubAgeLinkIncRef (const plAgeInfoStruct * info) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
RelVaultNode * VaultFindAgeChronicleEntryIncRef (const wchar entryName[], int entryType) {
|
||||
RelVaultNode * VaultFindAgeChronicleEntryIncRef (const wchar_t entryName[], int entryType) {
|
||||
hsAssert(false, "eric, implement me");
|
||||
return nil;
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultAddAgeChronicleEntry (
|
||||
const wchar entryName[],
|
||||
const wchar_t entryName[],
|
||||
int entryType,
|
||||
const wchar entryValue[]
|
||||
const wchar_t entryValue[]
|
||||
) {
|
||||
hsAssert(false, "eric, implement me");
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
RelVaultNode * VaultAgeAddDeviceAndWaitIncRef (const wchar deviceName[]) {
|
||||
RelVaultNode * VaultAgeAddDeviceAndWaitIncRef (const wchar_t deviceName[]) {
|
||||
if (RelVaultNode * existing = VaultAgeGetDeviceIncRef(deviceName))
|
||||
return existing;
|
||||
|
||||
@ -3967,7 +3967,7 @@ RelVaultNode * VaultAgeAddDeviceAndWaitIncRef (const wchar deviceName[]) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultAgeRemoveDevice (const wchar deviceName[]) {
|
||||
void VaultAgeRemoveDevice (const wchar_t deviceName[]) {
|
||||
if (RelVaultNode * folder = VaultGetAgeDevicesFolderIncRef()) {
|
||||
NetVaultNode * templateNode = NEWZERO(NetVaultNode);
|
||||
templateNode->IncRef();
|
||||
@ -3987,7 +3987,7 @@ void VaultAgeRemoveDevice (const wchar deviceName[]) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
bool VaultAgeHasDevice (const wchar deviceName[]) {
|
||||
bool VaultAgeHasDevice (const wchar_t deviceName[]) {
|
||||
bool found = false;
|
||||
if (RelVaultNode * folder = VaultGetAgeDevicesFolderIncRef()) {
|
||||
NetVaultNode * templateNode = NEWZERO(NetVaultNode);
|
||||
@ -4006,7 +4006,7 @@ bool VaultAgeHasDevice (const wchar deviceName[]) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
RelVaultNode * VaultAgeGetDeviceIncRef (const wchar deviceName[]) {
|
||||
RelVaultNode * VaultAgeGetDeviceIncRef (const wchar_t deviceName[]) {
|
||||
RelVaultNode * result = nil;
|
||||
if (RelVaultNode * folder = VaultGetAgeDevicesFolderIncRef()) {
|
||||
NetVaultNode * templateNode = NEWZERO(NetVaultNode);
|
||||
@ -4023,7 +4023,7 @@ RelVaultNode * VaultAgeGetDeviceIncRef (const wchar deviceName[]) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
RelVaultNode * VaultAgeSetDeviceInboxAndWaitIncRef (const wchar deviceName[], const wchar inboxName[]) {
|
||||
RelVaultNode * VaultAgeSetDeviceInboxAndWaitIncRef (const wchar_t deviceName[], const wchar_t inboxName[]) {
|
||||
DeviceInbox * devInbox = s_ageDeviceInboxes.Find(CHashKeyStr(deviceName));
|
||||
if (devInbox) {
|
||||
StrCopy(devInbox->inboxName, inboxName, arrsize(devInbox->inboxName));
|
||||
@ -4064,14 +4064,14 @@ RelVaultNode * VaultAgeSetDeviceInboxAndWaitIncRef (const wchar deviceName[], co
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
RelVaultNode * VaultAgeGetDeviceInboxIncRef (const wchar deviceName[]) {
|
||||
RelVaultNode * VaultAgeGetDeviceInboxIncRef (const wchar_t deviceName[]) {
|
||||
RelVaultNode * result = nil;
|
||||
DeviceInbox * devInbox = s_ageDeviceInboxes.Find(CHashKeyStr(deviceName));
|
||||
|
||||
if (devInbox)
|
||||
{
|
||||
RelVaultNode * parentNode = nil;
|
||||
const wchar * inboxName = nil;
|
||||
const wchar_t * inboxName = nil;
|
||||
|
||||
if (StrCmp(devInbox->inboxName, DEFAULT_DEVICE_INBOX) == 0) {
|
||||
parentNode = VaultAgeGetDeviceIncRef(deviceName);
|
||||
@ -4150,7 +4150,7 @@ RelVaultNode * VaultGetSubAgeLinkIncRef (const plAgeInfoStruct * info) {
|
||||
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
|
||||
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, info->GetAgeFilename(), arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
|
||||
@ -4422,7 +4422,7 @@ namespace _VaultCreateSubAge {
|
||||
}
|
||||
|
||||
// Add the children to the right places
|
||||
VaultAddChildNode(node->nodeId, (UInt32)param, 0, nil, nil);
|
||||
VaultAddChildNode(node->nodeId, (uint32_t)param, 0, nil, nil);
|
||||
if (RelVaultNode* saFldr = VaultGetAgeSubAgesFolderIncRef()) {
|
||||
VaultAddChildNode(saFldr->nodeId, node->nodeId, 0, nil, nil);
|
||||
saFldr->DecRef();
|
||||
@ -4451,7 +4451,7 @@ namespace _VaultCreateSubAge {
|
||||
);
|
||||
}
|
||||
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, UInt32 ageVaultId, UInt32 ageInfoId) {
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, uint32_t ageVaultId, uint32_t ageInfoId) {
|
||||
if (IS_NET_ERROR(result)) {
|
||||
LogMsg(kLogError, "CreateSubAge: Failed to init age (async)");
|
||||
return;
|
||||
@ -4562,7 +4562,7 @@ static void _AddChildNodeCallback (
|
||||
|
||||
//============================================================================
|
||||
bool VaultAgeFindOrCreateChildAgeLinkAndWait (
|
||||
const wchar parentAgeName[],
|
||||
const wchar_t parentAgeName[],
|
||||
const plAgeInfoStruct * info,
|
||||
plAgeLinkStruct * link
|
||||
) {
|
||||
@ -4611,7 +4611,7 @@ bool VaultAgeFindOrCreateChildAgeLinkAndWait (
|
||||
templateNode->SetNodeType(plVault::kNodeType_AgeInfo);
|
||||
|
||||
VaultAgeInfoNode ageInfo(templateNode);
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
StrToUnicode(str, info->GetAgeFilename(), arrsize(str));
|
||||
ageInfo.SetAgeFilename(str);
|
||||
|
||||
@ -4789,8 +4789,8 @@ namespace _VaultCreateChildAge {
|
||||
_Params* p = (_Params*)param;
|
||||
|
||||
// Add the children to the right places
|
||||
VaultAddChildNode(node->nodeId, (UInt32)p->fAgeInfoId, 0, nil, nil);
|
||||
VaultAddChildNode((UInt32)p->fChildAgesFldr, node->nodeId, 0, nil, nil);
|
||||
VaultAddChildNode(node->nodeId, (uint32_t)p->fAgeInfoId, 0, nil, nil);
|
||||
VaultAddChildNode((uint32_t)p->fChildAgesFldr, node->nodeId, 0, nil, nil);
|
||||
|
||||
// Send the VaultNotify that the plNetLinkingMgr wants...
|
||||
plVaultNotifyMsg * msg = NEWZERO(plVaultNotifyMsg);
|
||||
@ -4817,7 +4817,7 @@ namespace _VaultCreateChildAge {
|
||||
);
|
||||
}
|
||||
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, UInt32 ageVaultId, UInt32 ageInfoId) {
|
||||
void _InitAgeCallback(ENetError result, void* state, void* param, uint32_t ageVaultId, uint32_t ageInfoId) {
|
||||
if (IS_NET_ERROR(result)) {
|
||||
LogMsg(kLogError, "CreateChildAge: Failed to init age (async)");
|
||||
DEL(param);
|
||||
@ -4838,8 +4838,8 @@ namespace _VaultCreateChildAge {
|
||||
}
|
||||
}; // namespace _VaultCreateAge
|
||||
|
||||
UInt8 VaultAgeFindOrCreateChildAgeLink(
|
||||
const wchar parentAgeName[],
|
||||
uint8_t VaultAgeFindOrCreateChildAgeLink(
|
||||
const wchar_t parentAgeName[],
|
||||
const plAgeInfoStruct* info,
|
||||
plAgeLinkStruct* link)
|
||||
{
|
||||
@ -4865,10 +4865,10 @@ UInt8 VaultAgeFindOrCreateChildAgeLink(
|
||||
}
|
||||
|
||||
// Still here? Try to find the Child Ages folder
|
||||
UInt8 retval = hsFail;
|
||||
uint8_t retval = hsFail;
|
||||
if (RelVaultNode* rvnChildAges = rvnParentInfo->GetChildAgeInfoListNodeIncRef(plVault::kChildAgesFolder, 1)) {
|
||||
const char* ageName = info->GetAgeFilename();
|
||||
wchar hack[MAX_PATH];
|
||||
wchar_t hack[MAX_PATH];
|
||||
StrToUnicode(hack, ageName, arrsize(hack));
|
||||
|
||||
// Search for our age
|
||||
@ -4932,7 +4932,7 @@ void VaultCCRDumpPlayers() {
|
||||
|
||||
//============================================================================
|
||||
void VaultDownload (
|
||||
const wchar tag[],
|
||||
const wchar_t tag[],
|
||||
unsigned vaultId,
|
||||
FVaultDownloadCallback callback,
|
||||
void * cbParam,
|
||||
@ -4969,7 +4969,7 @@ static void _DownloadVaultCallback (
|
||||
}
|
||||
|
||||
void VaultDownloadAndWait (
|
||||
const wchar tag[],
|
||||
const wchar_t tag[],
|
||||
unsigned vaultId,
|
||||
FVaultProgressCallback progressCallback,
|
||||
void * cbProgressParam
|
||||
|
||||
@ -178,7 +178,7 @@ struct RelVaultNode : NetVaultNode {
|
||||
void SetSeen (unsigned parentId, bool seen);
|
||||
|
||||
// logging
|
||||
void Print (const wchar tag[], FStateDump dumpProc, unsigned level);
|
||||
void Print (const wchar_t tag[], FStateDump dumpProc, unsigned level);
|
||||
void PrintTree (FStateDump dumpProc, unsigned level);
|
||||
|
||||
// AgeInfoNode-specific (and it checks!)
|
||||
@ -246,7 +246,7 @@ void VaultDeleteNode (
|
||||
);
|
||||
void VaultPublishNode (
|
||||
unsigned nodeId,
|
||||
const wchar deviceName[]
|
||||
const wchar_t deviceName[]
|
||||
);
|
||||
void VaultSendNode (
|
||||
RelVaultNode* srcNode,
|
||||
@ -353,20 +353,20 @@ bool VaultRegisterVisitAgeAndWait (const plAgeLinkStruct * link);
|
||||
void VaultRegisterVisitAge (const plAgeLinkStruct* link);
|
||||
bool VaultUnregisterOwnedAgeAndWait (const plAgeInfoStruct * info);
|
||||
bool VaultUnregisterVisitAgeAndWait (const plAgeInfoStruct * info);
|
||||
RelVaultNode * VaultFindChronicleEntryIncRef (const wchar entryName[], int entryType = -1);
|
||||
bool VaultHasChronicleEntry (const wchar entryName[], int entryType = -1);
|
||||
RelVaultNode * VaultFindChronicleEntryIncRef (const wchar_t entryName[], int entryType = -1);
|
||||
bool VaultHasChronicleEntry (const wchar_t entryName[], int entryType = -1);
|
||||
// if entry of same name and type already exists, value is updated
|
||||
void VaultAddChronicleEntryAndWait (
|
||||
const wchar entryName[],
|
||||
const wchar_t entryName[],
|
||||
int entryType,
|
||||
const wchar entryValue[]
|
||||
const wchar_t entryValue[]
|
||||
);
|
||||
bool VaultAmIgnoringPlayer (unsigned playerId);
|
||||
unsigned VaultGetKILevel ();
|
||||
bool VaultGetCCRStatus (); // true=online, false=away
|
||||
bool VaultSetCCRStatus (bool online); // true=online, false=away
|
||||
void VaultDump (const wchar tag[], unsigned vaultId, FStateDump dumpProc);
|
||||
void VaultDump (const wchar tag[], unsigned vaultId);
|
||||
void VaultDump (const wchar_t tag[], unsigned vaultId, FStateDump dumpProc);
|
||||
void VaultDump (const wchar_t tag[], unsigned vaultId);
|
||||
|
||||
bool VaultAmInMyPersonalAge ();
|
||||
bool VaultAmInMyNeighborhoodAge ();
|
||||
@ -375,8 +375,8 @@ bool VaultAmCzarOfCurrentAge ();
|
||||
bool VaultAmOwnerOfAge (const Uuid & ageInstId);
|
||||
bool VaultAmCzarOfAge (const Uuid & ageInstId);
|
||||
bool VaultRegisterMTStationAndWait (
|
||||
const wchar stationName[],
|
||||
const wchar linkBackSpawnPtObjName[]
|
||||
const wchar_t stationName[],
|
||||
const wchar_t linkBackSpawnPtObjName[]
|
||||
);
|
||||
void VaultProcessPlayerInbox ();
|
||||
|
||||
@ -402,19 +402,19 @@ RelVaultNode * VaultGetAgePublicAgesFolderIncRef ();
|
||||
RelVaultNode * VaultAgeGetBookshelfFolderIncRef ();
|
||||
RelVaultNode * VaultFindAgeSubAgeLinkIncRef (const plAgeInfoStruct * info);
|
||||
RelVaultNode * VaultFindAgeChildAgeLinkIncRef (const plAgeInfoStruct * info);
|
||||
RelVaultNode * VaultFindAgeChronicleEntryIncRef (const wchar entryName[], int entryType = -1);
|
||||
RelVaultNode * VaultFindAgeChronicleEntryIncRef (const wchar_t entryName[], int entryType = -1);
|
||||
// if entry of same name and type already exists, value is updated
|
||||
void VaultAddAgeChronicleEntry (
|
||||
const wchar entryName[],
|
||||
const wchar_t entryName[],
|
||||
int entryType,
|
||||
const wchar entryValue[]
|
||||
const wchar_t entryValue[]
|
||||
);
|
||||
RelVaultNode * VaultAgeAddDeviceAndWaitIncRef (const wchar deviceName[]); // blocks until completion
|
||||
void VaultAgeRemoveDevice (const wchar deviceName[]);
|
||||
bool VaultAgeHasDevice (const wchar deviceName[]);
|
||||
RelVaultNode * VaultAgeGetDeviceIncRef (const wchar deviceName[]);
|
||||
RelVaultNode * VaultAgeSetDeviceInboxAndWaitIncRef (const wchar deviceName[], const wchar inboxName[]); // blocks until completion
|
||||
RelVaultNode * VaultAgeGetDeviceInboxIncRef (const wchar deviceName[]);
|
||||
RelVaultNode * VaultAgeAddDeviceAndWaitIncRef (const wchar_t deviceName[]); // blocks until completion
|
||||
void VaultAgeRemoveDevice (const wchar_t deviceName[]);
|
||||
bool VaultAgeHasDevice (const wchar_t deviceName[]);
|
||||
RelVaultNode * VaultAgeGetDeviceIncRef (const wchar_t deviceName[]);
|
||||
RelVaultNode * VaultAgeSetDeviceInboxAndWaitIncRef (const wchar_t deviceName[], const wchar_t inboxName[]); // blocks until completion
|
||||
RelVaultNode * VaultAgeGetDeviceInboxIncRef (const wchar_t deviceName[]);
|
||||
void VaultClearDeviceInboxMap ();
|
||||
|
||||
bool VaultAgeGetAgeSDL (class plStateDataRecord * out);
|
||||
@ -434,11 +434,11 @@ bool VaultAgeFindOrCreateSubAgeLinkAndWait (
|
||||
);
|
||||
bool VaultAgeFindOrCreateSubAgeLink(const plAgeInfoStruct* info, plAgeLinkStruct* link, const Uuid& parentUuid);
|
||||
bool VaultAgeFindOrCreateChildAgeLinkAndWait (
|
||||
const wchar parentAgeName[], // nil --> current age, non-nil --> owned age by given name
|
||||
const wchar_t parentAgeName[], // nil --> current age, non-nil --> owned age by given name
|
||||
const plAgeInfoStruct * info,
|
||||
plAgeLinkStruct * link
|
||||
);
|
||||
UInt8 VaultAgeFindOrCreateChildAgeLink(const wchar parentAgeName[], const plAgeInfoStruct* info, plAgeLinkStruct* link);
|
||||
uint8_t VaultAgeFindOrCreateChildAgeLink(const wchar_t parentAgeName[], const plAgeInfoStruct* info, plAgeLinkStruct* link);
|
||||
|
||||
|
||||
|
||||
@ -469,7 +469,7 @@ typedef void (*FVaultProgressCallback)(
|
||||
);
|
||||
|
||||
void VaultDownload (
|
||||
const wchar tag[],
|
||||
const wchar_t tag[],
|
||||
unsigned vaultId,
|
||||
FVaultDownloadCallback callback,
|
||||
void * cbParam,
|
||||
@ -477,7 +477,7 @@ void VaultDownload (
|
||||
void * cbProgressParam
|
||||
);
|
||||
void VaultDownloadAndWait (
|
||||
const wchar tag[],
|
||||
const wchar_t tag[],
|
||||
unsigned vaultId,
|
||||
FVaultProgressCallback progressCallback,
|
||||
void * cbProgressParam
|
||||
|
||||
@ -53,7 +53,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
//============================================================================
|
||||
struct NodeTypeToVolatileField {
|
||||
unsigned nodeType;
|
||||
qword volatileFields;
|
||||
uint64_t volatileFields;
|
||||
};
|
||||
|
||||
NodeTypeToVolatileField volatileFieldList[] = {
|
||||
@ -62,8 +62,8 @@ NodeTypeToVolatileField volatileFieldList[] = {
|
||||
};
|
||||
|
||||
//============================================================================
|
||||
qword GetNodeVolatileFields(NetVaultNode* node) {
|
||||
qword volatileFields = 0;
|
||||
uint64_t GetNodeVolatileFields(NetVaultNode* node) {
|
||||
uint64_t volatileFields = 0;
|
||||
unsigned index = 0;
|
||||
|
||||
while (volatileFieldList[index].nodeType != 0) {
|
||||
@ -112,12 +112,12 @@ VaultPlayerNode::VaultPlayerNode (NetVaultNode * node)
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultPlayerNode::SetPlayerName (const wchar v[]) {
|
||||
void VaultPlayerNode::SetPlayerName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kPlayerName, base, &playerName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultPlayerNode::SetAvatarShapeName (const wchar v[]) {
|
||||
void VaultPlayerNode::SetAvatarShapeName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kAvatarShapeName, base, &avatarShapeName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
@ -171,12 +171,12 @@ void VaultPlayerInfoNode::SetPlayerId (unsigned v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultPlayerInfoNode::SetPlayerName (const wchar v[]) {
|
||||
void VaultPlayerInfoNode::SetPlayerName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kPlayerName, base, &playerName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultPlayerInfoNode::SetAgeInstName (const wchar v[]) {
|
||||
void VaultPlayerInfoNode::SetAgeInstName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kAgeInstName, base, &ageInstName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
@ -210,7 +210,7 @@ VaultFolderNode::VaultFolderNode (NetVaultNode * node)
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultFolderNode::SetFolderName (const wchar v[]) {
|
||||
void VaultFolderNode::SetFolderName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kFolderName, base, &folderName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
@ -267,12 +267,12 @@ void VaultChronicleNode::SetEntryType (int v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultChronicleNode::SetEntryName (const wchar v[]) {
|
||||
void VaultChronicleNode::SetEntryName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kEntryName, base, &entryName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultChronicleNode::SetEntryValue (const wchar v[]) {
|
||||
void VaultChronicleNode::SetEntryValue (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kEntryValue, base, &entryValue, v, (unsigned)-1);
|
||||
}
|
||||
|
||||
@ -304,12 +304,12 @@ void VaultTextNoteNode::SetNoteSubType (int v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultTextNoteNode::SetNoteTitle (const wchar v[]) {
|
||||
void VaultTextNoteNode::SetNoteTitle (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kNoteTitle, base, ¬eTitle, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultTextNoteNode::SetNoteText (const wchar v[]) {
|
||||
void VaultTextNoteNode::SetNoteText (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kNoteText, base, ¬eText, v, (unsigned)-1);
|
||||
}
|
||||
|
||||
@ -328,70 +328,70 @@ enum EAgeInfoFields {
|
||||
#ifdef CLIENT
|
||||
void VaultTextNoteNode::SetVisitInfo (const plAgeInfoStruct & info) {
|
||||
|
||||
ARRAY(wchar) buf;
|
||||
ARRAY(wchar_t) buf;
|
||||
|
||||
for (unsigned i = 0; i < kNumAgeInfoFields; ++i) {
|
||||
switch (i) {
|
||||
case kAgeFilename: {
|
||||
wchar src[128];
|
||||
wchar_t src[128];
|
||||
StrToUnicode(src, info.GetAgeFilename(), arrsize(src));
|
||||
unsigned len = StrLen(src);
|
||||
wchar * dst = buf.New(len);
|
||||
wchar_t * dst = buf.New(len);
|
||||
MemCopy(dst, src, len * sizeof(src[0]));
|
||||
}
|
||||
break;
|
||||
|
||||
case kAgeInstName: {
|
||||
wchar src[128];
|
||||
wchar_t src[128];
|
||||
StrToUnicode(src, info.GetAgeInstanceName(), arrsize(src));
|
||||
unsigned len = StrLen(src);
|
||||
wchar * dst = buf.New(len);
|
||||
wchar_t * dst = buf.New(len);
|
||||
MemCopy(dst, src, len * sizeof(src[0]));
|
||||
}
|
||||
break;
|
||||
|
||||
case kAgeUserName: {
|
||||
wchar src[128];
|
||||
wchar_t src[128];
|
||||
StrToUnicode(src, info.GetAgeUserDefinedName(), arrsize(src));
|
||||
unsigned len = StrLen(src);
|
||||
wchar * dst = buf.New(len);
|
||||
wchar_t * dst = buf.New(len);
|
||||
MemCopy(dst, src, len * sizeof(src[0]));
|
||||
}
|
||||
break;
|
||||
|
||||
case kAgeDesc: {
|
||||
wchar src[128];
|
||||
wchar_t src[128];
|
||||
StrToUnicode(src, info.GetAgeDescription(), arrsize(src));
|
||||
unsigned len = StrLen(src);
|
||||
wchar * dst = buf.New(len);
|
||||
wchar_t * dst = buf.New(len);
|
||||
MemCopy(dst, src, len * sizeof(src[0]));
|
||||
}
|
||||
break;
|
||||
|
||||
case kAgeInstGuid: {
|
||||
Uuid guid = (Uuid)*info.GetAgeInstanceGuid();
|
||||
wchar src[64];
|
||||
wchar_t src[64];
|
||||
GuidToString(guid, src, arrsize(src));
|
||||
unsigned len = StrLen(src);
|
||||
wchar * dst = buf.New(len);
|
||||
wchar_t * dst = buf.New(len);
|
||||
MemCopy(dst, src, len * sizeof(src[0]));
|
||||
}
|
||||
break;
|
||||
|
||||
case kAgeLanguage: {
|
||||
wchar src[32];
|
||||
wchar_t src[32];
|
||||
StrPrintf(src, arrsize(src), L"%u", info.GetAgeLanguage());
|
||||
unsigned len = StrLen(src);
|
||||
wchar * dst = buf.New(len);
|
||||
wchar_t * dst = buf.New(len);
|
||||
MemCopy(dst, src, len * sizeof(src[0]));
|
||||
}
|
||||
break;
|
||||
|
||||
case kAgeSequence: {
|
||||
wchar src[32];
|
||||
wchar_t src[32];
|
||||
StrPrintf(src, arrsize(src), L"%u", info.GetAgeSequenceNumber());
|
||||
unsigned len = StrLen(src);
|
||||
wchar * dst = buf.New(len);
|
||||
wchar_t * dst = buf.New(len);
|
||||
MemCopy(dst, src, len * sizeof(src[0]));
|
||||
}
|
||||
break;
|
||||
@ -399,11 +399,11 @@ void VaultTextNoteNode::SetVisitInfo (const plAgeInfoStruct & info) {
|
||||
DEFAULT_FATAL(i);
|
||||
}
|
||||
|
||||
wchar * sep = buf.New(1);
|
||||
wchar_t * sep = buf.New(1);
|
||||
*sep = L'|';
|
||||
}
|
||||
|
||||
wchar * term = buf.New(1);
|
||||
wchar_t * term = buf.New(1);
|
||||
*term = 0;
|
||||
|
||||
SetNoteText(buf.Ptr());
|
||||
@ -414,12 +414,12 @@ void VaultTextNoteNode::SetVisitInfo (const plAgeInfoStruct & info) {
|
||||
#ifdef CLIENT
|
||||
bool VaultTextNoteNode::GetVisitInfo (plAgeInfoStruct * info) {
|
||||
|
||||
wchar * mem;
|
||||
const wchar * str = mem = StrDup(noteText);
|
||||
wchar_t * mem;
|
||||
const wchar_t * str = mem = StrDup(noteText);
|
||||
|
||||
for (unsigned i = 0; i < kNumAgeInfoFields; ++i) {
|
||||
|
||||
wchar token[1024];
|
||||
wchar_t token[1024];
|
||||
switch (i) {
|
||||
case kAgeFilename: {
|
||||
StrTokenize(&str, token, arrsize(token), L"|", 1);
|
||||
@ -519,7 +519,7 @@ void VaultSDLNode::SetSdlIdent (int v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultSDLNode::SetSdlName (const wchar v[]) {
|
||||
void VaultSDLNode::SetSdlName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kSDLName, base, &sdlName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
@ -566,11 +566,11 @@ void VaultSDLNode::SetStateDataRecord (const plStateDataRecord * rec, unsigned w
|
||||
ram.Rewind();
|
||||
|
||||
unsigned bytes = ram.GetEOF();
|
||||
byte * buf, * heap = nil;
|
||||
uint8_t * buf, * heap = nil;
|
||||
if (bytes <= 2048)
|
||||
buf = ALLOCA(byte, bytes);
|
||||
buf = ALLOCA(uint8_t, bytes);
|
||||
else
|
||||
buf = (byte *)ALLOC(bytes);
|
||||
buf = (uint8_t *)ALLOC(bytes);
|
||||
|
||||
ram.CopyToMem(buf);
|
||||
|
||||
@ -582,7 +582,7 @@ void VaultSDLNode::SetStateDataRecord (const plStateDataRecord * rec, unsigned w
|
||||
|
||||
//============================================================================
|
||||
#ifdef CLIENT
|
||||
void VaultSDLNode::InitStateDataRecord (const wchar sdlRecName[], unsigned writeOptions) {
|
||||
void VaultSDLNode::InitStateDataRecord (const wchar_t sdlRecName[], unsigned writeOptions) {
|
||||
{
|
||||
plStateDataRecord * rec = NEWZERO(plStateDataRecord);
|
||||
bool exists = GetStateDataRecord(rec, 0);
|
||||
@ -619,7 +619,7 @@ VaultImageNode::VaultImageNode (NetVaultNode * node)
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultImageNode::SetImageTitle (const wchar v[]) {
|
||||
void VaultImageNode::SetImageTitle (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kImageTitle, base, &title, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
@ -629,7 +629,7 @@ void VaultImageNode::SetImageType (int v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultImageNode::SetImageData (const byte buffer[], unsigned bytes) {
|
||||
void VaultImageNode::SetImageData (const uint8_t buffer[], unsigned bytes) {
|
||||
IVaultNodeSetBlob(kImageData, base, &imgData, &imgDataLen, buffer, bytes);
|
||||
}
|
||||
|
||||
@ -640,7 +640,7 @@ void VaultImageNode::StuffImage (plMipmap * src) {
|
||||
plJPEG::Instance().SetWriteQuality(30/*percent*/);
|
||||
if (plJPEG::Instance().WriteToStream(&ramStream, src)) {
|
||||
unsigned bytes = ramStream.GetEOF();
|
||||
byte * buffer = (byte *)ALLOC(bytes);
|
||||
uint8_t * buffer = (uint8_t *)ALLOC(bytes);
|
||||
ramStream.CopyToMem(buffer);
|
||||
IVaultNodeSetBlob(kImageData, base, &imgData, &imgDataLen, buffer, bytes);
|
||||
SetImageType(kJPEG);
|
||||
@ -830,7 +830,7 @@ void VaultAgeLinkNode::SetSpawnPoints (const plSpawnPointVec & in) {
|
||||
base,
|
||||
&spawnPoints,
|
||||
&spawnPointsLen,
|
||||
(const byte *)ss.str().c_str(),
|
||||
(const uint8_t *)ss.str().c_str(),
|
||||
ss.str().size()
|
||||
);
|
||||
}
|
||||
@ -862,7 +862,7 @@ void VaultAgeNode::SetParentAgeInstGuid (const Uuid & v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultAgeNode::SetAgeName (const wchar v[]) {
|
||||
void VaultAgeNode::SetAgeName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kAgeName, base, &ageName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
@ -892,17 +892,17 @@ VaultAgeInfoNode::VaultAgeInfoNode (NetVaultNode * node)
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultAgeInfoNode::SetAgeFilename (const wchar v[]) {
|
||||
void VaultAgeInfoNode::SetAgeFilename (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kAgeFilename, base, &ageFilename, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultAgeInfoNode::SetAgeInstName (const wchar v[]) {
|
||||
void VaultAgeInfoNode::SetAgeInstName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kAgeInstanceName, base, &ageInstName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultAgeInfoNode::SetAgeUserDefinedName (const wchar v[]) {
|
||||
void VaultAgeInfoNode::SetAgeUserDefinedName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kAgeUserDefinedName, base, &ageUserDefinedName, v, kMaxVaultNodeStringLength);
|
||||
}
|
||||
|
||||
@ -947,7 +947,7 @@ void VaultAgeInfoNode::SetAgeInfoFlags (unsigned v) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultAgeInfoNode::SetAgeDescription (const wchar v[]) {
|
||||
void VaultAgeInfoNode::SetAgeDescription (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kAgeDescription, base, &ageDescription, v, (unsigned)-1);
|
||||
}
|
||||
|
||||
@ -962,7 +962,7 @@ const class plUnifiedTime * VaultAgeInfoNode::GetAgeTime () const {
|
||||
//============================================================================
|
||||
#ifdef CLIENT
|
||||
void VaultAgeInfoNode::CopyFrom (const plAgeInfoStruct * info) {
|
||||
wchar str[MAX_PATH];
|
||||
wchar_t str[MAX_PATH];
|
||||
|
||||
// age filename
|
||||
if (info->HasAgeFilename()) {
|
||||
@ -1079,7 +1079,7 @@ VaultMarkerGameNode::VaultMarkerGameNode (NetVaultNode * node)
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void VaultMarkerGameNode::SetGameName (const wchar v[]) {
|
||||
void VaultMarkerGameNode::SetGameName (const wchar_t v[]) {
|
||||
IVaultNodeSetString(kGameName, base, &gameName, v, (unsigned)-1);
|
||||
}
|
||||
|
||||
|
||||
@ -73,15 +73,15 @@ typedef std::vector<plSpawnPointInfo> plSpawnPointVec;
|
||||
//============================================================================
|
||||
// Volatile Vault Node Fields
|
||||
//============================================================================
|
||||
qword GetNodeVolatileFields(NetVaultNode* node);
|
||||
uint64_t GetNodeVolatileFields(NetVaultNode* node);
|
||||
|
||||
//============================================================================
|
||||
// NetVaultNodeAccess
|
||||
//============================================================================
|
||||
struct NetVaultNodeAccess {
|
||||
NetVaultNode * base;
|
||||
qword & fieldFlags;
|
||||
qword & dirtyFlags;
|
||||
uint64_t & fieldFlags;
|
||||
uint64_t & dirtyFlags;
|
||||
|
||||
NetVaultNodeAccess (NetVaultNode * node);
|
||||
NetVaultNodeAccess (const NetVaultNodeAccess &); // not implemented
|
||||
@ -93,18 +93,18 @@ struct NetVaultNodeAccess {
|
||||
// VaultPlayerNode
|
||||
//============================================================================
|
||||
struct VaultPlayerNode : NetVaultNodeAccess {
|
||||
static const qword kPlayerName = NetVaultNode::kIString64_1;
|
||||
static const qword kAvatarShapeName = NetVaultNode::kString64_1;
|
||||
static const qword kDisabled = NetVaultNode::kInt32_1;
|
||||
static const qword kExplorer = NetVaultNode::kInt32_2; // explorer = 1, visitor = 0
|
||||
static const qword kOnlineTime = NetVaultNode::kUInt32_1;
|
||||
static const qword kAccountUuid = NetVaultNode::kUuid_1;
|
||||
static const qword kInviteUuid = NetVaultNode::kUuid_2;
|
||||
static const uint64_t kPlayerName = NetVaultNode::kIString64_1;
|
||||
static const uint64_t kAvatarShapeName = NetVaultNode::kString64_1;
|
||||
static const uint64_t kDisabled = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kExplorer = NetVaultNode::kInt32_2; // explorer = 1, visitor = 0
|
||||
static const uint64_t kOnlineTime = NetVaultNode::kUInt32_1;
|
||||
static const uint64_t kAccountUuid = NetVaultNode::kUuid_1;
|
||||
static const uint64_t kInviteUuid = NetVaultNode::kUuid_2;
|
||||
|
||||
// Treat these as read-only or node flag fields will become invalid
|
||||
// Threaded apps: Must be accessed with node->critsect locked
|
||||
wchar *& playerName;
|
||||
wchar *& avatarShapeName;
|
||||
wchar_t *& playerName;
|
||||
wchar_t *& avatarShapeName;
|
||||
int & disabled;
|
||||
unsigned & onlineTime;
|
||||
Uuid & accountUuid;
|
||||
@ -116,8 +116,8 @@ struct VaultPlayerNode : NetVaultNodeAccess {
|
||||
const VaultPlayerNode & operator= (const VaultPlayerNode &); // not implemented
|
||||
|
||||
// Threaded apps: Must be called with node->critsect locked
|
||||
void SetPlayerName (const wchar v[]);
|
||||
void SetAvatarShapeName (const wchar v[]);
|
||||
void SetPlayerName (const wchar_t v[]);
|
||||
void SetAvatarShapeName (const wchar_t v[]);
|
||||
void SetDisabled (int v);
|
||||
void SetOnlineTime (unsigned v);
|
||||
void SetAccountUuid (const Uuid & v);
|
||||
@ -130,18 +130,18 @@ struct VaultPlayerNode : NetVaultNodeAccess {
|
||||
// VaultPlayerInfoNode
|
||||
//============================================================================
|
||||
struct VaultPlayerInfoNode : NetVaultNodeAccess {
|
||||
static const qword kPlayerId = NetVaultNode::kUInt32_1;
|
||||
static const qword kPlayerName = NetVaultNode::kIString64_1;
|
||||
static const qword kAgeInstName = NetVaultNode::kString64_1; // name of age player is currently in
|
||||
static const qword kAgeInstUuid = NetVaultNode::kUuid_1; // guid of age player is currently in
|
||||
static const qword kOnline = NetVaultNode::kInt32_1; // whether or not player is online
|
||||
static const qword kCCRLevel = NetVaultNode::kInt32_2;
|
||||
static const uint64_t kPlayerId = NetVaultNode::kUInt32_1;
|
||||
static const uint64_t kPlayerName = NetVaultNode::kIString64_1;
|
||||
static const uint64_t kAgeInstName = NetVaultNode::kString64_1; // name of age player is currently in
|
||||
static const uint64_t kAgeInstUuid = NetVaultNode::kUuid_1; // guid of age player is currently in
|
||||
static const uint64_t kOnline = NetVaultNode::kInt32_1; // whether or not player is online
|
||||
static const uint64_t kCCRLevel = NetVaultNode::kInt32_2;
|
||||
|
||||
// Treat these as read-only or node flag fields will become invalid
|
||||
// Threaded apps: Must be accessed with node->critsect locked
|
||||
unsigned & playerId;
|
||||
wchar *& playerName;
|
||||
wchar *& ageInstName;
|
||||
wchar_t *& playerName;
|
||||
wchar_t *& ageInstName;
|
||||
Uuid & ageInstUuid;
|
||||
int & online;
|
||||
int & ccrLevel;
|
||||
@ -152,8 +152,8 @@ struct VaultPlayerInfoNode : NetVaultNodeAccess {
|
||||
|
||||
// Threaded apps: Must be called with node->critsect locked
|
||||
void SetPlayerId (unsigned v);
|
||||
void SetPlayerName (const wchar v[]);
|
||||
void SetAgeInstName (const wchar v[]);
|
||||
void SetPlayerName (const wchar_t v[]);
|
||||
void SetAgeInstName (const wchar_t v[]);
|
||||
void SetAgeInstUuid (const Uuid & v);
|
||||
void SetOnline (int v);
|
||||
void SetCCRLevel (int v);
|
||||
@ -164,20 +164,20 @@ struct VaultPlayerInfoNode : NetVaultNodeAccess {
|
||||
// VaultFolderNode
|
||||
//============================================================================
|
||||
struct VaultFolderNode : NetVaultNodeAccess {
|
||||
static const qword kFolderType = NetVaultNode::kInt32_1;
|
||||
static const qword kFolderName = NetVaultNode::kString64_1;
|
||||
static const uint64_t kFolderType = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kFolderName = NetVaultNode::kString64_1;
|
||||
|
||||
// Treat these as read-only or node flag fields will become invalid
|
||||
// Threaded apps: Must be accessed with node->critsect locked
|
||||
int & folderType;
|
||||
wchar *& folderName;
|
||||
wchar_t *& folderName;
|
||||
|
||||
VaultFolderNode (NetVaultNode * node);
|
||||
VaultFolderNode (const VaultFolderNode &); // not implemented
|
||||
const VaultFolderNode & operator= (const VaultFolderNode &); // not implemented
|
||||
|
||||
// Threaded apps: Must be called with node->critsect locked
|
||||
void SetFolderName (const wchar v[]);
|
||||
void SetFolderName (const wchar_t v[]);
|
||||
void SetFolderType (int v);
|
||||
};
|
||||
|
||||
@ -206,15 +206,15 @@ struct VaultAgeInfoListNode : VaultFolderNode {
|
||||
// VaultChronicleNode
|
||||
//============================================================================
|
||||
struct VaultChronicleNode : NetVaultNodeAccess {
|
||||
static const qword kEntryType = NetVaultNode::kInt32_1;
|
||||
static const qword kEntryName = NetVaultNode::kString64_1;
|
||||
static const qword kEntryValue = NetVaultNode::kText_1;
|
||||
static const uint64_t kEntryType = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kEntryName = NetVaultNode::kString64_1;
|
||||
static const uint64_t kEntryValue = NetVaultNode::kText_1;
|
||||
|
||||
// Treat these as read-only or node flag fields will become invalid
|
||||
// Threaded apps: Must be accessed with node->critsect locked
|
||||
int & entryType;
|
||||
wchar *& entryName;
|
||||
wchar *& entryValue;
|
||||
wchar_t *& entryName;
|
||||
wchar_t *& entryValue;
|
||||
|
||||
VaultChronicleNode (NetVaultNode * node);
|
||||
VaultChronicleNode (const VaultChronicleNode &); // not implemented
|
||||
@ -222,8 +222,8 @@ struct VaultChronicleNode : NetVaultNodeAccess {
|
||||
|
||||
// Threaded apps: Must be called with node->critsect locked
|
||||
void SetEntryType (int v);
|
||||
void SetEntryName (const wchar v[]);
|
||||
void SetEntryValue (const wchar v[]);
|
||||
void SetEntryName (const wchar_t v[]);
|
||||
void SetEntryValue (const wchar_t v[]);
|
||||
};
|
||||
|
||||
|
||||
@ -231,13 +231,13 @@ struct VaultChronicleNode : NetVaultNodeAccess {
|
||||
// VaultSDLNode
|
||||
//============================================================================
|
||||
struct VaultSDLNode : NetVaultNodeAccess {
|
||||
static const qword kSDLName = NetVaultNode::kString64_1;
|
||||
static const qword kSDLIdent = NetVaultNode::kInt32_1;
|
||||
static const qword kSDLData = NetVaultNode::kBlob_1;
|
||||
static const uint64_t kSDLName = NetVaultNode::kString64_1;
|
||||
static const uint64_t kSDLIdent = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kSDLData = NetVaultNode::kBlob_1;
|
||||
|
||||
int & sdlIdent;
|
||||
wchar *& sdlName;
|
||||
byte *& sdlData;
|
||||
wchar_t *& sdlName;
|
||||
uint8_t *& sdlData;
|
||||
unsigned & sdlDataLen;
|
||||
|
||||
VaultSDLNode (NetVaultNode * node);
|
||||
@ -245,12 +245,12 @@ struct VaultSDLNode : NetVaultNodeAccess {
|
||||
const VaultSDLNode & operator= (const VaultSDLNode &); // not implemented
|
||||
|
||||
void SetSdlIdent (int v);
|
||||
void SetSdlName (const wchar v[]);
|
||||
void SetSdlName (const wchar_t v[]);
|
||||
|
||||
#ifdef CLIENT
|
||||
bool GetStateDataRecord (class plStateDataRecord * out, unsigned readOptions = 0);
|
||||
void SetStateDataRecord (const class plStateDataRecord * rec, unsigned writeOptions = 0);
|
||||
void InitStateDataRecord (const wchar sdlRecName[], unsigned writeOptions = 0);
|
||||
void InitStateDataRecord (const wchar_t sdlRecName[], unsigned writeOptions = 0);
|
||||
#endif // def CLIENT
|
||||
};
|
||||
|
||||
@ -258,13 +258,13 @@ struct VaultSDLNode : NetVaultNodeAccess {
|
||||
// VaultAgeLinkNode
|
||||
//============================================================================
|
||||
struct VaultAgeLinkNode : NetVaultNodeAccess {
|
||||
static const qword kUnlocked = NetVaultNode::kInt32_1;
|
||||
static const qword kVolatile = NetVaultNode::kInt32_2;
|
||||
static const qword kSpawnPoints = NetVaultNode::kBlob_1;
|
||||
static const uint64_t kUnlocked = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kVolatile = NetVaultNode::kInt32_2;
|
||||
static const uint64_t kSpawnPoints = NetVaultNode::kBlob_1;
|
||||
|
||||
int & unlocked;
|
||||
int & volat;
|
||||
byte *& spawnPoints;
|
||||
uint8_t *& spawnPoints;
|
||||
unsigned & spawnPointsLen;
|
||||
|
||||
VaultAgeLinkNode (NetVaultNode * node);
|
||||
@ -292,22 +292,22 @@ struct VaultImageNode : NetVaultNodeAccess {
|
||||
|
||||
enum ImageTypes { kNone=0, kJPEG=1 };
|
||||
|
||||
static const qword kImageType = NetVaultNode::kInt32_1;
|
||||
static const qword kImageTitle = NetVaultNode::kString64_1;
|
||||
static const qword kImageData = NetVaultNode::kBlob_1;
|
||||
static const uint64_t kImageType = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kImageTitle = NetVaultNode::kString64_1;
|
||||
static const uint64_t kImageData = NetVaultNode::kBlob_1;
|
||||
|
||||
wchar *& title;
|
||||
wchar_t *& title;
|
||||
int & imgType;
|
||||
byte *& imgData;
|
||||
uint8_t *& imgData;
|
||||
unsigned & imgDataLen;
|
||||
|
||||
VaultImageNode (NetVaultNode * node);
|
||||
VaultImageNode (const VaultImageNode &); // not implemented
|
||||
const VaultImageNode & operator= (const VaultImageNode &); // not implemented
|
||||
|
||||
void SetImageTitle (const wchar v[]);
|
||||
void SetImageTitle (const wchar_t v[]);
|
||||
void SetImageType (int v);
|
||||
void SetImageData (const byte buffer[], unsigned bytes);
|
||||
void SetImageData (const uint8_t buffer[], unsigned bytes);
|
||||
|
||||
#ifdef CLIENT
|
||||
void StuffImage (class plMipmap * src);
|
||||
@ -333,15 +333,15 @@ struct VaultCliImageNode : VaultImageNode {
|
||||
//============================================================================
|
||||
struct VaultTextNoteNode : NetVaultNodeAccess {
|
||||
|
||||
static const qword kNoteType = NetVaultNode::kInt32_1;
|
||||
static const qword kNoteSubType = NetVaultNode::kInt32_2;
|
||||
static const qword kNoteTitle = NetVaultNode::kString64_1;
|
||||
static const qword kNoteText = NetVaultNode::kText_1;
|
||||
static const uint64_t kNoteType = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kNoteSubType = NetVaultNode::kInt32_2;
|
||||
static const uint64_t kNoteTitle = NetVaultNode::kString64_1;
|
||||
static const uint64_t kNoteText = NetVaultNode::kText_1;
|
||||
|
||||
int & noteType;
|
||||
int & noteSubType;
|
||||
wchar *& noteTitle;
|
||||
wchar *& noteText;
|
||||
wchar_t *& noteTitle;
|
||||
wchar_t *& noteText;
|
||||
|
||||
VaultTextNoteNode (NetVaultNode * node);
|
||||
VaultTextNoteNode (const VaultTextNoteNode &); // not implemented
|
||||
@ -349,8 +349,8 @@ struct VaultTextNoteNode : NetVaultNodeAccess {
|
||||
|
||||
void SetNoteType (int v);
|
||||
void SetNoteSubType (int v);
|
||||
void SetNoteTitle (const wchar v[]);
|
||||
void SetNoteText (const wchar v[]);
|
||||
void SetNoteTitle (const wchar_t v[]);
|
||||
void SetNoteText (const wchar_t v[]);
|
||||
|
||||
#ifdef CLIENT
|
||||
// for kNoteType_Visit/UnVisit
|
||||
@ -364,13 +364,13 @@ struct VaultTextNoteNode : NetVaultNodeAccess {
|
||||
//============================================================================
|
||||
struct VaultAgeNode : NetVaultNodeAccess {
|
||||
|
||||
static const qword kAgeInstanceGuid = NetVaultNode::kUuid_1;
|
||||
static const qword kParentAgeInstanceGuid = NetVaultNode::kUuid_2;
|
||||
static const qword kAgeName = NetVaultNode::kString64_1;
|
||||
static const uint64_t kAgeInstanceGuid = NetVaultNode::kUuid_1;
|
||||
static const uint64_t kParentAgeInstanceGuid = NetVaultNode::kUuid_2;
|
||||
static const uint64_t kAgeName = NetVaultNode::kString64_1;
|
||||
|
||||
Uuid & ageInstUuid;
|
||||
Uuid & parentAgeInstUuid;
|
||||
wchar *& ageName;
|
||||
wchar_t *& ageName;
|
||||
|
||||
VaultAgeNode (NetVaultNode * node);
|
||||
VaultAgeNode (const VaultAgeNode &); // not implemented
|
||||
@ -378,7 +378,7 @@ struct VaultAgeNode : NetVaultNodeAccess {
|
||||
|
||||
void SetAgeInstGuid (const Uuid & v);
|
||||
void SetParentAgeInstGuid (const Uuid & v);
|
||||
void SetAgeName (const wchar v[]);
|
||||
void SetAgeName (const wchar_t v[]);
|
||||
};
|
||||
|
||||
//============================================================================
|
||||
@ -386,22 +386,22 @@ struct VaultAgeNode : NetVaultNodeAccess {
|
||||
//============================================================================
|
||||
struct VaultAgeInfoNode : NetVaultNodeAccess {
|
||||
|
||||
static const qword kAgeFilename = NetVaultNode::kString64_2; // "Garden"
|
||||
static const qword kAgeInstanceName = NetVaultNode::kString64_3; // "Eder Kemo"
|
||||
static const qword kAgeUserDefinedName = NetVaultNode::kString64_4; // "Joe's"
|
||||
static const qword kAgeInstanceGuid = NetVaultNode::kUuid_1; // 6278b081-342a-4229-ac1b-a0b8a2658390
|
||||
static const qword kParentAgeInstanceGuid = NetVaultNode::kUuid_2; // 9192be7f-89ef-41bc-83db-79afe451e399
|
||||
static const qword kAgeDescription = NetVaultNode::kText_1; // "Stay out!"
|
||||
static const qword kAgeSequenceNumber = NetVaultNode::kInt32_1;
|
||||
static const qword kIsPublic = NetVaultNode::kInt32_2;
|
||||
static const qword kAgeLanguage = NetVaultNode::kInt32_3; // The language of the client that made this age
|
||||
static const qword kAgeId = NetVaultNode::kUInt32_1;
|
||||
static const qword kAgeCzarId = NetVaultNode::kUInt32_2;
|
||||
static const qword kAgeInfoFlags = NetVaultNode::kUInt32_3;
|
||||
static const uint64_t kAgeFilename = NetVaultNode::kString64_2; // "Garden"
|
||||
static const uint64_t kAgeInstanceName = NetVaultNode::kString64_3; // "Eder Kemo"
|
||||
static const uint64_t kAgeUserDefinedName = NetVaultNode::kString64_4; // "Joe's"
|
||||
static const uint64_t kAgeInstanceGuid = NetVaultNode::kUuid_1; // 6278b081-342a-4229-ac1b-a0b8a2658390
|
||||
static const uint64_t kParentAgeInstanceGuid = NetVaultNode::kUuid_2; // 9192be7f-89ef-41bc-83db-79afe451e399
|
||||
static const uint64_t kAgeDescription = NetVaultNode::kText_1; // "Stay out!"
|
||||
static const uint64_t kAgeSequenceNumber = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kIsPublic = NetVaultNode::kInt32_2;
|
||||
static const uint64_t kAgeLanguage = NetVaultNode::kInt32_3; // The language of the client that made this age
|
||||
static const uint64_t kAgeId = NetVaultNode::kUInt32_1;
|
||||
static const uint64_t kAgeCzarId = NetVaultNode::kUInt32_2;
|
||||
static const uint64_t kAgeInfoFlags = NetVaultNode::kUInt32_3;
|
||||
|
||||
wchar *& ageFilename;
|
||||
wchar *& ageInstName;
|
||||
wchar *& ageUserDefinedName;
|
||||
wchar_t *& ageFilename;
|
||||
wchar_t *& ageInstName;
|
||||
wchar_t *& ageUserDefinedName;
|
||||
Uuid & ageInstUuid;
|
||||
Uuid & parentAgeInstUuid;
|
||||
int & ageSequenceNumber;
|
||||
@ -410,15 +410,15 @@ struct VaultAgeInfoNode : NetVaultNodeAccess {
|
||||
unsigned & ageId;
|
||||
unsigned & ageCzarId;
|
||||
unsigned & ageInfoFlags;
|
||||
wchar *& ageDescription;
|
||||
wchar_t *& ageDescription;
|
||||
|
||||
VaultAgeInfoNode (NetVaultNode * node);
|
||||
VaultAgeInfoNode (const VaultAgeInfoNode &); // not implemented
|
||||
const VaultAgeInfoNode & operator= (const VaultAgeInfoNode &); // not implemented
|
||||
|
||||
void SetAgeFilename (const wchar v[]);
|
||||
void SetAgeInstName (const wchar v[]);
|
||||
void SetAgeUserDefinedName (const wchar v[]);
|
||||
void SetAgeFilename (const wchar_t v[]);
|
||||
void SetAgeInstName (const wchar_t v[]);
|
||||
void SetAgeUserDefinedName (const wchar_t v[]);
|
||||
void SetAgeInstGuid (const Uuid & v);
|
||||
void SetParentAgeInstGuid (const Uuid & v);
|
||||
void SetAgeSequenceNumber (int v);
|
||||
@ -427,7 +427,7 @@ struct VaultAgeInfoNode : NetVaultNodeAccess {
|
||||
void SetAgeId (unsigned v);
|
||||
void SetAgeCzarId (unsigned v);
|
||||
void SetAgeInfoFlags (unsigned v);
|
||||
void SetAgeDescription (const wchar v[]);
|
||||
void SetAgeDescription (const wchar_t v[]);
|
||||
|
||||
#ifdef CLIENT
|
||||
const class plUnifiedTime * GetAgeTime () const;
|
||||
@ -441,7 +441,7 @@ struct VaultAgeInfoNode : NetVaultNodeAccess {
|
||||
//============================================================================
|
||||
struct VaultSystemNode : NetVaultNodeAccess {
|
||||
|
||||
static const qword kCCRStatus = NetVaultNode::kInt32_1;
|
||||
static const uint64_t kCCRStatus = NetVaultNode::kInt32_1;
|
||||
|
||||
int & ccrStatus;
|
||||
|
||||
@ -458,16 +458,16 @@ struct VaultSystemNode : NetVaultNodeAccess {
|
||||
//============================================================================
|
||||
struct VaultMarkerGameNode : NetVaultNodeAccess {
|
||||
|
||||
static const qword kGameName = NetVaultNode::kText_1;
|
||||
static const qword kGameGuid = NetVaultNode::kUuid_1;
|
||||
static const uint64_t kGameName = NetVaultNode::kText_1;
|
||||
static const uint64_t kGameGuid = NetVaultNode::kUuid_1;
|
||||
|
||||
wchar *& gameName;
|
||||
Uuid & gameGuid;
|
||||
wchar_t *& gameName;
|
||||
Uuid & gameGuid;
|
||||
|
||||
VaultMarkerGameNode (NetVaultNode * node);
|
||||
VaultMarkerGameNode (const VaultMarkerGameNode &); // not implemented
|
||||
const VaultMarkerGameNode & operator= (const VaultMarkerGameNode &); // not implemented
|
||||
|
||||
void SetGameName (const wchar v[]);
|
||||
void SetGameName (const wchar_t v[]);
|
||||
void SetGameGuid (const Uuid & v);
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user