Исправлены ошибки компиляции на Linux x86_64

This commit is contained in:
Kernell 2015-12-19 23:56:41 +03:00
parent e0bb300872
commit 26d6706088
9 changed files with 468 additions and 466 deletions

View File

@ -910,7 +910,7 @@ MonoString* CMonoFunctions::Game::GetRuleValue( MonoString* msKey )
return RESOURCE->GetDomain()->NewString( CLuaFunctionDefinitions::GetRuleValue( RESOURCE->GetLua(), szKey ) );
}
return false;
return nullptr;
}
bool CMonoFunctions::Game::SetRuleValue( MonoString* msKey, MonoString* msValue )

View File

@ -116,7 +116,7 @@ public:
static MonoString* GetID ( DWORD pUserData );
static MonoObject* GetData ( DWORD pUserData, MonoString* sKey, bool bInherit = true );
static MonoArray* GetAllData ( DWORD pUserData );
static unsigned int GetParent ( DWORD pUserData );
static DWORD GetParent ( DWORD pUserData );
static MonoObject* GetPosition ( DWORD pUserData );
static MonoObject* GetRotation ( DWORD pUserData );
static MonoObject* GetVelocity ( DWORD pUserData );

View File

@ -36,7 +36,7 @@ MonoArray* CMonoFunctions::Account::GetAll( void )
return RESOURCE->GetDomain()->NewArray<DWORD, LUA_TLIGHTUSERDATA>( mono_get_uint32_class(), pLuaTable );
}
return NULL;
return nullptr;
}
DWORD CMonoFunctions::Account::GetPlayer( DWORD pAccount )
@ -61,7 +61,7 @@ bool CMonoFunctions::Account::IsGuest( DWORD pAccount )
}
}
return NULL;
return false;
}
MonoString* CMonoFunctions::Account::GetSerial( DWORD pAccount )
@ -76,7 +76,7 @@ MonoString* CMonoFunctions::Account::GetSerial( DWORD pAccount )
}
}
return NULL;
return nullptr;
}
// Account set funcs
@ -100,7 +100,7 @@ bool CMonoFunctions::Account::Remove( DWORD pAccount )
return CLuaFunctionDefinitions::RemoveAccount( RESOURCE->GetLua(), (void*)pAccount );
}
return NULL;
return false;
}
bool CMonoFunctions::Account::SetPassword( DWORD pAccount, MonoString* msPassword )
@ -112,7 +112,7 @@ bool CMonoFunctions::Account::SetPassword( DWORD pAccount, MonoString* msPasswor
return CLuaFunctionDefinitions::SetAccountPassword( RESOURCE->GetLua(), (void*)pAccount, szPassword );
}
return NULL;
return false;
}
bool CMonoFunctions::Account::CopyData( DWORD pAccount, DWORD pFromAccount )
@ -122,5 +122,5 @@ bool CMonoFunctions::Account::CopyData( DWORD pAccount, DWORD pFromAccount )
return CLuaFunctionDefinitions::CopyAccountData( RESOURCE->GetLua(), (void*)pAccount, (void*)pFromAccount );
}
return NULL;
return false;
}

View File

@ -64,7 +64,7 @@ MonoString* CMonoFunctions::Ban::GetIP( DWORD pBan )
}
}
return NULL;
return nullptr;
}
MonoString* CMonoFunctions::Ban::GetSerial( DWORD pBan )
@ -79,7 +79,7 @@ MonoString* CMonoFunctions::Ban::GetSerial( DWORD pBan )
}
}
return NULL;
return nullptr;
}
MonoString* CMonoFunctions::Ban::GetUsername( DWORD pBan )
@ -94,7 +94,7 @@ MonoString* CMonoFunctions::Ban::GetUsername( DWORD pBan )
}
}
return NULL;
return nullptr;
}
MonoString* CMonoFunctions::Ban::GetNick( DWORD pBan )
@ -109,7 +109,7 @@ MonoString* CMonoFunctions::Ban::GetNick( DWORD pBan )
}
}
return NULL;
return nullptr;
}
MonoString* CMonoFunctions::Ban::GetReason( DWORD pBan )
@ -124,7 +124,7 @@ MonoString* CMonoFunctions::Ban::GetReason( DWORD pBan )
}
}
return NULL;
return nullptr;
}
MonoString* CMonoFunctions::Ban::GetAdmin( DWORD pBan )
@ -139,7 +139,7 @@ MonoString* CMonoFunctions::Ban::GetAdmin( DWORD pBan )
}
}
return NULL;
return nullptr;
}

