Simplified setElementSyncer() arguments. Fixed getElementSyncer()

ccw808 · ccw808 · commit fe5d17e577c4 · 2010-04-23T07:56:39.000+01:00
diff --git a/MTA10_Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp b/MTA10_Server/mods/deathmatch/logic/CStaticFunctionDefinitions.cpp
@@ -779,13 +779,13 @@ CElement* CStaticFunctionDefinitions::GetElementSyncer ( CElement* pElement )
         case CElement::PED:
         {
             CPed* pPed = static_cast < CPed* > ( pElement );
-            return static_cast < CElement* > ( pPed->GetSyncer() );
+            return pPed->IsSyncable () ? static_cast < CElement* > ( pPed->GetSyncer() ) : NULL;
             break;
         }
         case CElement::VEHICLE:
         {
             CVehicle* pVehicle = static_cast < CVehicle* > ( pElement );
-            return static_cast < CElement* > ( pVehicle->GetSyncer() );
+            return pVehicle->IsUnoccupiedSyncable () ? static_cast < CElement* > ( pVehicle->GetSyncer() ) : NULL;
             break;
         }
     }
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
@@ -1674,18 +1674,20 @@ int CLuaElementDefs::setElementModel ( lua_State* luaVM )
 int CLuaElementDefs::setElementSyncer ( lua_State* luaVM )
 {
     int iArgument2 = lua_type ( luaVM, 2 );
-    if ( lua_type ( luaVM, 1 ) == LUA_TLIGHTUSERDATA && ( iArgument2 == LUA_TLIGHTUSERDATA || iArgument2 == LUA_TNIL ) )
+    if ( lua_type ( luaVM, 1 ) == LUA_TLIGHTUSERDATA && ( iArgument2 == LUA_TLIGHTUSERDATA || iArgument2 == LUA_TBOOLEAN ) )
     {
         CElement* pElement = lua_toelement ( luaVM, 1 );
-        CPlayer* pPlayer = lua_toplayer ( luaVM, 2 );
+        CPlayer* pPlayer = NULL;
         bool bEnable = true;
 
-        if ( lua_type ( luaVM, 3 ) == LUA_TBOOLEAN )
-            bEnable = lua_toboolean ( luaVM, 3 ) ? true : false;
+        if ( iArgument2 == LUA_TLIGHTUSERDATA )
+            pPlayer = lua_toplayer ( luaVM, 2 );
+        if ( iArgument2 == LUA_TBOOLEAN )
+            bEnable = lua_toboolean ( luaVM, 2 ) ? true : false;
 
         if ( pElement )
         {
-            if ( pPlayer || iArgument2 == LUA_TNIL )
+            if ( pPlayer || iArgument2 == LUA_TBOOLEAN )
             {
                 lua_pushboolean ( luaVM, CStaticFunctionDefinitions::SetElementSyncer ( pElement, pPlayer, bEnable ) );
                 return 1;

Original file line number	Diff line number	Diff line change
`@@ -779,13 +779,13 @@ CElement* CStaticFunctionDefinitions::GetElementSyncer ( CElement* pElement )`
`779`	`779`	`case CElement::PED:`
`780`	`780`	`{`
`781`	`781`	`CPed* pPed = static_cast < CPed* > ( pElement );`
`782`		`- return static_cast < CElement* > ( pPed->GetSyncer() );`
	`782`	`+ return pPed->IsSyncable () ? static_cast < CElement* > ( pPed->GetSyncer() ) : NULL;`
`783`	`783`	`break;`
`784`	`784`	`}`
`785`	`785`	`case CElement::VEHICLE:`
`786`	`786`	`{`
`787`	`787`	`CVehicle* pVehicle = static_cast < CVehicle* > ( pElement );`
`788`		`- return static_cast < CElement* > ( pVehicle->GetSyncer() );`
	`788`	`+ return pVehicle->IsUnoccupiedSyncable () ? static_cast < CElement* > ( pVehicle->GetSyncer() ) : NULL;`
`789`	`789`	`break;`
`790`	`790`	`}`
`791`	`791`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1674,18 +1674,20 @@ int CLuaElementDefs::setElementModel ( lua_State* luaVM )`
`1674`	`1674`	`int CLuaElementDefs::setElementSyncer ( lua_State* luaVM )`
`1675`	`1675`	`{`
`1676`	`1676`	`int iArgument2 = lua_type ( luaVM, 2 );`
`1677`		`- if ( lua_type ( luaVM, 1 ) == LUA_TLIGHTUSERDATA && ( iArgument2 == LUA_TLIGHTUSERDATA \|\| iArgument2 == LUA_TNIL ) )`
	`1677`	`+ if ( lua_type ( luaVM, 1 ) == LUA_TLIGHTUSERDATA && ( iArgument2 == LUA_TLIGHTUSERDATA \|\| iArgument2 == LUA_TBOOLEAN ) )`
`1678`	`1678`	`{`
`1679`	`1679`	`CElement* pElement = lua_toelement ( luaVM, 1 );`
`1680`		`- CPlayer* pPlayer = lua_toplayer ( luaVM, 2 );`
	`1680`	`+ CPlayer* pPlayer = NULL;`
`1681`	`1681`	`bool bEnable = true;`
`1682`	`1682`
`1683`		`- if ( lua_type ( luaVM, 3 ) == LUA_TBOOLEAN )`
`1684`		`- bEnable = lua_toboolean ( luaVM, 3 ) ? true : false;`
	`1683`	`+ if ( iArgument2 == LUA_TLIGHTUSERDATA )`
	`1684`	`+ pPlayer = lua_toplayer ( luaVM, 2 );`
	`1685`	`+ if ( iArgument2 == LUA_TBOOLEAN )`
	`1686`	`+ bEnable = lua_toboolean ( luaVM, 2 ) ? true : false;`
`1685`	`1687`
`1686`	`1688`	`if ( pElement )`
`1687`	`1689`	`{`
`1688`		`- if ( pPlayer \|\| iArgument2 == LUA_TNIL )`
	`1690`	`+ if ( pPlayer \|\| iArgument2 == LUA_TBOOLEAN )`
`1689`	`1691`	`{`
`1690`	`1692`	`lua_pushboolean ( luaVM, CStaticFunctionDefinitions::SetElementSyncer ( pElement, pPlayer, bEnable ) );`
`1691`	`1693`	`return 1;`