Fixed compile from the earlier merge

4 files changed, 44 insertions, 5 deletions

diff --git a/modules/core/bs_set.cpp b/modules/core/bs_set.cpp
index 1daf30fa4..29a585113 100644
--- a/modules/core/bs_set.cpp
+++ b/modules/core/bs_set.cpp
@@ -193,7 +193,7 @@ class CommandBSSet : public Command
 					SyntaxError(source, "SET MSG", _("SET \037channel\037 MSG {\037OFF|PRIVMSG|NOTICE|\037}"));
 			}
 			else
-				source.Reply(_(UNKNOWN_OPTION), option.c_str(), Config->UseStrictPrivMsgString.c_str(), BotServ->nick.c_str(), this->name.c_str());
+				source.Reply(_(UNKNOWN_OPTION), option.c_str(), Config->UseStrictPrivMsgString.c_str(), Config->s_BotServ.c_str(), this->name.c_str());
 		}
 
 		return MOD_CONT;
diff --git a/modules/core/db_mysql.cpp b/modules/core/db_mysql.cpp
index 03a4f9cd9..193d467da 100644
--- a/modules/core/db_mysql.cpp
+++ b/modules/core/db_mysql.cpp
@@ -1019,7 +1019,7 @@ class DBMySQL : public Module
 	{
 		SQLQuery query("INSERT INTO `anope_cs_access` (level, display, channel, last_seen, creator) VALUES (@level, @display, @channel, @last_seen, @creator)");
 		query.setValue("level", access->level);
-		query.setValue("display", access->mask);
+		query.setValue("display", access->GetMask());
 		query.setValue("channel", ci->name);
 		query.setValue("last_seen", access->last_seen);
 		query.setValue("creator", access->creator);
@@ -1029,7 +1029,7 @@ class DBMySQL : public Module
 	void OnAccessDel(ChannelInfo *ci, User *u, ChanAccess *access)
 	{
 		SQLQuery query("DELETE FROM `anope_cs_access` WHERE `display` = @display AND `channel` = @channel");
-		query.setValue("display", access->mask);
+		query.setValue("display", access->GetMask());
 		query.setValue("channel", ci->name);
 		this->RunQuery(query);
 	}
@@ -1038,7 +1038,7 @@ class DBMySQL : public Module
 	{
 		SQLQuery query("INSERT INTO `anope_cs_access` (level, display, channel, last_seen, creator) VALUES (@level, @display, @channel, @last_seen, @creator) ON DUPLICATE KEY UPDATE level=VALUES(level), display=VALUES(display), channel=VALUES(channel), last_seen=VALUES(last_seen), creator=VALUES(creator)");
 		query.setValue("level", access->level);
-		query.setValue("display", access->mask);
+		query.setValue("display", access->GetMask());
 		query.setValue("channel", ci->name);
 		query.setValue("last_seen", access->last_seen);
 		query.setValue("creator", access->creator);
diff --git a/modules/core/os_news.h b/modules/core/os_news.h
new file mode 100644
index 000000000..c55f56d42
--- /dev/null
+++ b/modules/core/os_news.h
@@ -0,0 +1,39 @@
+#ifndef OS_NEWS
+#define OS_NEWS
+
+enum NewsType
+{
+	NEWS_LOGON,
+	NEWS_RANDOM,
+	NEWS_OPER
+};
+
+struct NewsMessages
+{
+	NewsType type;
+	Anope::string name;
+	const char *msgs[10];
+};
+
+struct NewsItem
+{
+	NewsType type;
+	Anope::string text;
+	Anope::string who;
+	time_t time;
+};
+
+class NewsService : public Service
+{
+ public:
+	NewsService(Module *m) : Service(m, "news") { }
+	
+	virtual void AddNewsItem(NewsItem *n) = 0;
+	
+	virtual void DelNewsItem(NewsItem *n) = 0;
+	
+	virtual std::vector<NewsItem *> &GetNewsList(NewsType t) = 0;
+};
+
+#endif // OS_NEWS
+
diff --git a/src/socketengines/pipeengine_pipe.cpp b/src/socketengines/pipeengine_pipe.cpp
index 9d5b47154..b111f9356 100644
--- a/src/socketengines/pipeengine_pipe.cpp
+++ b/src/socketengines/pipeengine_pipe.cpp
@@ -44,7 +44,7 @@ Pipe::Pipe() : BufferedSocket()
 	this->WritePipe = fds[1];
 	this->IPv6 = false;
 
-	SocketEngine->AddSocket(this);
+	SocketEngine::AddSocket(this);
 }
 
 bool Pipe::ProcessRead()