View File

@ -84,7 +84,7 @@ MonoObject* CMonoFunctions::Blip::GetColor( DWORD pUserData )
}
}
return NULL;
return nullptr;
}
short CMonoFunctions::Blip::GetOrdering( DWORD pUserData )

View File

@ -71,7 +71,7 @@ MonoArray* CMonoFunctions::Element::GetByType( MonoString* msType, DWORD pStartE
return RESOURCE->GetDomain()->NewArray<DWORD, LUA_TLIGHTUSERDATA>( mono_get_uint32_class(), pLuaArguments );
}
return NULL;
return nullptr;
}
bool CMonoFunctions::Element::IsElement( DWORD pUserData )
@ -150,11 +150,11 @@ MonoString* CMonoFunctions::Element::GetID( DWORD pUserData )
return mono_string_new( mono_domain_get(), "" );
}
unsigned int CMonoFunctions::Element::GetParent( DWORD pUserData )
DWORD CMonoFunctions::Element::GetParent( DWORD pUserData )
{
if( RESOURCE )
{
return (unsigned int)CLuaFunctionDefinitions::GetElementParent( RESOURCE->GetLua(), (void*)pUserData );
return (DWORD)CLuaFunctionDefinitions::GetElementParent( RESOURCE->GetLua(), (void*)pUserData );
}
return NULL;
@ -172,7 +172,7 @@ MonoObject* CMonoFunctions::Element::GetPosition( DWORD pUserData )
}
}
return NULL;
return nullptr;
}
MonoObject* CMonoFunctions::Element::GetRotation( DWORD pUserData )
@ -187,7 +187,7 @@ MonoObject* CMonoFunctions::Element::GetRotation( DWORD pUserData )
}
}
return NULL;
return nullptr;
}
MonoObject* CMonoFunctions::Element::GetVelocity( DWORD pUserData )
@ -202,7 +202,7 @@ MonoObject* CMonoFunctions::Element::GetVelocity( DWORD pUserData )
}
}
return NULL;
return nullptr;
}
unsigned char CMonoFunctions::Element::GetInterior( DWORD pUserData )

View File

@ -309,7 +309,7 @@ MonoArray* CMonoFunctions::Vehicle::GetUpgrades( DWORD pUserData )
{
CLuaArguments* pLuaArguments = CLuaFunctionDefinitions::GetVehicleUpgrades( RESOURCE->GetLua(), (void*)pUserData );
return RESOURCE->GetDomain()->NewArray<uint, LUA_TNUMBER>( mono_get_uint32_class(), pLuaArguments );
return RESOURCE->GetDomain()->NewArray<DWORD, LUA_TNUMBER>( mono_get_uint32_class(), pLuaArguments );
}
return NULL;
@ -336,7 +336,7 @@ MonoArray* CMonoFunctions::Vehicle::GetCompatibleUpgrades( DWORD pUserData )
{
CLuaArguments* pLuaArguments = CLuaFunctionDefinitions::GetVehicleCompatibleUpgrades( RESOURCE->GetLua(), (void*)pUserData );
return RESOURCE->GetDomain()->NewArray<uint, LUA_TNUMBER>( mono_get_uint32_class(), pLuaArguments );
return RESOURCE->GetDomain()->NewArray<DWORD, LUA_TNUMBER>( mono_get_uint32_class(), pLuaArguments );
}
return NULL;

View File

@ -43,6 +43,8 @@ typedef unsigned short WORD; // 16
typedef unsigned long DWORD; // 32 32 64
typedef float FLOAT; // 32
typedef void* PVOID;
#ifndef NUMELMS // from DShow.h
#define NUMELMS(aa) (sizeof(aa)/sizeof((aa)[0]))
#endif

File diff suppressed because it is too large Load Diff