Add userrec::HasMode, fix some typos.

TODO: Make more use of userrec::HasUmode('c') rather than user->modes['c'-65] *oogly*
Next - get umode +o working!

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@4178 e03df62e-2008-0410-955e-edbf42e46eb7

diff --git a/include/message.h b/include/message.h
index 2c85de6f69dd70e15c50e4af662854d90714a69f..dd653e33bb5cbc3ce031196015399599588471ff 100644 (file)
--- a/include/message.h
+++ b/include/message.h
@@ -35,7 +35,6 @@ void Blocking(int s);
 void NonBlocking(int s);
 int CleanAndResolve (char *resolvedHost, const char *unresolvedHost, bool forward);
 int c_count(userrec* u);
-bool hasumode(userrec* user, char mode);
 void ChangeName(userrec* user, const char* gecos);
 void ChangeDisplayedHost(userrec* user, const char* host);
 int isident(const char* n);

diff --git a/include/users.h b/include/users.h
index b1f784bb3e5d4b4d9a57d6e3e1efbaf192114b13..2b3f74742e11a42da1e6d6e13d61d005b73bc9d2 100644 (file)
--- a/include/users.h
+++ b/include/users.h
@@ -268,6 +268,8 @@ class userrec : public connection
         * Create a displayable mode string for this users umodes
         */
        const char* FormatModes();
+
+       bool HasMode(unsigned char m);
        
        /** Returns true if a user is invited to a channel.
         */

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index c190aff4ecb43768e63b461c7cf26019d9680dab..77a74c32c111d6b2ceea501d2f2d15fff28b8158 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -1045,7 +1045,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                        for (int n = 0; n < modelen; n++)
                        {
-                               if (!hasumode(t,modes[n]))
+                               if (!t->modes[modes[n]-65])
                                {
                                        send_to_user = false;
                                        break;
@@ -1058,7 +1058,7 @@ void WriteMode(const char* modes, int flags, const char* text, ...)
 
                        for (int n = 0; n < modelen; n++)
                        {
-                               if (hasumode(t,modes[n]))
+                               if (t->modes[modes[n]-65])
                                {
                                        send_to_user = true;
                                        break;

diff --git a/src/message.cpp b/src/message.cpp
index 5106bffba4f2746c33fe589c0b11843610398cc1..03bd5fd4115b357ceefb2148a8768d9eac5e74d0 100644 (file)
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -198,16 +198,6 @@ int c_count(userrec* u)
 
 }
 
-bool hasumode(userrec* user, unsigned char mode)
-{
-       if (user)
-       {
-               return user->modes[mode-65];
-       }
-       else return false;
-}
-
-
 void ChangeName(userrec* user, const char* gecos)
 {
        if (user->fd > -1)

diff --git a/src/users.cpp b/src/users.cpp
index 48ce0054bbfbabf51b4967f848cb75f6a4c8cd63..40594c8a9b787c0d617735d4a0c8b1b36fb3ccc2 100644 (file)
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -110,6 +110,11 @@ bool DoneClassesAndTypes(const char* tag)
        return true;
 }
 
+bool userrec::HasMode(unsigned char m)
+{
+       return (modes[m-65]);
+}
+
 const char* userrec::FormatModes()
 {
        static char data[MAXBUF];