From 6fefaa11d9a45ae1488b4132c62d05d5d06b0e02 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 23 Apr 2011 22:37:34 -0400 Subject: [PATCH] Last minute fixes --- .../PubUtilLib/plNetClient/plNetLinkingMgr.cpp | 12 ++++++++---- .../Plasma/PubUtilLib/plVault/plVaultClientApi.cpp | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp index fe757c05..ae515474 100644 --- a/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp +++ b/Sources/Plasma/PubUtilLib/plNetClient/plNetLinkingMgr.cpp @@ -767,10 +767,12 @@ void plNetLinkingMgr::IPostProcessLink( void ) if (fldr && info) if (!fldr->IsParentOf(info->nodeId, 1)) - VaultAddChildNodeAndWait( + VaultAddChildNode( fldr->nodeId, info->nodeId, - NetCommGetPlayer()->playerInt + NetCommGetPlayer()->playerInt, + nil, + nil ); if (fldr) @@ -792,10 +794,12 @@ void plNetLinkingMgr::IPostProcessLink( void ) if (fldr && info) if (!fldr->IsParentOf(info->nodeId, 1)) - VaultAddChildNodeAndWait( + VaultAddChildNode( fldr->nodeId, info->nodeId, - NetCommGetPlayer()->playerInt + NetCommGetPlayer()->playerInt, + nil, + nil ); if (fldr) diff --git a/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp b/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp index a49a8b6b..78a39d1c 100644 --- a/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp +++ b/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp @@ -4819,7 +4819,7 @@ namespace _VaultCreateChildAge { // Add the children to the right places VaultAddChildNode(node->nodeId, *p->fAgeInfoId, 0, nil, nil); - VaultAddChildNode(*p->fChildAgesFldr, *p->fAgeInfoId, 0, nil, nil); + VaultAddChildNode(*p->fChildAgesFldr, node->nodeId, 0, nil, nil); // Send the VaultNotify that the plNetLinkingMgr wants... plVaultNotifyMsg * msg = NEWZERO(plVaultNotifyMsg);