OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Remove UInts from the heap in the callback code

Browse Source
This commit is contained in:
Adam Johnson
2011-04-28 23:06:24 -04:00
parent e109e77cff
commit 799a3d13b4
3 changed files with 26 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sources/Plasma/FeatureLib/pfPython/pyVault.cpp
View File

@ -561,6 +561,12 @@ void pyVault::UnRegisterVisitAge( const char * guidstr )
}
//============================================================================
void _InvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node)
{
if (result == kNetSuccess)
VaultSendNode(node, (UInt32)param);
}
void pyVault::InvitePlayerToAge( const pyAgeLinkStruct & link, UInt32 playerID )
{
NetVaultNode * templateNode = NEWZERO(NetVaultNode);
@ -569,18 +575,17 @@ void pyVault::InvitePlayerToAge( const pyAgeLinkStruct & link, UInt32 playerID )
VaultTextNoteNode visitAcc(templateNode);
visitAcc.SetNoteType(plVault::kNoteType_Visit);
visitAcc.SetVisitInfo(*link.GetAgeLink()->GetAgeInfo());
VaultCreateNode(templateNode, (FVaultCreateNodeCallback)_InvitePlayerToAge, nil, TRACKED_NEW UInt32(playerID));
VaultCreateNode(templateNode, (FVaultCreateNodeCallback)_InvitePlayerToAge, nil, (void*)playerID);
templateNode->DecRef();
}
void _InvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node)
//============================================================================
void _UninvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node)
{
if (result == kNetSuccess)
VaultSendNode(node, *((UInt32*)param));
delete param;
VaultSendNode(node, (UInt32)param);
}
//============================================================================
void pyVault::UnInvitePlayerToAge( const char * str, UInt32 playerID )
{
plAgeInfoStruct info;
@ -602,17 +607,10 @@ void pyVault::UnInvitePlayerToAge( const char * str, UInt32 playerID )
VaultTextNoteNode visitAcc(templateNode);
visitAcc.SetNoteType(plVault::kNoteType_UnVisit);
visitAcc.SetVisitInfo(info);
VaultCreateNode(templateNode, (FVaultCreateNodeCallback)_UninvitePlayerToAge, nil, TRACKED_NEW UInt32(playerID));
VaultCreateNode(templateNode, (FVaultCreateNodeCallback)_UninvitePlayerToAge, nil, (void*)playerID);
templateNode->DecRef();
}
void _UninvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node)
{
if (result == kNetSuccess)
VaultSendNode(node, *((UInt32*)param));
delete param;
}
//============================================================================
void pyVault::OfferLinkToPlayer( const pyAgeLinkStruct & link, UInt32 playerID )
{

10
Sources/Plasma/FeatureLib/pfPython/pyVault.h
View File

@ -54,16 +54,6 @@ class pyAgeLinkStruct;
class pySDLStateDataRecord;
// Async Helpers... :)
#ifndef BUILDING_PYPLASMA
enum ENetError;
struct RelVaultNode;
void _InvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node);
void _UninvitePlayerToAge(ENetError result, void* state, void* param, RelVaultNode* node);
#endif // BUILDING_PYPLASMA
class pyVault
{
#ifndef BUILDING_PYPLASMA