Slightly adjusted some prior changes

This commit is contained in:
Blixibon 2021-05-27 12:02:39 -05:00
parent e28813de7f
commit 1de46132d8
2 changed files with 3 additions and 2 deletions

View File

@ -3061,7 +3061,7 @@ int CAI_NetworkBuilder::ComputeConnection( CAI_Node *pSrcNode, CAI_Node *pDestNo
{ {
#ifdef MAPBASE #ifdef MAPBASE
// This is kind of a hack since target node IDs are designed to be used *after* the nodegraph is generated. // This is kind of a hack since target node IDs are designed to be used *after* the nodegraph is generated.
// However, for the purposes of forcing a climb connection outside of regular lineup bounds, it works. // However, for the purposes of forcing a climb connection outside of regular lineup bounds, it seems to be a reasonable solution.
if (pSrcNode->GetHint() && pDestNode->GetHint() && if (pSrcNode->GetHint() && pDestNode->GetHint() &&
(pSrcNode->GetHint()->GetTargetWCNodeID() == pDestNode->GetHint()->GetWCId() || pDestNode->GetHint()->GetTargetWCNodeID() == pSrcNode->GetHint()->GetWCId())) (pSrcNode->GetHint()->GetTargetWCNodeID() == pDestNode->GetHint()->GetWCId() || pDestNode->GetHint()->GetTargetWCNodeID() == pSrcNode->GetHint()->GetWCId()))
{ {

View File

@ -1406,7 +1406,8 @@ SQInteger function_stub(HSQUIRRELVM vm)
PushVariant(vm, retval); PushVariant(vm, retval);
retval.Free(); if (retval.m_type == FIELD_VECTOR)
delete retval.m_pVector;
return pFunc->m_desc.m_ReturnType != FIELD_VOID; return pFunc->m_desc.m_ReturnType != FIELD_VOID;
} }