add nextbot changes to BDSBASE_NPC

Author: Bitl

src/game/server/ai_memory.cpp

@@ -10,7 +10,7 @@
 #include "ai_memory.h"
 #include "ai_basenpc.h"
 
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 #include "NextBotManager.h"
 #endif
@@ -251,7 +251,7 @@ bool CAI_Enemies::ShouldDiscardMemory( AI_EnemyInfo_t *pMemory )
 	if ( pEnemy )
 	{
 		CAI_BaseNPC *pEnemyNPC = pEnemy->MyNPCPointer();
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 		if (pEnemyNPC)
 		{
 			if (pEnemyNPC->GetState() == NPC_STATE_DEAD)

src/game/server/ai_senses.cpp

@@ -14,7 +14,7 @@
 #include "ai_basenpc.h"
 #include "saverestore_utlvector.h"
 
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 #include "NextBotManager.h"
 #endif
@@ -86,7 +86,7 @@ BEGIN_SIMPLE_DATADESC( CAI_Senses )
 	DEFINE_FIELD( m_TimeLastLookHighPriority, 	FIELD_TIME	),
 	DEFINE_FIELD( m_TimeLastLookNPCs, 	FIELD_TIME	),
 	DEFINE_FIELD( m_TimeLastLookMisc, 	FIELD_TIME	),
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 	DEFINE_FIELD(m_TimeLastLookNextBots, FIELD_TIME),
 #endif
@@ -367,7 +367,7 @@ void CAI_Senses::Look( int iDistance )
 		LookForHighPriorityEntities( iDistance );
 		LookForNPCs( iDistance);
 		LookForObjects( iDistance );
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 		LookForNextBots(iDistance);
 #endif
@@ -527,7 +527,7 @@ int CAI_Senses::LookForNPCs( int iDistance )
     return m_SeenNPCs.Count();
 }
 
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 //-----------------------------------------------------------------------------
 
@@ -657,7 +657,7 @@ float CAI_Senses::GetTimeLastUpdate( CBaseEntity *pEntity )
 		return m_TimeLastLookHighPriority;
 	if ( pEntity->IsNPC() )
 		return m_TimeLastLookNPCs;
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 	if (pEntity->IsNextBot())
 		return m_TimeLastLookNextBots;

src/game/server/ai_senses.h

@@ -33,7 +33,7 @@ enum seentype_t
 	SEEN_ALL = -1,	// Default
 	SEEN_HIGH_PRIORITY = 0,
 	SEEN_NPCS,
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 	SEEN_MISC,
 	SEEN_NEXTBOTS
@@ -70,7 +70,7 @@ class CAI_Senses : public CAI_Component
 		m_SeenArrays[0] = &m_SeenHighPriority;
 		m_SeenArrays[1] = &m_SeenNPCs;
 		m_SeenArrays[2] = &m_SeenMisc;
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 		m_SeenArrays[3] = &m_SeenNextBots;
 #endif
@@ -132,7 +132,7 @@ class CAI_Senses : public CAI_Component
 	int 			LookForHighPriorityEntities( int iDistance );
 	int 			LookForNPCs( int iDistance );
 	int 			LookForObjects( int iDistance );
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 	int 			LookForNextBots(int iDistance);
 #endif
@@ -149,7 +149,7 @@ class CAI_Senses : public CAI_Component
 	CUtlVector<EHANDLE> m_SeenHighPriority;
 	CUtlVector<EHANDLE> m_SeenNPCs;
 	CUtlVector<EHANDLE> m_SeenMisc;
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 	CUtlVector<EHANDLE> m_SeenNextBots;
 #endif
@@ -166,7 +166,7 @@ class CAI_Senses : public CAI_Component
 	float			m_TimeLastLookHighPriority;
 	float			m_TimeLastLookNPCs;
 	float			m_TimeLastLookMisc;
-#ifdef BDSBASE
+#ifdef BDSBASE_NPC
 #ifdef NEXT_BOT
 	float			m_TimeLastLookNextBots;
 #endif