repo: push local changes(everything is broken)

Author: RaphaelIT7

source/lua.cpp

@@ -47,6 +47,7 @@ bool Lua::PushHook(const char* hook)
 void Lua::Init(GarrysMod::Lua::ILuaInterface* LUA)
 {
 	g_Lua = LUA;
+	CreateLuaInterfaceData(g_Lua);
 
 	g_pModuleManager.LuaInit(false);
 }
@@ -68,6 +69,7 @@ void Lua::Shutdown()
 
 void Lua::FinalShutdown()
 {
+	DestroyLuaInterfaceData(g_Lua);
 	g_Lua = NULL;
 }
 
@@ -150,11 +152,13 @@ GarrysMod::Lua::ILuaInterface* Lua::CreateInterface()
 {
 	GarrysMod::Lua::ILuaInterface* LUA = CreateLuaInterface(true);
 	LUA->Init(g_LuaCallback, true);
+	CreateLuaInterfaceData(LUA);
 
 	return LUA;
 }
 
 void Lua::DestoryInterface(GarrysMod::Lua::ILuaInterface* LUA)
 {
 	CloseLuaInterface(LUA);
+	DestroyLuaInterfaceData(LUA);
 }

source/modules/bitbuf.cpp

@@ -29,7 +29,7 @@ Get_LuaClass(bf_write, bf_write_TypeID, "bf_write")
 
 LUA_FUNCTION_STATIC(bf_read__tostring)
 {
-	bf_read* bf = Get_bf_read(1, false);
+	bf_read* bf = Get_bf_read(LUA, 1, false);
 	if (!bf)
 	{
 		LUA->PushString("bf_read [NULL]");
@@ -48,9 +48,13 @@ LUA_FUNCTION_STATIC(bf_read__index)
 		return 1;
 
 	LUA->Pop(1);
-	Util::ReferencePush(g_pPushedbf_read[Get_bf_read(1, true)]->iTableReference);
-	if (!LUA->FindObjectOnTable(-1, 2))
-		LUA->PushNil();
+	LuaUserData* pData = GetLuaInterfaceData(LUA)->FindLuaClass(Get_bf_read(LUA, 1, true));
+	if (pData)
+	{
+		pData->Push();
+		if (!LUA->FindObjectOnTable(-1, 2))
+			LUA->PushNil();
+	}
 
 	LUA->Remove(-2);
 

source/modules/cvars.cpp

@@ -59,7 +59,7 @@ LUA_FUNCTION_STATIC(cvars_Unregister)
 	if (LUA->IsType(1, GarrysMod::Lua::Type::String))
 		pConVar = g_pCVar->FindCommandBase(LUA->GetString(1));
 	else
-		pConVar = Get_ConVar(1, true);
+		pConVar = Get_ConVar(LUA, 1, true);
 
 	if (!pConVar)
 		LUA->ThrowError("Failed to find ConVar/ConCommand!");

source/modules/physenv.cpp

@@ -1748,7 +1748,7 @@ LUA_FUNCTION_STATIC(physcollide_CollideIndex)
 LUA_FUNCTION_STATIC(physcollide_CollideSetMassCenter)
 {
 	CPhysCollide* pCollide = Get_CPhysCollide(1, true);
-	Vector* pMassCenter = Get_Vector(2, true);
+	Vector* pMassCenter = Get_Vector(LUA, 2, true);
 
 	if (!physcollide)
 		LUA->ThrowError("Failed to get IPhysicsCollision!");
@@ -1760,7 +1760,7 @@ LUA_FUNCTION_STATIC(physcollide_CollideSetMassCenter)
 LUA_FUNCTION_STATIC(physcollide_CollideSetOrthographicAreas)
 {
 	CPhysCollide* pCollide = Get_CPhysCollide(1, true);
-	Vector* pArea = Get_Vector(2, true);
+	Vector* pArea = Get_Vector(LUA, 2, true);
 
 	if (!physcollide)
 		LUA->ThrowError("Failed to get IPhysicsCollision!");
@@ -1827,7 +1827,7 @@ LUA_FUNCTION_STATIC(physcollide_UnserializeCollide)
 	if (!physcollide)
 		LUA->ThrowError("Failed to get IPhysicsCollision!");
 
-	Push_CPhysCollide(physcollide->UnserializeCollide((char*)pData, iSize, index));
+	Push_CPhysCollide(LUA, physcollide->UnserializeCollide((char*)pData, iSize, index));
 	return 1;
 }
 
@@ -1893,7 +1893,7 @@ LUA_FUNCTION_STATIC(physcollide_CreateQueryModel)
 	if (!physcollide)
 		LUA->ThrowError("Failed to get IPhysicsCollision!");
 
-	Push_ICollisionQuery(physcollide->CreateQueryModel(pCollide));
+	Push_ICollisionQuery(LUA, physcollide->CreateQueryModel(pCollide));
 	return 1;
 }
 
@@ -1905,7 +1905,7 @@ LUA_FUNCTION_STATIC(physcollide_DestroyQueryModel)
 		LUA->ThrowError("Failed to get IPhysicsCollision!");
 
 	physcollide->DestroyQueryModel(pQuery);
-	Delete_ICollisionQuery(pQuery);
+	Delete_ICollisionQuery(LUA, pQuery);
 	return 0;
 }
 
@@ -1917,7 +1917,7 @@ LUA_FUNCTION_STATIC(physcollide_DestroyCollide)
 		LUA->ThrowError("Failed to get IPhysicsCollision!");
 
 	physcollide->DestroyCollide(pCollide);
-	Delete_CPhysCollide(pCollide);
+	Delete_CPhysCollide(LUA, pCollide);
 	return 0;
 }
 

source/util.cpp

@@ -9,6 +9,9 @@
 #include "player.h"
 #include "detours.h"
 
+// Holds all data related to a ILuaInterface in one place.
+std::unordered_map<GarrysMod::Lua::ILuaInterface*, LuaInterfaceData*> g_pLuaInterfaceData;
+
 // Try not to use it. We want to move away from it.
 // Additionaly, we will add checks in many functions.
 GarrysMod::Lua::ILuaInterface* g_Lua;