Merge pull request #42 from danielga/fix-incorrect-lua-stack-handling

Fixed some incorrect Lua stack handling
Possibly fixed CLC_GMod_ClientToServer and SVC_GMod_ServerToClient

Author: danielga

source/main.cpp

@@ -56,8 +56,6 @@ namespace global
 		if( !LUA->IsType( -1, GarrysMod::Lua::Type::NIL ) )
 			return 1;
 
-		LUA->Pop( 2 );
-
 		LUA->GetFEnv( 1 );
 		LUA->Push( 2 );
 		LUA->RawGet( -2 );

source/netmessage.cpp

@@ -181,7 +181,7 @@ namespace NetMessage
 		if( it != netmessages_setup.end( ) )
 			( *it ).second( LUA );
 
-		LUA->SetFEnv( -3 );
+		LUA->SetFEnv( -2 );
 
 		if( netchan != nullptr )
 		{

source/netmessages.cpp

@@ -952,7 +952,9 @@ namespace NetMessages
 
 	void SVC_GMod_ServerToClient::SetupLua( GarrysMod::Lua::ILuaBase *LUA )
 	{
-		ReaderMember<SVC_GMod_ServerToClient, &SVC_GMod_ServerToClient::Data>( LUA, "Data" );
+		NumberMember<SVC_GMod_ServerToClient, int32_t, &SVC_GMod_ServerToClient::Length>( LUA, "Length" );
+		ReaderMember<SVC_GMod_ServerToClient, &SVC_GMod_ServerToClient::DataIn>( LUA, "DataIn" );
+		WriterMember<SVC_GMod_ServerToClient, &SVC_GMod_ServerToClient::DataOut>( LUA, "DataOut" );
 	}
 
 	const char CLC_ClientInfo::Name[] = "clc_ClientInfo";
@@ -1149,6 +1151,8 @@ namespace NetMessages
 
 	void CLC_GMod_ClientToServer::SetupLua( GarrysMod::Lua::ILuaBase *LUA )
 	{
-		ReaderMember<CLC_GMod_ClientToServer, &CLC_GMod_ClientToServer::Data>( LUA, "Data" );
+		NumberMember<CLC_GMod_ClientToServer, int32_t, &CLC_GMod_ClientToServer::Length>( LUA, "Length" );
+		ReaderMember<CLC_GMod_ClientToServer, &CLC_GMod_ClientToServer::DataIn>( LUA, "DataIn" );
+		WriterMember<CLC_GMod_ClientToServer, &CLC_GMod_ClientToServer::DataOut>( LUA, "DataOut" );
 	}
 }

source/netmessages.hpp

@@ -532,7 +532,20 @@ namespace NetMessages
 
 		static void SetupLua( GarrysMod::Lua::ILuaBase *LUA );
 
-		bf_read Data;
+		SVC_GMod_ServerToClient( ) : Length( 0 ), DataOut( Data.Uint8, sizeof( Data ) )
+		{ }
+
+		int32_t Length;
+		bf_read DataIn;
+		bf_write DataOut;
+
+		union {
+			uint8_t Uint8[512] = { 0 };
+			uint16_t Uint16[256];
+			uint32_t Uint32[128];
+			uint64_t Uint64[64];
+			const char *String[128];
+		} Data;
 	};
 
 	class CLC_ClientInfo : public CNetMessage
@@ -681,6 +694,19 @@ namespace NetMessages
 
 		static void SetupLua( GarrysMod::Lua::ILuaBase *LUA );
 
-		bf_read Data;
+		CLC_GMod_ClientToServer( ) : Length( 0 ), DataOut( Data.Uint8, sizeof( Data ) )
+		{ }
+
+		int32_t Length;
+		bf_read DataIn;
+		bf_write DataOut;
+
+		union {
+			uint8_t Uint8[512] = { 0 };
+			uint16_t Uint16[256];
+			uint32_t Uint32[128];
+			uint64_t Uint64[64];
+			const char *String[128];
+		} Data;
 	};
 }