Added option to allow locally modified player models

ccw808 · ccw808 · commit 85b176be8bad · 2015-05-31T15:01:47.000+01:00
Conflicts:
	MTA10/version.h
	MTA10_Server/version.h
diff --git a/MTA10/sdk/net/CNet.h b/MTA10/sdk/net/CNet.h
@@ -62,7 +62,6 @@ class CNet
         STATS_OUTGOING_TRAFFIC = 1
     };
 
-    virtual void                        ResetNetwork                ( void ) = 0;
     virtual bool                        StartNetwork                ( const char* szServerHost, unsigned short usServerPort, bool bPacketTag = false ) = 0;
     virtual void                        StopNetwork                 ( void ) = 0;
 
diff --git a/MTA10/version.h b/MTA10/version.h
@@ -75,9 +75,9 @@
 
 #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR)
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
-#define _CLIENT_NET_MODULE_VERSION      0x08C       // (0x000 - 0xfff) Lvl9 wizards only
+#define _CLIENT_NET_MODULE_VERSION      0x08D       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1D8       // (0x000 - 0xfff) Increment when net messages change (pre-release)
-#define MTA_DM_BITSTREAM_VERSION        0x05F       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
+#define MTA_DM_BITSTREAM_VERSION        0x060       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
 
 // To avoid user confusion, make sure the ASE version matches only if communication is possible
 #if defined(MTA_DM_CONNECT_TO_PUBLIC)
diff --git a/MTA10_Server/mods/deathmatch/logic/CMainConfig.cpp b/MTA10_Server/mods/deathmatch/logic/CMainConfig.cpp
@@ -283,6 +283,9 @@ bool CMainConfig::Load ( void )
     }
     while ( pNode );
 
+    // allow_gta3_img_mods
+    SString strImgMods;
+    GetString ( m_pRootNode, "allow_gta3_img_mods", strImgMods );
 
     // hideac
     int iHideAC = 0;
@@ -347,7 +350,7 @@ bool CMainConfig::Load ( void )
             argMap.Set ( *it, "" );
         SString strEnableSDMap = argMap.ToString ();
 
-        g_pNetServer->SetChecks ( strDisableComboACMap, strDisableACMap, strEnableSDMap, m_iEnableClientChecks, iHideAC != 0 );
+        g_pNetServer->SetChecks ( strDisableComboACMap, strDisableACMap, strEnableSDMap, m_iEnableClientChecks, iHideAC != 0, strImgMods );
     }
 
     {
diff --git a/MTA10_Server/mods/deathmatch/logic/net/CNetBuffer.cpp b/MTA10_Server/mods/deathmatch/logic/net/CNetBuffer.cpp
@@ -218,20 +218,6 @@ void CNetServerBuffer::StopNetwork ( void )
 }
 
 
-///////////////////////////////////////////////////////////////////////////
-//
-// CNetServerBuffer::ResetNetwork
-//
-// BLOCKING
-//
-///////////////////////////////////////////////////////////////////////////
-void CNetServerBuffer::ResetNetwork ( void )
-{
-    SResetNetworkArgs* pArgs = new SResetNetworkArgs ();
-    AddCommandAndWait ( pArgs );
-}
-
-
 ///////////////////////////////////////////////////////////////////////////
 //
 // CNetServerBuffer::DoPulse
