mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
Le sigh. More code cleanup...
This commit is contained in:
@ -866,12 +866,12 @@ UInt8 plNetLinkingMgr::IPreProcessLink(void)
|
|||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
// SPECIAL CASE: Nexus: force original link
|
// SPECIAL CASE: Nexus: force original link
|
||||||
if (stricmp(info->GetAgeFilename(), kNexusAgeFilename) == 0)
|
if (stricmp(info->GetAgeFilename(), kNexusAgeFilename) == 0)
|
||||||
GetAgeLink()->SetLinkingRules( plNetCommon::LinkingRules::kOriginalBook );
|
link->SetLinkingRules(plNetCommon::LinkingRules::kOriginalBook);
|
||||||
|
|
||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
// SPECIAL CASE: ACA: force original link
|
// SPECIAL CASE: ACA: force original link
|
||||||
if (stricmp(info->GetAgeFilename(), kAvCustomizationFilename ) == 0)
|
if (stricmp(info->GetAgeFilename(), kAvCustomizationFilename ) == 0)
|
||||||
GetAgeLink()->SetLinkingRules( plNetCommon::LinkingRules::kOriginalBook );
|
link->SetLinkingRules(plNetCommon::LinkingRules::kOriginalBook);
|
||||||
|
|
||||||
hsLogEntry(nc->DebugMsg("plNetLinkingMgr: Process: Linking with %s rules...",
|
hsLogEntry(nc->DebugMsg("plNetLinkingMgr: Process: Linking with %s rules...",
|
||||||
plNetCommon::LinkingRules::LinkingRuleStr(link->GetLinkingRules())));
|
plNetCommon::LinkingRules::LinkingRuleStr(link->GetLinkingRules())));
|
||||||
@ -936,7 +936,7 @@ UInt8 plNetLinkingMgr::IPreProcessLink(void)
|
|||||||
if (linkAcc.volat) {
|
if (linkAcc.volat) {
|
||||||
if (VaultUnregisterOwnedAgeAndWait(&ageInfo)) {
|
if (VaultUnregisterOwnedAgeAndWait(&ageInfo)) {
|
||||||
// Fill in fields for new age create.
|
// Fill in fields for new age create.
|
||||||
if (!info->HasAgeUserDefinedName() )
|
if (!info->HasAgeUserDefinedName())
|
||||||
{
|
{
|
||||||
// set user-defined name
|
// set user-defined name
|
||||||
std::string title;
|
std::string title;
|
||||||
@ -984,7 +984,7 @@ UInt8 plNetLinkingMgr::IPreProcessLink(void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
link->SetLinkingRules( plNetCommon::LinkingRules::kOwnedBook );
|
link->SetLinkingRules(plNetCommon::LinkingRules::kOwnedBook);
|
||||||
// falls thru to OWNED BOOK case...
|
// falls thru to OWNED BOOK case...
|
||||||
|
|
||||||
//--------------------------------------------------------------------
|
//--------------------------------------------------------------------
|
||||||
|
Reference in New Issue
Block a user