diff options
| author |  danieldg | 2009-09-26 16:40:58 +0000 |
|---|---|---|
| committer | danieldg | 2009-09-26 16:40:58 +0000 |
| commit | ee913368d7162dbe0dd119091f8b468eb7be0f1a (patch) | |
| tree | 16dadfee22e800beaa1d08668ed232700e2e9d2b /src/mode.cpp | |
| parent | Clean up svn:keywords (diff) | |
Change IS_FAKE and CheckTimeStamp to IS_SERVER and ResolveModeConflict to clarify their use
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@11765 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/mode.cpp')
| -rw-r--r-- | src/mode.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mode.cpp b/src/mode.cpp index 4478dce73..965619eea 100644 --- a/src/mode.cpp +++ b/src/mode.cpp @@ -138,7 +138,7 @@ void ModeHandler::OnParameterMissing(User* user, User* dest, Channel* channel) { } -bool ModeHandler::CheckTimeStamp(std::string& theirs, const std::string& ours, Channel*) +bool ModeHandler::ResolveModeConflict(std::string& theirs, const std::string& ours, Channel*) { return (theirs < ours); } @@ -450,7 +450,7 @@ void ModeParser::Process(const std::vector<std::string>& parameters, User *user, if (merge && targetchannel && targetchannel->IsModeSet(modechar) && !mh->IsListMode()) { std::string ours = targetchannel->GetModeParameter(modechar); - if (!mh->CheckTimeStamp(parameter, ours, targetchannel)) + if (!mh->ResolveModeConflict(parameter, ours, targetchannel)) /* we won the mode merge, don't apply this mode */ continue; } |