X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=5ab791eeeca31bf343d59753d97a77e432a89aa8;hb=7b7e82bec5ab5a39d88896fc7433125fd0c684de;hp=c699ebab7551cc83ce17521c833c0edc3912b920;hpb=db0e78c5d2e0998591b274c027fef26e1ac6ce6a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index c699ebab7..5ab791eee 100644
--- a/include/users.h
+++ b/include/users.h
@@ -241,11 +241,11 @@ class CoreExport User : public Extensible
 
 	/** The user's mode list.
 	 * Much love to the STL for giving us an easy to use bitset, saving us RAM.
-	 * if (modes[modeletter-65]) is set, then the mode is
-	 * set, for example, to work out if mode +s is set, we check the field
-	 * User::modes['s'-65] != 0.
+	 * if (modes[modeid]) is set, then the mode is set.
+	 * For example, to work out if mode +i is set, we check the field
+	 * User::modes[invisiblemode->modeid] == true.
 	 */
-	std::bitset<64> modes;
+	std::bitset<ModeParser::MODEID_MAX> modes;
 
  public:
 
@@ -469,7 +469,7 @@ class CoreExport User : public Extensible
 	 * @param newnick The nickname to change to
 	 * @return True if the nickchange was successful.
 	 */
-	bool ForceNickChange(const std::string& newnick) { return ChangeNick(newnick, true); }
+	bool ForceNickChange(const std::string& newnick, time_t newts = 0) { return ChangeNick(newnick, true, newts); }
 
 	/** Oper down.
 	 * This will clear the +o usermode and unset the user's oper type
@@ -620,7 +620,7 @@ class CoreExport User : public Extensible
 	 * @param force True if the change is being forced (should not be blocked by modes like +N)
 	 * @return True if the change succeeded
 	 */
-	bool ChangeNick(const std::string& newnick, bool force = false);
+	bool ChangeNick(const std::string& newnick, bool force = false, time_t newts = 0);
 
 	/** Send a command to all local users from this user
 	 * The command given must be able to send text with the
@@ -865,8 +865,7 @@ inline FakeUser* IS_SERVER(User* u)
 
 inline bool User::IsModeSet(ModeHandler* mh)
 {
-	char m = mh->GetModeChar();
-	return (modes[m-65]);
+	return (modes[mh->GetId()]);
 }
 
 inline bool User::IsModeSet(UserModeReference& moderef)
@@ -878,6 +877,5 @@ inline bool User::IsModeSet(UserModeReference& moderef)
 
 inline void User::SetMode(ModeHandler* mh, bool value)
 {
-	char m = mh->GetModeChar();
-	modes[m-65] = value;
+	modes[mh->GetId()] = value;
 }