repo: do some cleanups

Author: RaphaelIT7

source/lua/CLuaInterface.cpp

@@ -261,7 +261,6 @@ void Lua::CloseLuaInterface(GarrysMod::Lua::ILuaInterface* LuaInterface)
 // =================================
 // ILuaBase / CBaseLuaInterface implementation
 // =================================
-
 CLuaInterface::~CLuaInterface()
 {
 	if (state != nullptr)
@@ -1059,10 +1058,10 @@ void CLuaInterface::CallInternal(int args, int rets)
 	if (!ThreadInMainThread())
 		Error("Calling Lua function in a thread other than main!");
 
-	if (rets > 4)
+	if (rets > LUA_MAX_RETURN_OBJECTS)
 		Error("[CLuaInterface::Call] Expecting more returns than possible\n");
 
-	for (int i=0; i<3; ++i)
+	for (int i=0; i<LUA_MAX_RETURN_OBJECTS; ++i)
 		m_ProtectedFunctionReturns[i] = nullptr;
 
 	if (IsType(-(args + 1), GarrysMod::Lua::Type::Function))
@@ -1205,7 +1204,7 @@ GarrysMod::Lua::ILuaObject* CLuaInterface::GetReturn(int iStackPos)
 	LuaDebugPrint(2, "CLuaInterface::GetReturn\n");
 
 	int idx = abs(iStackPos);
-	if (idx >= 0 && idx < 4)
+	if (idx >= 0 && idx < LUA_MAX_RETURN_OBJECTS)
 	{
 		if ( m_ProtectedFunctionReturns[idx] == nullptr )
 		{

source/lua/CLuaInterface.h

@@ -190,7 +190,7 @@ class CLuaInterface : public GarrysMod::Lua::ILuaInterface
 	int m_nLuaErrorReporter = -1; // Always 1 since it's always the first registry reference.
 	CUtlStack<Path> m_CurrentPaths;
 	std::list<GarrysMod::Lua::ILuaThreadedCall*> m_pThreadedCalls;
-	GarrysMod::Lua::ILuaObject* m_ProtectedFunctionReturns[4] = {nullptr};
+	GarrysMod::Lua::ILuaObject* m_ProtectedFunctionReturns[LUA_MAX_RETURN_OBJECTS] = {nullptr};
 	GarrysMod::Lua::ILuaObject* m_TempObjects[LUA_MAX_TEMP_OBJECTS] = {nullptr};
 	unsigned char m_iRealm = (unsigned char)2; // CLIENT = 0, SERVER = 1, MENU = 2
 	GarrysMod::Lua::ILuaGameCallback* m_pGameCallback = nullptr;

source/lua/ILuaInterface.h

@@ -16,6 +16,7 @@ namespace Bootil
 }
 
 #define LUA_MAX_TEMP_OBJECTS 32
+#define LUA_MAX_RETURN_OBJECTS 4
 
 class CLuaInterface;
 struct lua_State;

source/modules/networking.cpp

@@ -10,19 +10,16 @@
 #include "dt.h"
 #include "edict.h"
 #include "eiface.h"
-#define protected public // Need access to CBasePlayer::m_hViewModel
-#define private public // Need access to CBaseViewModel::m_hScreens
-#include "player.h"
-#include "vguiscreen.h"
-#undef protected
-#undef private
 #include "baseclient.h"
 #include <bitset>
 #include <unordered_set>
 #include <datacache/imdlcache.h>
 #include <cmodel_private.h>
 #include "server.h"
 #include "hltvserver.h"
+#define protected public
+#include "player.h"
+#undef protected
 #include "SkyCamera.h"
 #include "sourcesdk/GameEventManager.h"
 
@@ -1172,7 +1169,7 @@ struct EntityTransmitCache // Well.... Still kinda acts as a tick-based cache, t
 
 			// We do -1 since nArea 0 is not actually an valid area
 			AreaCache& pArea = nAreaEntities[nArea-1];
-			if (pArea.nCount >= 512)
+			if (pArea.nCount >= nMaxEntitiesPerArea)
 			{
 				pPVSEntityList[++nPVSEdictCount] = pEntity;
 				return;
@@ -1223,7 +1220,7 @@ struct EntityTransmitCache // Well.... Still kinda acts as a tick-based cache, t
 	{
 		// We do -1 since nArea 0 is not actually an valid area and we shifted all by 1
 		AreaCache& pArea = nAreaEntities[areaNum-1];
-		if (pArea.nCount >= 512)
+		if (pArea.nCount >= nMaxEntitiesPerArea)
 		{
 			pPVSEntityList[++nPVSEdictCount] = pEntity;
 			return;
@@ -1261,11 +1258,12 @@ struct EntityTransmitCache // Well.... Still kinda acts as a tick-based cache, t
 
 		ToDo: Think about if we should move Areas with 1-2 entities into the nPVSEntityList simply because its probably quicker to do a PVS check than area? (verify)
 	*/
+	static constexpr int nMaxEntitiesPerArea = 512; // Max entities per area before we move them to PVS checks
 	struct AreaCache
 	{
 		// Not preincremented - use < in for loops
 		int nCount = 0;
-		CBaseEntity* pEntities[512];
+		CBaseEntity* pEntities[nMaxEntitiesPerArea];
 	};
 
 	AreaCache nAreaEntities[MAX_MAP_AREAS-1]; // -1 since Area 0 is not a valid one so we save some bytes