summaryrefslogtreecommitdiff
path: root/src/nickserv.c
diff options
context:
space:
mode:
authorNaram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-15 02:57:50 +0000
committerNaram Qashat cyberbotx@cyberbotx.com <Naram Qashat cyberbotx@cyberbotx.com@5417fbe8-f217-4b02-8779-1006273d7864>2008-10-15 02:57:50 +0000
commiteef1d4d691e8b7c4c80763dcd1e0c97b11350be0 (patch)
treec23b2417b1b7402563abf410f4cbdbedf49d1425 /src/nickserv.c
parent29a074878d72f789f9a7eacb6b17e2e97b33fdd0 (diff)
Merge branch 'anopeng-config' of http://git.inspircd.org/git/anope/ into anopeng-config
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1449 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/nickserv.c')
-rw-r--r--src/nickserv.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nickserv.c b/src/nickserv.c
index 8eea4c695..695bd86e8 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -350,10 +350,9 @@ void load_old_ns_dbase(void)
/* We read the channel count, but don't take care of it.
load_cs_dbase will regenerate it correctly. */
SAFE(read_int16(&tmp16, f));
- SAFE(read_int16(&nc->channelmax, f));
- if (ver == 5)
- nc->channelmax = CSMaxReg;
+ /* formerly nc->channelmax, RIP */
+ SAFE(read_int16(&tmp16, f));
SAFE(read_int16(&nc->language, f));
if (ver >= 11 && ver < 13) {
@@ -546,7 +545,6 @@ void load_ns_dbase(void)
SAFE(read_int16(&nc->channelcount, f));
SAFE(read_int16(&tmp16, f));
- nc->channelmax = CSMaxReg;
if (ver < 13) {
/* Used to be dead authentication system */
@@ -693,7 +691,7 @@ void save_ns_dbase(void)
}
SAFE(write_int16(nc->channelcount, f));
- SAFE(write_int16(nc->channelmax, f));
+ SAFE(write_int16(nc->channelcount, f)); // write this twice to avoid having to revbump the NickServ DB from anope 1.7, hack alert XXX
} /* for (nc) */