summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-11-03 02:05:38 +0000
committerAdam- <Adam-@5417fbe8-f217-4b02-8779-1006273d7864>2009-11-03 02:05:38 +0000
commit65deeaf1e61242da81ca62059bcc3d5a342edcb6 (patch)
tree6d2df5dc1fd176dd3161b43f449df411aba672fb /src
parenta1fe864c7ff5f5db093329ca6acb65b9c2cf93e8 (diff)
Moved some of the news variables out of the news module so other modules etc can access them, if needed
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2604 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src')
-rw-r--r--src/core/os_news.c24
-rw-r--r--src/operserv.c3
2 files changed, 3 insertions, 24 deletions
diff --git a/src/core/os_news.c b/src/core/os_news.c
index 103c416b2..4ca0e057d 100644
--- a/src/core/os_news.c
+++ b/src/core/os_news.c
@@ -32,30 +32,6 @@
#define MSG_DELETED_ALL 11
#define MSG_MAX 11
-enum NewsType
-{
- NEWS_LOGON,
- NEWS_RANDOM,
- NEWS_OPER
-};
-
-struct newsmsgs {
- NewsType type;
- const char *name;
- int msgs[MSG_MAX + 1];
-};
-
-struct NewsItem
-{
- NewsType type;
- uint32 num;
- std::string Text;
- char who[NICKMAX];
- time_t time;
-};
-
-std::vector<NewsItem *> News;
-
struct newsmsgs msgarray[] = {
{NEWS_LOGON, "LOGON",
{NEWS_LOGON_SYNTAX,
diff --git a/src/operserv.c b/src/operserv.c
index 76d680a99..65cf50930 100644
--- a/src/operserv.c
+++ b/src/operserv.c
@@ -31,6 +31,9 @@ static void free_sqline_entry(SList * slist, void *item);
static int is_szline_entry_equal(SList * slist, void *item1, void *item2);
static void free_szline_entry(SList * slist, void *item);
+/* News items */
+std::vector<NewsItem *> News;
+
std::vector<std::bitset<32> > DefCon;
int DefConModesSet = 0;
ChannelInfo DefConModesCI; /* ChannelInfo containg params for locked modes