ConVarBase -> IConVarBase and GameFramable -> IGameFramable

pongo1231 · Dec 18, 2018 · 4538971 · 4538971
1 parent a5514e5
commit 4538971
Show file tree

Hide file tree

Showing 16 changed files with 72 additions and 72 deletions.
diff --git a/Pongbot/BotManager.h b/Pongbot/BotManager.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "ConVarBase.h"
-#include "GameFramable.h"
+#include "IConVarBase.h"
+#include "IGameFramable.h"
 #include <vector>
 
 class Bot;
 
-class BotManager : public ConVarBase, public GameFramable
+class BotManager : public IConVarBase, public IGameFramable
 {
 private:
 	BotManager();

diff --git a/Pongbot/BotVisibles.h b/Pongbot/BotVisibles.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "GameFramable.h"
+#include "IGameFramable.h"
 #include "BotVisibleTarget.h"
 #include <hlsdk/public/edict.h>
 #include <vector>

diff --git a/Pongbot/BotVisiblesProvider.h b/Pongbot/BotVisiblesProvider.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "GameFramable.h"
+#include "IGameFramable.h"
 #include <hlsdk/public/edict.h>
 #include <vector>
 
-class BotVisiblesProvider : public GameFramable
+class BotVisiblesProvider : public IGameFramable
 {
 private:
 	BotVisiblesProvider();

diff --git a/Pongbot/EntityProvider.h b/Pongbot/EntityProvider.h
@@ -1,9 +1,9 @@
 #pragma once
-#include "GameFramable.h"
+#include "IGameFramable.h"
 #include <hlsdk/public/edict.h>
 #include <vector>
 
-class EntityProvider : public GameFramable {
+class EntityProvider : public IGameFramable {
 private:
 	EntityProvider();
 

diff --git a/Pongbot/GameFramable.cpp b/Pongbot/GameFramable.cpp
diff --git a/Pongbot/GameFramable.h b/Pongbot/GameFramable.h
diff --git a/Pongbot/ConVarBase.cpp → Pongbot/IConVarBase.cpp b/Pongbot/ConVarBase.cpp → Pongbot/IConVarBase.cpp
@@ -1,16 +1,16 @@
-#include "ConVarBase.h"
+#include "IConVarBase.h"
 #include <metamod/ISmmPlugin.h>
 
 extern ISmmAPI *g_SMAPI;
 extern ISmmPlugin *g_PLAPI;
 
-ConVarBase::ConVarBase()
+IConVarBase::IConVarBase()
 {
 	g_pCVar = (ICvar*)((g_SMAPI->GetEngineFactory())(CVAR_INTERFACE_VERSION, nullptr));
 	ConVar_Register(0, this);
 }
 
-bool ConVarBase::RegisterConCommandBase(ConCommandBase *cVar)
+bool IConVarBase::RegisterConCommandBase(ConCommandBase *cVar)
 {
 	return META_REGCVAR(cVar);
 }
diff --git a/Pongbot/ConVarBase.h → Pongbot/IConVarBase.h b/Pongbot/ConVarBase.h → Pongbot/IConVarBase.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <hlsdk/public/tier1/convar.h>
 
-class ConVarBase : public IConCommandBaseAccessor
+class IConVarBase : public IConCommandBaseAccessor
 {
 public:
-	ConVarBase();
+	IConVarBase();
 
 private:
 	bool RegisterConCommandBase(ConCommandBase *pVar);

diff --git a/Pongbot/IGameFramable.cpp b/Pongbot/IGameFramable.cpp
@@ -0,0 +1,14 @@
+#include "IGameFramable.h"
+#include "Main.h"
+
+extern Main _Main;
+
+IGameFramable::IGameFramable()
+{
+	_Main.RegisterIGameFramable(this);
+}
+
+IGameFramable::~IGameFramable()
+{
+	_Main.UnregisterIGameFramable(this);
+}
diff --git a/Pongbot/IGameFramable.h b/Pongbot/IGameFramable.h
@@ -0,0 +1,10 @@
+#pragma once
+
+class IGameFramable
+{
+public:
+	IGameFramable();
+	~IGameFramable();
+
+	virtual void OnGameFrame() = 0;
+};
diff --git a/Pongbot/Main.cpp b/Pongbot/Main.cpp
@@ -2,7 +2,7 @@
 #include "Info.h"
 #include "BotManager.h"
 #include "WaypointManager.h"
-#include "GameFramable.h"
+#include "IGameFramable.h"
 #include "TraceHeaders.h"
 #include "EntityProvider.h"
 #include <hlsdk/game/shared/IEffects.h>
@@ -20,7 +20,7 @@ IServerGameClients *IIServerGameClients;
 IEffects *IIEffects;
 IEngineTrace *IIEngineTrace;
 
-std::vector<GameFramable*> _GameFramables;
+std::vector<IGameFramable*> _IGameFramables;
 
 PLUGIN_EXPOSE(Main, _Main);
 SH_DECL_HOOK1_void(IServerGameDLL, GameFrame, SH_NOATTRIB, 0, bool);
@@ -95,24 +95,24 @@ const char *Main::GetLogTag()
 	return Info::Name;
 }
 
-void Main::RegisterGameFramable(GameFramable *framable)
+void Main::RegisterIGameFramable(IGameFramable *framable)
 {
 	// Check if not already registered
-	for (GameFramable *registeredFramable : _GameFramables)
+	for (IGameFramable *registeredFramable : _IGameFramables)
 		if (registeredFramable == framable)
 			return;
-	_GameFramables.push_back(framable);
+	_IGameFramables.push_back(framable);
 }
 
-void Main::UnregisterGameFramable(GameFramable *framable)
+void Main::UnregisterIGameFramable(IGameFramable *framable)
 {
-	for (uint8_t i = 0; i < _GameFramables.size(); i++)
-		if (_GameFramables[i] == framable)
-			_GameFramables.erase(_GameFramables.begin() + i);
+	for (uint8_t i = 0; i < _IGameFramables.size(); i++)
+		if (_IGameFramables[i] == framable)
+			_IGameFramables.erase(_IGameFramables.begin() + i);
 }
 
 void Main::_OnGameFrame(bool simulation)
 {
-	for (GameFramable *framable : _GameFramables)
+	for (IGameFramable *framable : _IGameFramables)
 		framable->OnGameFrame();
 }
diff --git a/Pongbot/Main.h b/Pongbot/Main.h
@@ -2,7 +2,7 @@
 #include <metamod/ISmmPlugin.h>
 #include <vector>
 
-class GameFramable;
+class IGameFramable;
 class IVEngineServer;
 class IBotManager;
 class IServerGameDLL;
@@ -26,11 +26,11 @@ class Main : public ISmmPlugin
 	const char *GetVersion();
 	const char *GetDate();
 	const char *GetLogTag();
-	void RegisterGameFramable(GameFramable *framable);
-	void UnregisterGameFramable(GameFramable *framable);
+	void RegisterIGameFramable(IGameFramable *framable);
+	void UnregisterIGameFramable(IGameFramable *framable);
 
 private:
-	std::vector<GameFramable*> _GameFramables;
+	std::vector<IGameFramable*> _IGameFramables;
 
 	void _OnGameFrame(bool simulation);
 };

diff --git a/Pongbot/Pongbot.vcxproj b/Pongbot/Pongbot.vcxproj
@@ -162,10 +162,10 @@
     <ClCompile Include="BotTaskMasterSpy.cpp" />
     <ClCompile Include="BotVisibles.cpp" />
     <ClCompile Include="BotVisiblesProvider.cpp" />
-    <ClCompile Include="ConVarBase.cpp" />
+    <ClCompile Include="IConVarBase.cpp" />
     <ClCompile Include="EntityProvider.cpp" />
     <ClCompile Include="EntityData.cpp" />
-    <ClCompile Include="GameFramable.cpp" />
+    <ClCompile Include="IGameFramable.cpp" />
     <ClCompile Include="BotTaskCommon.cpp" />
     <ClCompile Include="TF2Util.cpp" />
     <ClCompile Include="TraceFilters.cpp" />
@@ -187,10 +187,10 @@
     <ClInclude Include="BotVisibles.h" />
     <ClInclude Include="BotVisiblesProvider.h" />
     <ClInclude Include="BotVisibleTarget.h" />
-    <ClInclude Include="ConVarBase.h" />
+    <ClInclude Include="IConVarBase.h" />
     <ClInclude Include="EntityProvider.h" />
     <ClInclude Include="EntityData.h" />
-    <ClInclude Include="GameFramable.h" />
+    <ClInclude Include="IGameFramable.h" />
     <ClInclude Include="BotTask.h" />
     <ClInclude Include="BotTaskCommon.h" />
     <ClInclude Include="TF2Util.h" />

diff --git a/Pongbot/Pongbot.vcxproj.filters b/Pongbot/Pongbot.vcxproj.filters
@@ -73,12 +73,6 @@
     <ClCompile Include="WaypointManager.cpp">
       <Filter>src\Waypoint</Filter>
     </ClCompile>
-    <ClCompile Include="ConVarBase.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="GameFramable.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="WaypointFileManager.cpp">
       <Filter>src\Waypoint</Filter>
     </ClCompile>
@@ -136,17 +130,17 @@
     <ClCompile Include="EntityProvider.cpp">
       <Filter>src\TF2Util</Filter>
     </ClCompile>
+    <ClCompile Include="IConVarBase.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="IGameFramable.cpp">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Util.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="ConVarBase.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="GameFramable.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="Info.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -240,5 +234,11 @@
     <ClInclude Include="EntityProvider.h">
       <Filter>src\TF2Util</Filter>
     </ClInclude>
+    <ClInclude Include="IConVarBase.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="IGameFramable.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
diff --git a/Pongbot/WaypointFileManager.h b/Pongbot/WaypointFileManager.h
@@ -1,11 +1,11 @@
 #pragma once
-#include "ConVarBase.h"
+#include "IConVarBase.h"
 #include <iostream>
 #include <vector>
 
 class WaypointNode;
 
-class WaypointFileManager : public ConVarBase
+class WaypointFileManager : public IConVarBase
 {
 private:
 	WaypointFileManager();

diff --git a/Pongbot/WaypointManager.h b/Pongbot/WaypointManager.h
@@ -1,6 +1,6 @@
 #pragma once
-#include "ConVarBase.h"
-#include "GameFramable.h"
+#include "IConVarBase.h"
+#include "IGameFramable.h"
 #include <hlsdk/public/mathlib/mathlib.h>
 #include <hlsdk/public/edict.h>
 #include <hlsdk/public/game/server/iplayerinfo.h>
@@ -9,7 +9,7 @@
 
 class WaypointNode;
 
-class WaypointManager : public ConVarBase, public GameFramable
+class WaypointManager : public IConVarBase, public IGameFramable
 {
 private:
 	WaypointManager();