implement #743

Author: Bitl

src/game/server/NextBot/NextBotComponentInterface.cpp

@@ -42,9 +42,14 @@ HSCRIPT INextBotComponent::GetScriptInstance()
 }
 
 //--------------------------------------------------------------------------------------------------------------
+#ifndef BDSBASE
 #ifdef TF_DLL
 DEFINE_SCRIPT_INSTANCE_HELPER( INextBotComponent, &g_NextBotComponentScriptInstanceHelper )
 #endif 
+#else
+DEFINE_SCRIPT_INSTANCE_HELPER(INextBotComponent, &g_NextBotComponentScriptInstanceHelper)
+#endif
+
 BEGIN_ENT_SCRIPTDESC_ROOT( INextBotComponent, "Next bot component" )
 	DEFINE_SCRIPTFUNC( Reset, "Resets the internal update state" )
 	DEFINE_SCRIPTFUNC( ComputeUpdateInterval, "Recomputes the component update interval" )

src/game/server/NextBot/NextBotLocomotionInterface.h

@@ -7,6 +7,22 @@
 #define _NEXT_BOT_LOCOMOTION_INTERFACE_H_
 
 #include "NextBotComponentInterface.h"
+#ifdef BDSBASE
+#ifdef USE_NAV_MESH
+#include "nav_area.h"
+#else
+
+inline HSCRIPT ToHScript(CNavArea* pArea)
+{
+	return NULL;
+}
+
+inline CNavArea* ToNavArea(HSCRIPT hScript)
+{
+	return NULL;
+}
+#endif
+#else
 #ifdef TF_DLL
 #include "tf/nav_mesh/tf_nav_area.h"
 #else
@@ -27,6 +43,7 @@ inline CNavArea *ToNavArea( HSCRIPT hScript )
 	return NULL;
 }
 #endif
+#endif
 
 class Path;
 class INextBot;

src/game/server/basecombatcharacter.cpp

@@ -39,9 +39,11 @@
 #include "saverestoretypes.h"
 #include "nav_mesh.h"
 
+#ifndef BDSBASE
 #ifdef TF_DLL
 #include "nav_mesh/tf_nav_area.h"
 #endif
+#endif
 
 #ifdef NEXT_BOT
 #include "NextBot/NextBotManager.h"
@@ -3622,11 +3624,15 @@ float CBaseCombatCharacter::GetTimeSinceLastInjury( int team /*= TEAM_ANY */ ) c
 //-----------------------------------------------------------------------------
 HSCRIPT CBaseCombatCharacter::ScriptGetLastKnownArea( void ) const 
 { 
+#ifndef BDSBASE
 #ifdef TF_DLL
 	return ToHScript( GetLastKnownArea() ); 
 #else
 	return NULL;
 #endif
+#else
+	return ToHScript(GetLastKnownArea());
+#endif
 }	
 
 BEGIN_ENT_SCRIPTDESC( CBaseCombatCharacter, CBaseFlex, "Base combat characters." )