ChronosXYZ/mta-mono
1
0
Fork 0
mirror of https://github.com/ChronosX88/mta-mono.git synced 2024-11-22 02:02:23 +00:00
Code Issues Projects Releases Wiki Activity

[C#] Fixed Vehicle::GetColor() crash

Browse Source
This commit is contained in:
Kernell 2015-12-27 21:25:05 +03:00
parent cea46b3241
commit 2007d6d5ab
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mta-mono/src/CMonoFunctions_Vehicle.cpp
View File

@ -83,28 +83,24 @@ MonoObject* CMonoFunctions::Vehicle::GetColor( DWORD pUserData )
{ {
if( RESOURCE ) if( RESOURCE )
{ {
CVehicleColor pColor; CVehicleColor pVehicleColor;
if( CLuaFunctionDefinitions::GetVehicleColor( RESOURCE->GetLua(), (void*)pUserData, pColor ) ) if( CLuaFunctionDefinitions::GetVehicleColor( RESOURCE->GetLua(), (PVOID)pUserData, pVehicleColor ) )
{ {
SColor pColor1 = pColor.GetRGBColor( 0 ); CMonoMTALib* pMTALib = RESOURCE->GetDomain()->GetMTALib();
SColor pColor2 = pColor.GetRGBColor( 1 );
SColor pColor3 = pColor.GetRGBColor( 2 );
SColor pColor4 = pColor.GetRGBColor( 3 );
void* args[] = PVOID args[ 4 ];
for( int i = 0; i < 4; i++ )
{ {
&pColor1, args[ i ] = pMTALib->Color->New( pVehicleColor.GetRGBColor( i ) );
&pColor2, }
&pColor3,
&pColor4
};
return RESOURCE->GetDomain()->GetMTALib()->GetClass( "VehicleColor" )->New( args, 4 ); return pMTALib->GetClass( "VehicleColor" )->New( args, 4 );
} }
} }
return NULL; return nullptr;
} }
unsigned short CMonoFunctions::Vehicle::GetModelFromName( MonoString* msName ) unsigned short CMonoFunctions::Vehicle::GetModelFromName( MonoString* msName )