summaryrefslogtreecommitdiff
path: root/src/coremods
diff options
context:
space:
mode:
authorAttila Molnar <attilamolnar@hush.com>2014-10-27 15:26:20 +0100
committerAttila Molnar <attilamolnar@hush.com>2014-10-27 15:26:20 +0100
commit3a3ff949670c61a4a8856e1391222e156eb1cd17 (patch)
treefd8023fefa4829ceea428ec424608ef9aace1d9a /src/coremods
parentcba05046ce20eed4c429093296eb481bf95d7e07 (diff)
parentc99a43968f6a04c7d5d3038b4e39d14c22aa6e89 (diff)
Merge insp20
Diffstat (limited to 'src/coremods')
-rw-r--r--src/coremods/core_info/cmd_motd.cpp2
-rw-r--r--src/coremods/core_whois.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/coremods/core_info/cmd_motd.cpp b/src/coremods/core_info/cmd_motd.cpp
index 4481e2d53..2d396858f 100644
--- a/src/coremods/core_info/cmd_motd.cpp
+++ b/src/coremods/core_info/cmd_motd.cpp
@@ -34,7 +34,7 @@ CmdResult CommandMotd::Handle (const std::vector<std::string>& parameters, User
if (parameters.size() > 0 && parameters[0] != ServerInstance->Config->ServerName)
return CMD_SUCCESS;
- ConfigTag* tag = NULL;
+ ConfigTag* tag = ServerInstance->Config->EmptyTag;
LocalUser* localuser = IS_LOCAL(user);
if (localuser)
tag = localuser->GetClass()->config;
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index 8fce7d339..966c4a790 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -224,7 +224,7 @@ CmdResult CommandWhois::HandleLocal(const std::vector<std::string>& parameters,
LocalUser* localuser = IS_LOCAL(dest);
if (localuser && (ServerInstance->Config->HideWhoisServer.empty() || parameters.size() > 1))
{
- idle = abs((long)((localuser->idle_lastmsg)-ServerInstance->Time()));
+ idle = labs((long)((localuser->idle_lastmsg)-ServerInstance->Time()));
signon = dest->signon;
}