thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2025-06-22 01:57:14 +02:00
Code Releases Activity

Replace GetObject with GetObj to avoid collisions on Windows.

Browse Source 
ef you MS
This commit is contained in:
Sandu Liviu Catalin
2020-04-17 17:42:09 +03:00
parent 1242b8a2fc
commit e13d1a91e7
22 changed files with 94 additions and 95 deletions

2
module/Entity/Blip.cpp

@ -15,7 +15,7 @@ const Int32 CBlip::Max = SQMOD_BLIP_POOL;
// ------------------------------------------------------------------------------------------------
SQInteger CBlip::SqGetNull(HSQUIRRELVM vm)
{
sq_pushobject(vm, Core::Get().GetNullBlip().GetObject());
sq_pushobject(vm, Core::Get().GetNullBlip().GetObj());
return 1;
}

2
module/Entity/Checkpoint.cpp

@ -18,7 +18,7 @@ const Int32 CCheckpoint::Max = SQMOD_CHECKPOINT_POOL;
// ------------------------------------------------------------------------------------------------
SQInteger CCheckpoint::SqGetNull(HSQUIRRELVM vm)
{
sq_pushobject(vm, Core::Get().GetNullCheckpoint().GetObject());
sq_pushobject(vm, Core::Get().GetNullCheckpoint().GetObj());
return 1;
}

2
module/Entity/Keybind.cpp

@ -15,7 +15,7 @@ const Int32 CKeybind::Max = SQMOD_KEYBIND_POOL;
// ------------------------------------------------------------------------------------------------
SQInteger CKeybind::SqGetNull(HSQUIRRELVM vm)
{
sq_pushobject(vm, Core::Get().GetNullKeybind().GetObject());
sq_pushobject(vm, Core::Get().GetNullKeybind().GetObj());
return 1;
}

4
module/Entity/Object.cpp

@ -18,7 +18,7 @@ const Int32 CObject::Max = SQMOD_OBJECT_POOL;
// ------------------------------------------------------------------------------------------------
SQInteger CObject::SqGetNull(HSQUIRRELVM vm)
{
sq_pushobject(vm, Core::Get().GetNullObject().GetObject());
sq_pushobject(vm, Core::Get().GetNullObject().GetObj());
return 1;
}
@ -107,7 +107,7 @@ LightObj & CObject::GetEvents() const
// Validate the managed identifier
Validate();
// Return the associated event table
return Core::Get().GetObject(m_ID).mEvents;
return Core::Get().GetObj(m_ID).mEvents;
}
// ------------------------------------------------------------------------------------------------

2
module/Entity/Pickup.cpp

@ -17,7 +17,7 @@ const Int32 CPickup::Max = SQMOD_PICKUP_POOL;
// ------------------------------------------------------------------------------------------------
SQInteger CPickup::SqGetNull(HSQUIRRELVM vm)
{
sq_pushobject(vm, Core::Get().GetNullPickup().GetObject());
sq_pushobject(vm, Core::Get().GetNullPickup().GetObj());
return 1;
}

4
module/Entity/Player.cpp

@ -27,7 +27,7 @@ const Int32 CPlayer::Max = SQMOD_PLAYER_POOL;
// ------------------------------------------------------------------------------------------------
SQInteger CPlayer::SqGetNull(HSQUIRRELVM vm)
{
sq_pushobject(vm, Core::Get().GetNullPlayer().GetObject());
sq_pushobject(vm, Core::Get().GetNullPlayer().GetObj());
return 1;
}
@ -1329,7 +1329,7 @@ LightObj & CPlayer::StandingOnObject() const
if (VALID_ENTITYEX(id, SQMOD_OBJECT_POOL))
{
// Return the requested information
return Core::Get().GetObject(id).mObj;
return Core::Get().GetObj(id).mObj;
}
// Default to a null object
return Core::Get().GetNullObject();

2
module/Entity/Vehicle.cpp

@ -20,7 +20,7 @@ const Int32 CVehicle::Max = SQMOD_VEHICLE_POOL;
// ------------------------------------------------------------------------------------------------
SQInteger CVehicle::SqGetNull(HSQUIRRELVM vm)
{
sq_pushobject(vm, Core::Get().GetNullVehicle().GetObject());
sq_pushobject(vm, Core::Get().GetNullVehicle().GetObj());
return 1;
}