@@ -638,9 +624,9 @@ void CNetServerBuffer::ClearClientBitStreamVersion ( const NetServerPlayerID &Pl
 // (To make non blocking, strings will have to be stored in SSetChecksArgs)
 //
 ///////////////////////////////////////////////////////////////////////////
-void CNetServerBuffer::SetChecks ( const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC )
+void CNetServerBuffer::SetChecks ( const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC, const char* szImgMods )
 {
-    SSetChecksArgs* pArgs = new SSetChecksArgs ( szDisableComboACMap, szDisableACMap, szEnableSDMap, iEnableClientChecks, bHideAC );
+    SSetChecksArgs* pArgs = new SSetChecksArgs ( szDisableComboACMap, szDisableACMap, szEnableSDMap, iEnableClientChecks, bHideAC, szImgMods );
     AddCommandAndWait ( pArgs );
 }
 
@@ -1140,6 +1126,7 @@ void CNetServerBuffer::ProcessCommand ( CNetJobData* pJobData )
 #define CALLREALNET3(func,t1,n1,t2,n2,t3,n3)                              CALLPRE(func) m_pRealNetServer->func ( a.n1, a.n2, a.n3 ); CALLPOST
 #define CALLREALNET4(func,t1,n1,t2,n2,t3,n3,t4,n4)                        CALLPRE(func) m_pRealNetServer->func ( a.n1, a.n2, a.n3, a.n4 ); CALLPOST
 #define CALLREALNET5(func,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5)                  CALLPRE(func) m_pRealNetServer->func ( a.n1, a.n2, a.n3, a.n4, a.n5 ); CALLPOST
+#define CALLREALNET6(func,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6)            CALLPRE(func) m_pRealNetServer->func ( a.n1, a.n2, a.n3, a.n4, a.n5, a.n6 ); CALLPOST
 
 #define CALLREALNET0R(ret,func)                                           CALLPRE(func) a.result = m_pRealNetServer->func (); CALLPOST
 #define CALLREALNET1R(ret,func,t1,n1)                                     CALLPRE(func) a.result = m_pRealNetServer->func ( a.n1 ); CALLPOST
@@ -1157,7 +1144,6 @@ void CNetServerBuffer::ProcessCommand ( CNetJobData* pJobData )
     {
         CALLREALNET4R( bool,                StartNetwork                    , const char*, szIP, unsigned short, usServerPort, unsigned int, uiAllowedPlayers, const char*, szServerName )
         CALLREALNET0 (                      StopNetwork                     )
-        CALLREALNET0 (                      ResetNetwork                    )
         CALLREALNET0 (                      DoPulse                         )
         CALLREALNET1 (                      RegisterPacketHandler           , PPACKETHANDLER, pfnPacketHandler )
         CALLREALNET2R( bool,                GetNetworkStatistics            , NetStatistics*, pDest, NetServerPlayerID&, PlayerID )
@@ -1173,7 +1159,7 @@ void CNetServerBuffer::ProcessCommand ( CNetJobData* pJobData )
         CALLREALNET1 (                      SetMaximumIncomingConnections   , unsigned short, numberAllowed )
         CALLREALNET2 (                      SetClientBitStreamVersion       , const NetServerPlayerID &,PlayerID, unsigned short, usBitStreamVersion )
         CALLREALNET1 (                      ClearClientBitStreamVersion     , const NetServerPlayerID &,PlayerID )
-        CALLREALNET5 (                      SetChecks                       , const char*, szDisableComboACMap, const char*, szDisableACMap, const char*, szEnableSDMap, int, iEnableClientChecks, bool, bHideAC );
+        CALLREALNET6 (                      SetChecks                       , const char*, szDisableComboACMap, const char*, szDisableACMap, const char*, szEnableSDMap, int, iEnableClientChecks, bool, bHideAC, const char*, szImgMods );
         CALLREALNET0R( unsigned int,        GetPendingPacketCount           )
         CALLREALNET1 (                      GetNetRoute                     , SFixedString < 32 >*, pstrRoute )
         CALLREALNET1R( bool,                InitServerId                    , const char*, szPath )
diff --git a/MTA10_Server/mods/deathmatch/logic/net/CNetBuffer.h b/MTA10_Server/mods/deathmatch/logic/net/CNetBuffer.h
@@ -64,7 +64,6 @@ class CNetServerBuffer : public CNetServer
     // CNetServer interface
     virtual bool                            StartNetwork                    ( const char* szIP, unsigned short usServerPort, unsigned int uiAllowedPlayers, const char* szServerName );
     virtual void                            StopNetwork                     ( void );
-    virtual void                            ResetNetwork                    ( void );
 
     virtual void                            DoPulse                         ( void );
 
@@ -94,7 +93,7 @@ class CNetServerBuffer : public CNetServer
     virtual void                            SetClientBitStreamVersion       ( const NetServerPlayerID &PlayerID, unsigned short usBitStreamVersion );
     virtual void                            ClearClientBitStreamVersion     ( const NetServerPlayerID &PlayerID );
 
-    virtual void                            SetChecks                       ( const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC );
+    virtual void                            SetChecks                       ( const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC, const char* szImgMods );
 
     virtual unsigned int                    GetPendingPacketCount           ( void );
     virtual void                            GetNetRoute                     ( SFixedString < 32 >* pstrRoute );
@@ -112,12 +111,13 @@ class CNetServerBuffer : public CNetServer
     #define DOTYPE(func) const static int TYPE_##func = __COUNTER__;
     #define SETTYPE(func) type=TYPE_##func;
 
-    #define DECLARE_FUNC_ARGS0(func)                                DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( ) {SETTYPE(func)} };
-    #define DECLARE_FUNC_ARGS1(func,t1,n1)                          DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1 ) : n1(n1) {SETTYPE(func)} t1 n1; };
-    #define DECLARE_FUNC_ARGS2(func,t1,n1,t2,n2)                    DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2 ) : n1(n1), n2(n2) {SETTYPE(func)} t1 n1; t2 n2; };
-    #define DECLARE_FUNC_ARGS3(func,t1,n1,t2,n2,t3,n3)              DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2,t3 n3 ) : n1(n1), n2(n2), n3(n3) {SETTYPE(func)} t1 n1; t2 n2; t3 n3; };
-    #define DECLARE_FUNC_ARGS4(func,t1,n1,t2,n2,t3,n3,t4,n4)        DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2,t3 n3,t4 n4 ) : n1(n1), n2(n2), n3(n3), n4(n4) {SETTYPE(func)} t1 n1; t2 n2; t3 n3; t4 n4; };
-    #define DECLARE_FUNC_ARGS5(func,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5)  DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2,t3 n3,t4 n4,t5 n5 ) : n1(n1), n2(n2), n3(n3), n4(n4), n5(n5) {SETTYPE(func)} t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; };
+    #define DECLARE_FUNC_ARGS0(func)                                        DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( ) {SETTYPE(func)} };
+    #define DECLARE_FUNC_ARGS1(func,t1,n1)                                  DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1 ) : n1(n1) {SETTYPE(func)} t1 n1; };
+    #define DECLARE_FUNC_ARGS2(func,t1,n1,t2,n2)                            DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2 ) : n1(n1), n2(n2) {SETTYPE(func)} t1 n1; t2 n2; };
+    #define DECLARE_FUNC_ARGS3(func,t1,n1,t2,n2,t3,n3)                      DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2,t3 n3 ) : n1(n1), n2(n2), n3(n3) {SETTYPE(func)} t1 n1; t2 n2; t3 n3; };
+    #define DECLARE_FUNC_ARGS4(func,t1,n1,t2,n2,t3,n3,t4,n4)                DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2,t3 n3,t4 n4 ) : n1(n1), n2(n2), n3(n3), n4(n4) {SETTYPE(func)} t1 n1; t2 n2; t3 n3; t4 n4; };
+    #define DECLARE_FUNC_ARGS5(func,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5)          DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2,t3 n3,t4 n4,t5 n5 ) : n1(n1), n2(n2), n3(n3), n4(n4), n5(n5) {SETTYPE(func)} t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; };
+    #define DECLARE_FUNC_ARGS6(func,t1,n1,t2,n2,t3,n3,t4,n4,t5,n5,t6,n6)    DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1,t2 n2,t3 n3,t4 n4,t5 n5,t6 n6 ) : n1(n1), n2(n2), n3(n3), n4(n4), n5(n5), n6(n6) {SETTYPE(func)} t1 n1; t2 n2; t3 n3; t4 n4; t5 n5; t6 n6; };
 
     #define DECLARE_FUNC_ARGS0R(ret,func)                                           DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( ) {SETTYPE(func)} ret result; };
     #define DECLARE_FUNC_ARGS1R(ret,func,t1,n1)                                     DOTYPE(func) struct S##func##Args : SArgs { S##func##Args ( t1 n1 ) : n1(n1) {SETTYPE(func)} t1 n1; ret result; };
@@ -130,7 +130,6 @@ class CNetServerBuffer : public CNetServer
 
     DECLARE_FUNC_ARGS4R( bool,                  StartNetwork                    , const char*, szIP, unsigned short, usServerPort, unsigned int, uiAllowedPlayers, const char*, szServerName );
     DECLARE_FUNC_ARGS0 (                        StopNetwork                     );
-    DECLARE_FUNC_ARGS0 (                        ResetNetwork                    );
     DECLARE_FUNC_ARGS0 (                        DoPulse                         );
     DECLARE_FUNC_ARGS1 (                        RegisterPacketHandler           , PPACKETHANDLER, pfnPacketHandler );
     DECLARE_FUNC_ARGS2R( bool,                  GetNetworkStatistics            , NetStatistics*, pDest, const NetServerPlayerIDRef, PlayerID );
@@ -146,7 +145,7 @@ class CNetServerBuffer : public CNetServer
     DECLARE_FUNC_ARGS1 (                        SetMaximumIncomingConnections   , unsigned short, numberAllowed );
     DECLARE_FUNC_ARGS2 (                        SetClientBitStreamVersion       , const NetServerPlayerIDRef, PlayerID, unsigned short, usBitStreamVersion );
     DECLARE_FUNC_ARGS1 (                        ClearClientBitStreamVersion     , const NetServerPlayerIDRef, PlayerID );
-    DECLARE_FUNC_ARGS5 (                        SetChecks                       , const char*, szDisableComboACMap, const char*, szDisableACMap, const char*, szEnableSDMap, int, iEnableClientChecks, bool, bHideAC );
+    DECLARE_FUNC_ARGS6 (                        SetChecks                       , const char*, szDisableComboACMap, const char*, szDisableACMap, const char*, szEnableSDMap, int, iEnableClientChecks, bool, bHideAC, const char*, szImgMods );
     DECLARE_FUNC_ARGS0R( unsigned int,          GetPendingPacketCount           );
     DECLARE_FUNC_ARGS1 (                        GetNetRoute                     , SFixedString < 32 >*, pstrRoute );
     DECLARE_FUNC_ARGS1R( bool,                  InitServerId                    , const char*, szPath );
diff --git a/MTA10_Server/mods/deathmatch/mtaserver.conf b/MTA10_Server/mods/deathmatch/mtaserver.conf
@@ -48,6 +48,11 @@
 	     e.g. 88.11.22.33,101.2.3.4 -->
 	<http_dos_exclude></http_dos_exclude>
 
+	<!-- By default, the server will block the use of locally customized gta3.img player skins. 
+	     This setting can be used to allow such mods. Not recommended for competitive servers.
+	     Values: none or peds ; default value: none -->
+	<allow_gta3_img_mods>none</allow_gta3_img_mods>
+
 	<!-- By default, the server will block the use of customized GTA:SA data files. -->
 	<!-- To allow specific client files, add one or more of the following: -->
 	<!-- <client_file name="data/carmods.dat" verify="0"/> -->
@@ -249,4 +254,5 @@
 	<!-- play is the default freeroam gamemode. Remove the following line to prevent it from starting. -->		 
 	<resource src="play" startup="1" protected="0"/>
 	
+
 </config>
diff --git a/MTA10_Server/sdk/net/CNetServer.h b/MTA10_Server/sdk/net/CNetServer.h
@@ -100,7 +100,6 @@ class CNetServer
     // szIP can be NULL if autochoosing is wanted.
     virtual bool                            StartNetwork                    ( const char* szIP, unsigned short usServerPort, unsigned int uiAllowedPlayers, const char* szServerName ) = 0;
     virtual void                            StopNetwork                     ( void ) = 0;
-    virtual void                            ResetNetwork                    ( void ) = 0;
 
     virtual void                            DoPulse                         ( void ) = 0;
 
@@ -130,7 +129,7 @@ class CNetServer
     virtual void                            SetClientBitStreamVersion       ( const NetServerPlayerID &PlayerID, unsigned short usBitStreamVersion ) = 0;
     virtual void                            ClearClientBitStreamVersion     ( const NetServerPlayerID &PlayerID ) = 0;
 
-    virtual void                            SetChecks                       ( const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC ) = 0;
+    virtual void                            SetChecks                       ( const char* szDisableComboACMap, const char* szDisableACMap, const char* szEnableSDMap, int iEnableClientChecks, bool bHideAC, const char* szImgMods ) = 0;
 
     virtual unsigned int                    GetPendingPacketCount           ( void ) = 0;
     virtual void                            GetNetRoute                     ( SFixedString < 32 >* pstrRoute ) = 0;
diff --git a/MTA10_Server/version.h b/MTA10_Server/version.h
@@ -78,9 +78,9 @@
 
 #define _ASE_VERSION QUOTE_DEFINE(MTASA_VERSION_MAJOR) "." QUOTE_DEFINE(MTASA_VERSION_MINOR)
 #define _NETCODE_VERSION_BRANCH_ID      0x4         // Use 0x1 - 0xF to indicate an incompatible branch is being used (0x0 is reserved, 0x4 is trunk)
-#define _SERVER_NET_MODULE_VERSION      0x08F       // (0x000 - 0xfff) Lvl9 wizards only
+#define _SERVER_NET_MODULE_VERSION      0x090       // (0x000 - 0xfff) Lvl9 wizards only
 #define _NETCODE_VERSION                0x1D8       // (0x000 - 0xfff) Increment when net messages change (pre-release)
-#define MTA_DM_BITSTREAM_VERSION        0x05F       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
+#define MTA_DM_BITSTREAM_VERSION        0x060       // (0x000 - 0xfff) Increment when net messages change (post-release). (Changing will also require additional backward compatibility code).
 
 // To avoid user confusion, make sure the ASE version matches only if communication is possible
 #if defined(MTA_DM_CONNECT_FROM_PUBLIC)

Original file line number	Diff line number	Diff line change
`@@ -283,6 +283,9 @@ bool CMainConfig::Load ( void )`
`283`	`283`	`}`
`284`	`284`	`while ( pNode );`
`285`	`285`
	`286`	`+ // allow_gta3_img_mods`
	`287`	`+ SString strImgMods;`
	`288`	`+ GetString ( m_pRootNode, "allow_gta3_img_mods", strImgMods );`
`286`	`289`
`287`	`290`	`// hideac`
`288`	`291`	`int iHideAC = 0;`
`@@ -347,7 +350,7 @@ bool CMainConfig::Load ( void )`
`347`	`350`	`argMap.Set ( *it, "" );`
`348`	`351`	`SString strEnableSDMap = argMap.ToString ();`
`349`	`352`
`350`		`- g_pNetServer->SetChecks ( strDisableComboACMap, strDisableACMap, strEnableSDMap, m_iEnableClientChecks, iHideAC != 0 );`
	`353`	`+ g_pNetServer->SetChecks ( strDisableComboACMap, strDisableACMap, strEnableSDMap, m_iEnableClientChecks, iHideAC != 0, strImgMods );`
`351`	`354`	`}`
`352`	`355`
`353`	`356`	`{`