Allow static build of inspircd without module support

[user/henk/code/inspircd.git] / src / mode.cpp

diff --git a/src/mode.cpp b/src/mode.cpp
index d12469aef53e6a99c2bfc5548dd7ccd51c3cbf56..9c3b75101de3809997941bf85506840406e75cf1 100644 (file)
--- a/src/mode.cpp
+++ b/src/mode.cpp
@@ -34,8 +34,6 @@
 #include "modes/cmode_l.h"
 /* +o (channel op) */
 #include "modes/cmode_o.h"
-/* +h (channel halfop) */
-#include "modes/cmode_h.h"
 /* +v (channel voice) */
 #include "modes/cmode_v.h"
 /* +w (see wallops) */
@@ -803,7 +801,7 @@ std::string ModeParser::GiveModeList(ModeMasks m)
        return type1 + "," + type2 + "," + type3 + "," + type4;
 }
 
-std::string ModeParser::BuildPrefixes()
+std::string ModeParser::BuildPrefixes(bool lettersAndModes)
 {
        std::string mletters;
        std::string mprefixes;
@@ -826,7 +824,7 @@ std::string ModeParser::BuildPrefixes()
                mprefixes = mprefixes + n->second.second;
        }
 
-       return "(" + mprefixes + ")" + mletters;
+       return lettersAndModes ? "(" + mprefixes + ")" + mletters : mletters;
 }
 
 bool ModeParser::AddModeWatcher(ModeWatcher* mw)
@@ -981,10 +979,4 @@ ModeParser::ModeParser()
 
 ModeParser::~ModeParser()
 {
-       ModeHandler* mh = FindMode('h', MODETYPE_CHANNEL);
-       if (mh)
-       {
-               mh->cull();
-               delete mh;
-       }
 }