[Havok-checkins] havokmud act.wizard.c,1.121.2.25,1.121.2.26 comm.c,1.56.2.11,1.56.2.12 externs.h,1.1.2.1,1.1.2.2 utility.c,1.111.2.15,1.111.2.16

[Anthony C. <dae...@us...>]

Update of /cvsroot/havok/havokmud
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16156

Modified Files:
      Tag: rev_1_11
	act.wizard.c comm.c externs.h utility.c 
Log Message:
- fix siteban command



Index: utility.c
===================================================================
RCS file: /cvsroot/havok/havokmud/utility.c,v
retrieving revision 1.111.2.15
retrieving revision 1.111.2.16
diff -C2 -d -r1.111.2.15 -r1.111.2.16
*** utility.c	21 May 2004 13:25:42 -0000	1.111.2.15
--- utility.c	29 May 2004 03:45:18 -0000	1.111.2.16
***************
*** 10,13 ****
--- 10,14 ----
  
  #include "protos.h"
+ #include "externs.h"
  
  #define NEWHELP_FILE      "ADD_HELP"    /* New help to add */
***************
*** 5036,5041 ****
      int             i,
                      length;
-     extern int      numberhosts;
-     extern char     hostlist[MAX_BAN_HOSTS][30];
  
      length = strlen(site);
--- 5037,5040 ----

Index: act.wizard.c
===================================================================
RCS file: /cvsroot/havok/havokmud/act.wizard.c,v
retrieving revision 1.121.2.25
retrieving revision 1.121.2.26
diff -C2 -d -r1.121.2.25 -r1.121.2.26
*** act.wizard.c	23 May 2004 01:07:59 -0000	1.121.2.25
--- act.wizard.c	29 May 2004 03:45:17 -0000	1.121.2.26
***************
*** 13,16 ****
--- 13,17 ----
  
  #include "protos.h"
+ #include "externs.h"
  
  #define NEWHELP_FILE      "ADD_HELP"
***************
*** 31,62 ****
   * external vars
   */
- extern long     TempDis;
- extern long     SystemFlags;
- extern struct weather_data weather_info;
- extern const char *languagelist[];
- extern char    *system_flag_types[];
- extern struct zone_data *zone_table;
- extern int      top_of_zone_table;
- #ifdef HASH
- extern struct hash_header room_db;
- #else
- extern struct room_data *room_db[];
- #endif
- extern struct char_data *character_list;
- extern struct descriptor_data *descriptor_list;
- extern struct index_data *mob_index;
- extern struct index_data *obj_index;
- extern int      top_of_p_table;
- extern int      top_of_mobt;
- extern int      top_of_objt;
- extern struct int_app_type int_app[26];
- extern struct wis_app_type wis_app[26];
- extern struct player_index_element *player_table;
- extern char    *room_bits[];
- extern struct str_app_type str_app[];
- extern char    *motd;
- extern char    *wmotd;
- extern const struct class_def classes[MAX_CLASS];
- 
  
  char            EasySummon = 1;
--- 32,35 ----
***************
*** 684,690 ****
      char           *arg2;
  
-     extern int      numberhosts;
-     extern char     hostlist[MAX_BAN_HOSTS][30];
- 
  #endif
  
--- 657,660 ----
***************
*** 763,767 ****
          }
          send_to_char("Host is not in database\n\r", ch);
!     } else if (strcasecmp(buf, "list") == 0) {
          if (numberhosts <= 0) {
              send_to_char("Host list is empty.\n\r", ch);
--- 733,737 ----
          }
          send_to_char("Host is not in database\n\r", ch);
!     } else if (strcasecmp(arg1, "list") == 0) {
          if (numberhosts <= 0) {
              send_to_char("Host list is empty.\n\r", ch);

Index: externs.h
===================================================================
RCS file: /cvsroot/havok/havokmud/Attic/externs.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** externs.h	29 May 2004 03:20:27 -0000	1.1.2.1
--- externs.h	29 May 2004 03:45:18 -0000	1.1.2.2
***************
*** 27,31 ****
  extern struct hash_header room_db;
  #else
! extern struct room_data *room_db;
  #endif
  
--- 27,31 ----
  extern struct hash_header room_db;
  #else
! extern struct room_data *room_db[WORLD_SIZE];
  #endif
  
***************
*** 49,52 ****
--- 49,79 ----
  extern char    *spells[];
  
+ extern long     TempDis;
+ extern struct weather_data weather_info;
+ extern const char *languagelist[];
+ extern char    *system_flag_types[];
+ extern struct zone_data *zone_table;
+ extern int      top_of_zone_table;
+ 
+ extern struct index_data *mob_index;
+ extern int      top_of_p_table;
+ extern int      top_of_mobt;
+ extern int      top_of_objt;
+ extern struct int_app_type int_app[26];
+ extern struct wis_app_type wis_app[26];
+ extern struct player_index_element *player_table;
+ extern char    *room_bits[];
+ extern struct str_app_type str_app[];
+ extern char    *motd;
+ extern char    *wmotd;
+ extern const struct class_def classes[MAX_CLASS];
+ 
+ 
+ #ifdef SITELOCK
+ extern int      numberhosts;
+ extern char     hostlist[MAX_BAN_HOSTS][256];
+ #endif
+ 
+ 
  #endif
  

Index: comm.c
===================================================================
RCS file: /cvsroot/havok/havokmud/comm.c,v
retrieving revision 1.56.2.11
retrieving revision 1.56.2.12
diff -C2 -d -r1.56.2.11 -r1.56.2.12
*** comm.c	9 May 2004 04:46:07 -0000	1.56.2.11
--- comm.c	29 May 2004 03:45:18 -0000	1.56.2.12
***************
*** 104,108 ****
  
  #ifdef SITELOCK
! char            hostlist[MAX_BAN_HOSTS][30];    /* list of sites to ban */
  int             numberhosts;
  #endif
--- 104,108 ----
  
  #ifdef SITELOCK
! char            hostlist[MAX_BAN_HOSTS][256];    /* list of sites to ban */
  int             numberhosts;
  #endif