diff --git a/sp/src/game/server/ai_relationship.cpp b/sp/src/game/server/ai_relationship.cpp index a700552a..319d5f7e 100644 --- a/sp/src/game/server/ai_relationship.cpp +++ b/sp/src/game/server/ai_relationship.cpp @@ -615,6 +615,9 @@ void CAI_ClassRelationship::ChangeRelationships( int disposition, int iReverting return; } + if ( !CBaseCombatCharacter::DefaultRelationshipsLoaded() ) + return; + if ( m_iPreviousDisposition == -1 && iReverting == NOT_REVERTING ) { // Set previous disposition. diff --git a/sp/src/game/server/basecombatcharacter.cpp b/sp/src/game/server/basecombatcharacter.cpp index 7d45ec4e..f3c9543c 100644 --- a/sp/src/game/server/basecombatcharacter.cpp +++ b/sp/src/game/server/basecombatcharacter.cpp @@ -3239,6 +3239,16 @@ void CBaseCombatCharacter::SetDefaultRelationship(Class_T nClass, Class_T nClass } #ifdef MAPBASE +//----------------------------------------------------------------------------- +// Purpose: Determine whether or not default relationships are loaded +// Input : +// Output : +//----------------------------------------------------------------------------- +bool CBaseCombatCharacter::DefaultRelationshipsLoaded() +{ + return m_DefaultRelationship != NULL; +} + //----------------------------------------------------------------------------- // Purpose: Fetch the default (ignore ai_relationship changes) relationship // Input : diff --git a/sp/src/game/server/basecombatcharacter.h b/sp/src/game/server/basecombatcharacter.h index c7eb9960..ccd5d599 100644 --- a/sp/src/game/server/basecombatcharacter.h +++ b/sp/src/game/server/basecombatcharacter.h @@ -462,6 +462,7 @@ public: static void AllocateDefaultRelationships( ); static void SetDefaultRelationship( Class_T nClass, Class_T nClassTarget, Disposition_t nDisposition, int nPriority ); #ifdef MAPBASE + static bool DefaultRelationshipsLoaded(); static Disposition_t GetDefaultRelationshipDisposition( Class_T nClassSource, Class_T nClassTarget ); static int GetDefaultRelationshipPriority( Class_T nClassSource, Class_T nClassTarget ); int GetDefaultRelationshipPriority( Class_T nClassTarget );