summaryrefslogtreecommitdiffstats
path: root/src/Group.h
diff options
context:
space:
mode:
authordaniel0916 <theschokolps@gmail.com>2014-04-07 20:12:17 +0200
committerdaniel0916 <theschokolps@gmail.com>2014-04-07 20:12:17 +0200
commit2e9754ac1cf0537c12ab7974cf55c451c0724540 (patch)
tree713c5b8c8f22f77893b30b9c8cefca4a7c491483 /src/Group.h
parentFixed merge conflict (diff)
parentFixed some more minor issues with the redstone simulator. (diff)
downloadcuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar
cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.gz
cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.bz2
cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.lz
cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.xz
cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.tar.zst
cuberite-2e9754ac1cf0537c12ab7974cf55c451c0724540.zip
Diffstat (limited to 'src/Group.h')
-rw-r--r--src/Group.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Group.h b/src/Group.h
index 65ee1a60a..8bee6f7ed 100644
--- a/src/Group.h
+++ b/src/Group.h
@@ -11,19 +11,19 @@ public: // tolua_export
cGroup() {}
~cGroup() {}
- void SetName( std::string a_Name ) { m_Name = a_Name; } // tolua_export
- const std::string & GetName() const { return m_Name; } // tolua_export
- void SetColor( std::string a_Color ) { m_Color = a_Color; } // tolua_export
- void AddCommand( std::string a_Command ); // tolua_export
- void AddPermission( std::string a_Permission ); // tolua_export
- void InheritFrom( cGroup* a_Group ); // tolua_export
-
- bool HasCommand( std::string a_Command ); // tolua_export
-
- typedef std::map< std::string, bool > PermissionMap;
+ void SetName( AString a_Name ) { m_Name = a_Name; } // tolua_export
+ const AString & GetName() const { return m_Name; } // tolua_export
+ void SetColor( AString a_Color ) { m_Color = a_Color; } // tolua_export
+ void AddCommand( AString a_Command ); // tolua_export
+ void AddPermission( AString a_Permission ); // tolua_export
+ void InheritFrom( cGroup* a_Group ); // tolua_export
+
+ typedef std::map< AString, bool > PermissionMap;
const PermissionMap & GetPermissions() const { return m_Permissions; }
- typedef std::map< std::string, bool > CommandMap;
+ void ClearPermission(void);
+
+ typedef std::map< AString, bool > CommandMap;
const CommandMap & GetCommands() const { return m_Commands; }
const AString & GetColor() const { return m_Color; } // tolua_export
@@ -31,8 +31,8 @@ public: // tolua_export
typedef std::list< cGroup* > GroupList;
const GroupList & GetInherits() const { return m_Inherits; }
private:
- std::string m_Name;
- std::string m_Color;
+ AString m_Name;
+ AString m_Color;
PermissionMap m_Permissions;
CommandMap m_Commands;