Просмотр исходного кода

* Removed some filesys.mod crap

svn: 183
Bryan Drewery 22 лет назад
Родитель
Сommit
18692c357f
3 измененных файлов с 5 добавлено и 11 удалено
  1. 3 9
      src/cmds.c
  2. 1 1
      src/eggdrop.h
  3. 1 1
      src/mod/transfer.mod/transfer.c

+ 3 - 9
src/cmds.c

@@ -1081,7 +1081,7 @@ static void cmd_dccstat(struct userrec *u, int idx, char *par)
 
 static void cmd_boot(struct userrec *u, int idx, char *par)
 {
-  int i, files = 0, ok = 0;
+  int i, ok = 0;
   char *who;
   struct userrec *u2;
 
@@ -1125,11 +1125,7 @@ static void cmd_boot(struct userrec *u, int idx, char *par)
         dprintf(idx, STR("You can't boot a bot master.\n"));
         return;
       }
-      files = (dcc[i].type->flags & DCT_FILES);
-      if (files)
-        dprintf(idx, STR("Booted %s from the file area.\n"), dcc[i].nick);
-      else
-        dprintf(idx, STR("Booted %s from the party line.\n"), dcc[i].nick);
+      dprintf(idx, STR("Booted %s from the party line.\n"), dcc[i].nick);
       putlog(LOG_CMDS, "*", STR("#%s# boot %s %s"), dcc[idx].nick, who, par);
       do_boot(i, dcc[idx].nick, par);
       ok = 1;
@@ -1942,9 +1938,7 @@ int check_dcc_attrs(struct userrec *u, int oatr)
        if (ischanhub() && !(u->flags & USER_CHUBA))
          stat &= ~STAT_CHAT;
       }
-      if ((dcc[i].type->flags & DCT_FILES) && !(stat & STAT_CHAT) &&
-	  ((u->flags & USER_MASTER) || (u->flags & USER_PARTY) ||
-	   ((u->flags & USER_OP) && !1)))
+      if ((u->flags & USER_PARTY))
 	stat |= STAT_CHAT;
       dcc[i].status = stat;
       /* Check if they no longer have access to wherever they are.

+ 1 - 1
src/eggdrop.h

@@ -511,7 +511,7 @@ struct dupwait_info {
 #define DCT_SIMUL     0x00000020	/* can be tcl_simul'd		    */
 #define DCT_CANBOOT   0x00000040	/* can be booted		    */
 #define DCT_GETNOTES  DCT_CHAT		/* can receive notes		    */
-#define DCT_FILES     0x00000080	/* gratuitous hack ;)		    */
+#define DCT_  	      0x00000080	/* unused */
 #define DCT_FORKTYPE  0x00000100	/* a forking type		    */
 #define DCT_BOT       0x00000200	/* a bot connection of some sort... */
 #define DCT_FILETRAN  0x00000400	/* a file transfer of some sort	    */

+ 1 - 1
src/mod/transfer.mod/transfer.c

@@ -810,7 +810,7 @@ static void eof_dcc_send(int idx)
     nfree(ofn);
     nfree(nfn);
     for (j = 0; j < dcc_total; j++)
-      if (!ok && (dcc[j].type->flags & (DCT_GETNOTES | DCT_FILES)) &&
+      if (!ok && (dcc[j].type->flags & (DCT_GETNOTES)) &&
 	  !egg_strcasecmp(dcc[j].nick, hand)) {
 	ok = 1;
 	dprintf(j,TRANSFER_THANKS);