thijn/SqMod
1
0
Fork 0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2024-11-08 00:37:15 +01:00
Code Releases Activity

Implement a new event to notify on player admin status change.

Browse Source
This commit is contained in:
Sandu Liviu Catalin 2016-08-17 15:40:48 +03:00
parent b4abe9dfc7
commit c5ef8018ae
6 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/Core.hpp
View File

@ -422,6 +422,7 @@ protected:
Function mOnHeading;
Function mOnPosition;
Function mOnOption;
Function mOnAdmin;
};
/* --------------------------------------------------------------------------------------------
@ -992,6 +993,7 @@ public:
void EmitPlayerHeading(Int32 player_id, Float32 old_heading, Float32 new_heading);
void EmitPlayerPosition(Int32 player_id);
void EmitPlayerOption(Int32 player_id, Int32 option_id, bool value, Int32 header, Object & payload);
void EmitPlayerAdmin(Int32 player_id, bool old_admin, bool new_admin);
void EmitVehicleColour(Int32 vehicle_id, Int32 changed);
void EmitVehicleHealth(Int32 vehicle_id, Float32 old_health, Float32 new_health);
void EmitVehiclePosition(Int32 vehicle_id);
@ -1129,6 +1131,7 @@ private:
Function mOnPlayerHeading;
Function mOnPlayerPosition;
Function mOnPlayerOption;
Function mOnPlayerAdmin;
Function mOnVehicleColour;
Function mOnVehicleHealth;
Function mOnVehiclePosition;

8
source/CoreEvents.cpp
View File

@ -725,6 +725,14 @@ void Core::EmitPlayerOption(Int32 player_id, Int32 option_id, bool value,
Emit(mOnPlayerOption, _player.mObj, option_id, value, header, payload);
}
// ------------------------------------------------------------------------------------------------
void Core::EmitPlayerAdmin(Int32 player_id, bool old_admin, bool new_admin)
{
PlayerInst & _player = m_Players.at(player_id);
Emit(_player.mOnAdmin, old_admin, new_admin);
Emit(mOnPlayerAdmin, _player.mObj, old_admin, new_admin);
}
// ------------------------------------------------------------------------------------------------
void Core::EmitVehicleColour(Int32 vehicle_id, Int32 changed)
{

4
source/CoreUtils.cpp
View File

@ -227,6 +227,7 @@ void Core::ResetFunc(PlayerInst & inst)
inst.mOnHeading.ReleaseGently();
inst.mOnPosition.ReleaseGently();
inst.mOnOption.ReleaseGently();
inst.mOnAdmin.ReleaseGently();
}
// ------------------------------------------------------------------------------------------------
@ -341,6 +342,7 @@ void Core::ResetFunc()
Core::Get().mOnPlayerHeading.ReleaseGently();
Core::Get().mOnPlayerPosition.ReleaseGently();
Core::Get().mOnPlayerOption.ReleaseGently();
Core::Get().mOnPlayerAdmin.ReleaseGently();
Core::Get().mOnVehicleColour.ReleaseGently();
Core::Get().mOnVehicleHealth.ReleaseGently();
Core::Get().mOnVehiclePosition.ReleaseGently();
@ -447,6 +449,7 @@ Function & Core::GetEvent(Int32 evid)
case EVT_PLAYERHEADING: return mOnPlayerHeading;
case EVT_PLAYERPOSITION: return mOnPlayerPosition;
case EVT_PLAYEROPTION: return mOnPlayerOption;
case EVT_PLAYERADMIN: return mOnPlayerAdmin;
case EVT_VEHICLECOLOUR: return mOnVehicleColour;
case EVT_VEHICLEHEALTH: return mOnVehicleHealth;
case EVT_VEHICLEPOSITION: return mOnVehiclePosition;
@ -603,6 +606,7 @@ Function & Core::GetPlayerEvent(Int32 id, Int32 evid)
case EVT_PLAYERHEADING: return inst.mOnHeading;
case EVT_PLAYERPOSITION: return inst.mOnPosition;
case EVT_PLAYEROPTION: return inst.mOnOption;
case EVT_PLAYERADMIN: return inst.mOnAdmin;
default: return NullFunction();
}
}

19
source/Entity/Player.cpp
View File

@ -194,12 +194,27 @@ bool CPlayer::GetAdmin() const
}
// ------------------------------------------------------------------------------------------------
void CPlayer::SetAdmin(bool toggle) const
void CPlayer::SetAdmin(bool toggle)
{
// Validate the managed identifier
Validate();
// Perform the requested operation
// Grab the current value for this property
const bool current = _Func->IsPlayerAdmin(m_ID);
// Don't even bother if it's the same value
if (current == toggle)
{
return;
}
// Avoid property unwind from a recursive call
_Func->SetPlayerAdmin(m_ID, toggle);
// Avoid infinite recursive event loops
if (!(m_CircularLocks & PCL_EMIT_PLAYER_ADMIN))
{
// Prevent this event from triggering while executed
BitGuardU32 bg(m_CircularLocks, PCL_EMIT_PLAYER_ADMIN);
// Now forward the event call
Core::Get().EmitPlayerAdmin(m_ID, current, toggle);
}
}
// ------------------------------------------------------------------------------------------------

5
source/Entity/Player.hpp
View File

@ -13,7 +13,8 @@ namespace SqMod {
*/
enum PlayerCircularLocks
{
PCL_EMIT_PLAYER_OPTION = (1 << 0)
PCL_EMIT_PLAYER_OPTION = (1 << 0)
PCL_EMIT_PLAYER_ADMIN = (2 << 0),
};
/* ------------------------------------------------------------------------------------------------
@ -248,7 +249,7 @@ public:
/* --------------------------------------------------------------------------------------------
* Set whether the managed player entity has administrator privileges.
*/
void SetAdmin(bool toggle) const;
void SetAdmin(bool toggle);
/* --------------------------------------------------------------------------------------------
* Retrieve the ip address of the managed player entity.

1
source/SqBase.hpp
View File

@ -376,6 +376,7 @@ enum EventType
EVT_PLAYERHEADING,
EVT_PLAYERPOSITION,
EVT_PLAYEROPTION,
EVT_PLAYERADMIN,
EVT_VEHICLECOLOUR,
EVT_VEHICLEHEALTH,
EVT_VEHICLEPOSITION,