Bryan Drewery 16 лет назад
Родитель
Сommit
4c76aa916f
5 измененных файлов с 2 добавлено и 6 удалено
  1. 2 0
      doc/UPDATES
  2. 0 2
      src/mod/channels.mod/channels.c
  3. 0 1
      src/mod/channels.mod/channels.h
  4. 0 2
      src/mod/channels.mod/tclchan.c
  5. 0 1
      src/set.c

+ 2 - 0
doc/UPDATES

@@ -1,3 +1,5 @@
+* Remove 'set chanset' as it has been replaced by 'chanset default'
+
 1.2.17 - http://wraith.botpack.net/milestone/1.2.17
 * Binary / shell / startup changes
   * Binary error messages are no longer obscure numbers or fake segfaults. (Compile with OBSCURE_ERRORS to re-enable)

+ 0 - 2
src/mod/channels.mod/channels.c

@@ -59,8 +59,6 @@ static interval_t			global_exempt_time;
 static interval_t 			global_invite_time;
 
 
-/* Global channel settings (drummer/dw) */
-char glob_chanset[512];
 static char *lastdeletedmask = NULL;
 
 /* Global flood settings */

+ 0 - 1
src/mod/channels.mod/channels.h

@@ -58,7 +58,6 @@ void channels_report(int, int);
 void channels_writeuserfile(bd::Stream&, int = 0);
 void rcmd_chans(char *, char *, char *);
 
-extern char		glob_chanset[512];
 
 /* Macro's here because their functions were replaced by something more
  * generic. <cybah>

+ 0 - 2
src/mod/channels.mod/tclchan.c

@@ -932,8 +932,6 @@ int channel_add(char *result, char *newname, char *options, bool isdefault)
 
   simple_snprintf(buf, sizeof(buf), "chanmode { %s } ", glob_chanmode);
   strlcat(buf, def_chanset, sizeof(buf));
-  strlcat(buf, " ", sizeof(buf));
-  strlcat(buf, glob_chanset, sizeof(buf));
   if (options && options[0]) {
     strlcat(buf, " ", sizeof(buf));
     strlcat(buf, options, sizeof(buf));

+ 0 - 1
src/set.c

@@ -74,7 +74,6 @@ static variable_t vars[] = {
  VAR("auth-key",	auth_key,		VAR_STRING|VAR_PERM,				0, 0, NULL),
  VAR("auth-obscure",	&auth_obscure,		VAR_INT|VAR_BOOL,				0, 1, "0"),
  VAR("auth-prefix",	auth_prefix,		VAR_WORD|VAR_NOLHUB|VAR_PERM,			0, 0, "+"),
- VAR("chanset",		glob_chanset,		VAR_STRING|VAR_NOLHUB|VAR_NOLOC|VAR_HIDE,	0, 0, NULL),
  VAR("cloak-script",	&cloak_script,		VAR_INT|VAR_CLOAK|VAR_NOLHUB,			0, 10, "0"),
  VAR("close-threshold",	&close_threshold,	VAR_RATE|VAR_NOLOC,				0, 0, "0:0"),
  VAR("dcc-autoaway",	&dcc_autoaway,		VAR_INT|VAR_NOLOC,				0, (5*60*60), "1800"),