diff options
| -rw-r--r-- | src/Entities/Player.cpp | 13 | ||||
| -rw-r--r-- | src/Entities/Player.h | 1 | ||||
| -rw-r--r-- | src/Group.cpp | 21 | ||||
| -rw-r--r-- | src/Group.h | 2 |
4 files changed, 1 insertions, 36 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp index bde623f1b..bea8def9e 100644 --- a/src/Entities/Player.cpp +++ b/src/Entities/Player.cpp @@ -1267,19 +1267,6 @@ void cPlayer::RemoveFromGroup( const AString & a_GroupName ) -bool cPlayer::CanUseCommand( const AString & a_Command ) -{ - for( GroupList::iterator itr = m_Groups.begin(); itr != m_Groups.end(); ++itr ) - { - if( (*itr)->HasCommand( a_Command ) ) return true; - } - return false; -} - - - - - bool cPlayer::HasPermission(const AString & a_Permission) { if (a_Permission.empty()) diff --git a/src/Entities/Player.h b/src/Entities/Player.h index 50f7560d6..5c56c927a 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -211,7 +211,6 @@ public: /// Removes a player from the group, resolves permissions and group inheritance (case sensitive) void RemoveFromGroup( const AString & a_GroupName ); // tolua_export - bool CanUseCommand( const AString & a_Command ); // tolua_export bool HasPermission( const AString & a_Permission ); // tolua_export const GroupList & GetGroups() { return m_Groups; } // >> EXPORTED IN MANUALBINDINGS << StringList GetResolvedPermissions(); // >> EXPORTED IN MANUALBINDINGS << diff --git a/src/Group.cpp b/src/Group.cpp index cc42c55a1..5f1f25782 100644 --- a/src/Group.cpp +++ b/src/Group.cpp @@ -25,26 +25,6 @@ void cGroup::AddPermission( AString a_Permission ) -bool cGroup::HasCommand( AString a_Command ) -{ - if( m_Commands.find("*") != m_Commands.end() ) - { - return true; - } - - CommandMap::iterator itr = m_Commands.find( a_Command ); - if( itr != m_Commands.end() ) - { - if( itr->second ) return true; - } - - for( GroupList::iterator itr = m_Inherits.begin(); itr != m_Inherits.end(); ++itr ) - { - if( (*itr)->HasCommand( a_Command ) ) return true; - } - return false; -} - void cGroup::InheritFrom( cGroup* a_Group ) { m_Inherits.remove( a_Group ); @@ -54,6 +34,7 @@ void cGroup::InheritFrom( cGroup* a_Group ) + void cGroup::ClearPermission() { m_Permissions.clear(); diff --git a/src/Group.h b/src/Group.h index 3299aecbc..8bee6f7ed 100644 --- a/src/Group.h +++ b/src/Group.h @@ -18,8 +18,6 @@ public: // tolua_export void AddPermission( AString a_Permission ); // tolua_export void InheritFrom( cGroup* a_Group ); // tolua_export - bool HasCommand( AString a_Command ); // tolua_export - typedef std::map< AString, bool > PermissionMap; const PermissionMap & GetPermissions() const { return m_Permissions; } |