Add m_scriptInstance member to INextBotComponent. (#35)

This fixes yet another crash from the vscript update.
TF2-DMB · Dec 3, 2022 · bbc3fe2 · bbc3fe2
1 parent deb245a
commit bbc3fe2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/extension/sourcesdk/NextBot/NextBotComponentInterface.cpp b/extension/sourcesdk/NextBot/NextBotComponentInterface.cpp
@@ -22,6 +22,10 @@ bool INextBotComponent::Init(SourceMod::IGameConfig* config, char* error, size_t
 
 INextBotComponent::INextBotComponent(INextBot *bot)
 {
+#if SOURCE_ENGINE == SE_TF2
+	m_scriptInstance = 0;
+#endif
+
 	m_curInterval = TICK_INTERVAL;
 	m_lastUpdateTime = 0;
 	m_bot = bot;

diff --git a/extension/sourcesdk/NextBot/NextBotComponentInterface.h b/extension/sourcesdk/NextBot/NextBotComponentInterface.h
@@ -33,12 +33,20 @@ class INextBotComponent : public INextBotEventResponder
 	INextBotComponent(INextBot *bot);
 	virtual ~INextBotComponent() { };
 
-	virtual void Reset(void) { m_lastUpdateTime = 0; m_curInterval = TICK_INTERVAL; }
+	virtual void Reset(void) 
+	{ 
+		m_lastUpdateTime = 0.0;
+		m_curInterval = TICK_INTERVAL;
+	}
+
 	virtual void Update(void) = 0;
 	virtual void Upkeep(void) { };
 	virtual INextBot *GetBot(void) const  { return m_bot; }
+
+#if SOURCE_ENGINE == SE_TF2
 	class CUnknown;
 	virtual CUnknown *GetScriptDesc(void) const { return nullptr; }
+#endif
 
 	inline bool ComputeUpdateInterval(void);
 	inline float GetUpdateInterval(void);
@@ -52,6 +60,10 @@ class INextBotComponent : public INextBotEventResponder
 	INextBot *m_bot;
 	INextBotComponent *m_nextComponent;
 
+#if SOURCE_ENGINE == SE_TF2
+	std::int32_t m_scriptInstance;
+#endif
+
 public:
 	static VCall<void> vUpdate;
 };

diff --git a/product.version b/product.version
@@ -1 +1 @@
-1.8.1
+1.8.2