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

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;
 			}