diff -up ../stk/Makefile ./Makefile
--- ../stk/Makefile	Thu Jun 19 00:58:35 1997
+++ ./Makefile	Fri Jul  4 18:55:30 1997
@@ -7,6 +7,8 @@ CC = gcc
 
 # Any special flags you want to pass to the compiler
 MYFLAGS = -Wall -fno-strict-prototypes
+MYFLAGS += -Wshadow
+MYFLAGS += -Werror
 
 #flags for profiling (see hacker.doc for more information)
 PROFILE = 
diff -up ../stk/act.comm.c ./act.comm.c
--- ../stk/act.comm.c	Thu Jun 19 00:58:35 1997
+++ ./act.comm.c	Fri Jul  4 19:10:53 1997
@@ -81,10 +81,10 @@ ACMD(do_gsay)
 }
 
 
-void perform_tell(struct char_data *ch, struct char_data *vict, char *arg)
+void perform_tell(struct char_data *ch, struct char_data *vict, char *argt)
 {
   send_to_char(CCRED(vict, C_NRM), vict);
-  sprintf(buf, "$n tells you, '%s'", arg);
+  sprintf(buf, "$n tells you, '%s'", argt);
   act(buf, FALSE, ch, 0, vict, TO_VICT | TO_SLEEP);
   send_to_char(CCNRM(vict, C_NRM), vict);
 
@@ -92,7 +92,7 @@ void perform_tell(struct char_data *ch, 
     send_to_char(OK, ch);
   else {
     send_to_char(CCRED(ch, C_CMP), ch);
-    sprintf(buf, "You tell $N, '%s'", arg);
+    sprintf(buf, "You tell $N, '%s'", argt);
     act(buf, FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
     send_to_char(CCNRM(ch, C_CMP), ch);
   }
diff -up ../stk/act.informative.c ./act.informative.c
--- ../stk/act.informative.c	Thu Jun 19 00:58:35 1997
+++ ./act.informative.c	Fri Jul  4 22:45:31 1997
@@ -46,7 +46,8 @@ extern char *class_abbrevs[];
 extern char *room_bits[];
 extern char *spells[];
 
-long find_class_bitvector(char arg);
+long find_class_bitvector(char argc);
+int     number(int from, int to);
 
 void show_obj_to_char(struct obj_data * object, struct char_data * ch,
 			int mode)
@@ -408,17 +409,17 @@ void look_in_direction(struct char_data 
 
 
 
-void look_in_obj(struct char_data * ch, char *arg)
+void look_in_obj(struct char_data * ch, char *argn)
 {
   struct obj_data *obj = NULL;
   struct char_data *dummy = NULL;
   int amt, bits;
 
-  if (!*arg)
+  if (!*argn)
     send_to_char("Look in what?\r\n", ch);
-  else if (!(bits = generic_find(arg, FIND_OBJ_INV | FIND_OBJ_ROOM |
+  else if (!(bits = generic_find(argn, FIND_OBJ_INV | FIND_OBJ_ROOM |
 				 FIND_OBJ_EQUIP, ch, &dummy, &obj))) {
-    sprintf(buf, "There doesn't seem to be %s %s here.\r\n", AN(arg), arg);
+    sprintf(buf, "There doesn't seem to be %s %s here.\r\n", AN(argn), argn);
     send_to_char(buf, ch);
   } else if ((GET_OBJ_TYPE(obj) != ITEM_DRINKCON) &&
 	     (GET_OBJ_TYPE(obj) != ITEM_FOUNTAIN) &&
@@ -480,18 +481,18 @@ char *find_exdesc(char *word, struct ext
  * matches the target.  First, see if there is another char in the room
  * with the name.  Then check local objs for exdescs.
  */
-void look_at_target(struct char_data * ch, char *arg)
+void look_at_target(struct char_data * ch, char *argt)
 {
   int bits, found = 0, j;
   struct char_data *found_char = NULL;
   struct obj_data *obj = NULL, *found_obj = NULL;
   char *desc;
 
-  if (!*arg) {
+  if (!*argt) {
     send_to_char("Look at what?\r\n", ch);
     return;
   }
-  bits = generic_find(arg, FIND_OBJ_INV | FIND_OBJ_ROOM | FIND_OBJ_EQUIP |
+  bits = generic_find(argt, FIND_OBJ_INV | FIND_OBJ_ROOM | FIND_OBJ_EQUIP |
 		      FIND_CHAR_ROOM, ch, &found_char, &found_obj);
 
   /* Is the target a character? */
@@ -505,21 +506,21 @@ void look_at_target(struct char_data * c
     return;
   }
   /* Does the argument match an extra desc in the room? */
-  if ((desc = find_exdesc(arg, world[ch->in_room].ex_description)) != NULL) {
+  if ((desc = find_exdesc(argt, world[ch->in_room].ex_description)) != NULL) {
     page_string(ch->desc, desc, 0);
     return;
   }
   /* Does the argument match an extra desc in the char's equipment? */
   for (j = 0; j < NUM_WEARS && !found; j++)
     if (GET_EQ(ch, j) && CAN_SEE_OBJ(ch, GET_EQ(ch, j)))
-      if ((desc = find_exdesc(arg, GET_EQ(ch, j)->ex_description)) != NULL) {
+      if ((desc = find_exdesc(argt, GET_EQ(ch, j)->ex_description)) != NULL) {
 	send_to_char(desc, ch);
 	found = 1;
       }
   /* Does the argument match an extra desc in the char's inventory? */
   for (obj = ch->carrying; obj && !found; obj = obj->next_content) {
     if (CAN_SEE_OBJ(ch, obj))
-	if ((desc = find_exdesc(arg, obj->ex_description)) != NULL) {
+	if ((desc = find_exdesc(argt, obj->ex_description)) != NULL) {
 	send_to_char(desc, ch);
 	found = 1;
       }
@@ -528,7 +529,7 @@ void look_at_target(struct char_data * c
   /* Does the argument match an extra desc of an object in the room? */
   for (obj = world[ch->in_room].contents; obj && !found; obj = obj->next_content)
     if (CAN_SEE_OBJ(ch, obj))
-	if ((desc = find_exdesc(arg, obj->ex_description)) != NULL) {
+	if ((desc = find_exdesc(argt, obj->ex_description)) != NULL) {
 	send_to_char(desc, ch);
 	found = 1;
       }
@@ -1239,12 +1240,12 @@ ACMD(do_gen_ps)
 }
 
 
-void perform_mortal_where(struct char_data * ch, char *arg)
+void perform_mortal_where(struct char_data * ch, char *argw)
 {
   register struct char_data *i;
   register struct descriptor_data *d;
 
-  if (!*arg) {
+  if (!*argw) {
     send_to_char("Players in your Zone\r\n--------------------\r\n", ch);
     for (d = descriptor_list; d; d = d->next)
       if (!d->connected) {
@@ -1258,7 +1259,7 @@ void perform_mortal_where(struct char_da
   } else {			/* print only FIRST char, not all. */
     for (i = character_list; i; i = i->next)
       if (world[i->in_room].zone == world[ch->in_room].zone && CAN_SEE(ch, i) &&
-	  (i->in_room != NOWHERE) && isname(arg, i->player.name)) {
+	  (i->in_room != NOWHERE) && isname(argw, i->player.name)) {
 	sprintf(buf, "%-25s - %s\r\n", GET_NAME(i), world[i->in_room].name);
 	send_to_char(buf, ch);
 	return;
@@ -1302,14 +1303,14 @@ void print_object_location(int num, stru
 
 
 
-void perform_immort_where(struct char_data * ch, char *arg)
+void perform_immort_where(struct char_data * ch, char *argw)
 {
   register struct char_data *i;
   register struct obj_data *k;
   struct descriptor_data *d;
   int num = 0, found = 0;
 
-  if (!*arg) {
+  if (!*argw) {
     send_to_char("Players\r\n-------\r\n", ch);
     for (d = descriptor_list; d; d = d->next)
       if (!d->connected) {
@@ -1327,14 +1328,14 @@ void perform_immort_where(struct char_da
       }
   } else {
     for (i = character_list; i; i = i->next)
-      if (CAN_SEE(ch, i) && i->in_room != NOWHERE && isname(arg, i->player.name)) {
+      if (CAN_SEE(ch, i) && i->in_room != NOWHERE && isname(argw, i->player.name)) {
 	found = 1;
 	sprintf(buf, "M%3d. %-25s - [%5d] %s\r\n", ++num, GET_NAME(i),
 		world[i->in_room].number, world[i->in_room].name);
 	send_to_char(buf, ch);
       }
     for (num = 0, k = object_list; k; k = k->next)
-      if (CAN_SEE_OBJ(ch, k) && isname(arg, k->name)) {
+      if (CAN_SEE_OBJ(ch, k) && isname(argw, k->name)) {
 	found = 1;
 	print_object_location(++num, k, ch, TRUE);
       }
diff -up ../stk/act.item.c ./act.item.c
--- ../stk/act.item.c	Thu Jun 19 00:58:35 1997
+++ ./act.item.c	Fri Jul  4 19:20:55 1997
@@ -26,6 +26,7 @@ extern struct room_data *world;
 extern char *drinks[];
 extern int drink_aff[][3];
 
+int number(int from, int to);
 
 void perform_put(struct char_data * ch, struct obj_data * obj,
 		      struct obj_data * cont)
@@ -161,30 +162,30 @@ void perform_get_from_container(struct c
 
 
 void get_from_container(struct char_data * ch, struct obj_data * cont,
-			     char *arg, int mode)
+			     char *argc, int mode)
 {
   struct obj_data *obj, *next_obj;
   int obj_dotmode, found = 0;
 
-  obj_dotmode = find_all_dots(arg);
+  obj_dotmode = find_all_dots(argc);
 
   if (IS_SET(GET_OBJ_VAL(cont, 1), CONT_CLOSED))
     act("$p is closed.", FALSE, ch, cont, 0, TO_CHAR);
   else if (obj_dotmode == FIND_INDIV) {
-    if (!(obj = get_obj_in_list_vis(ch, arg, cont->contains))) {
-      sprintf(buf, "There doesn't seem to be %s %s in $p.", AN(arg), arg);
+    if (!(obj = get_obj_in_list_vis(ch, argc, cont->contains))) {
+      sprintf(buf, "There doesn't seem to be %s %s in $p.", AN(argc), argc);
       act(buf, FALSE, ch, cont, 0, TO_CHAR);
     } else
       perform_get_from_container(ch, obj, cont, mode);
   } else {
-    if (obj_dotmode == FIND_ALLDOT && !*arg) {
+    if (obj_dotmode == FIND_ALLDOT && !*argc) {
       send_to_char("Get all of what?\r\n", ch);
       return;
     }
     for (obj = cont->contains; obj; obj = next_obj) {
       next_obj = obj->next_content;
       if (CAN_SEE_OBJ(ch, obj) &&
-	  (obj_dotmode == FIND_ALL || isname(arg, obj->name))) {
+	  (obj_dotmode == FIND_ALL || isname(argc, obj->name))) {
 	found = 1;
 	perform_get_from_container(ch, obj, cont, mode);
       }
@@ -193,7 +194,7 @@ void get_from_container(struct char_data
       if (obj_dotmode == FIND_ALL)
 	act("$p seems to be empty.", FALSE, ch, cont, 0, TO_CHAR);
       else {
-	sprintf(buf, "You can't seem to find any %ss in $p.", arg);
+	sprintf(buf, "You can't seem to find any %ss in $p.", argc);
 	act(buf, FALSE, ch, cont, 0, TO_CHAR);
       }
     }
@@ -215,28 +216,28 @@ int perform_get_from_room(struct char_da
 }
 
 
-void get_from_room(struct char_data * ch, char *arg)
+void get_from_room(struct char_data * ch, char *argr)
 {
   struct obj_data *obj, *next_obj;
   int dotmode, found = 0;
 
-  dotmode = find_all_dots(arg);
+  dotmode = find_all_dots(argr);
 
   if (dotmode == FIND_INDIV) {
-    if (!(obj = get_obj_in_list_vis(ch, arg, world[ch->in_room].contents))) {
-      sprintf(buf, "You don't see %s %s here.\r\n", AN(arg), arg);
+    if (!(obj = get_obj_in_list_vis(ch, argr, world[ch->in_room].contents))) {
+      sprintf(buf, "You don't see %s %s here.\r\n", AN(argr), argr);
       send_to_char(buf, ch);
     } else
       perform_get_from_room(ch, obj);
   } else {
-    if (dotmode == FIND_ALLDOT && !*arg) {
+    if (dotmode == FIND_ALLDOT && !*argr) {
       send_to_char("Get all of what?\r\n", ch);
       return;
     }
     for (obj = world[ch->in_room].contents; obj; obj = next_obj) {
       next_obj = obj->next_content;
       if (CAN_SEE_OBJ(ch, obj) &&
-	  (dotmode == FIND_ALL || isname(arg, obj->name))) {
+	  (dotmode == FIND_ALL || isname(argr, obj->name))) {
 	found = 1;
 	perform_get_from_room(ch, obj);
       }
@@ -245,7 +246,7 @@ void get_from_room(struct char_data * ch
       if (dotmode == FIND_ALL)
 	send_to_char("There doesn't seem to be anything here.\r\n", ch);
       else {
-	sprintf(buf, "You don't see any %ss here.\r\n", arg);
+	sprintf(buf, "You don't see any %ss here.\r\n", argr);
 	send_to_char(buf, ch);
       }
     }
@@ -536,14 +537,14 @@ void perform_give(struct char_data * ch,
 }
 
 /* utility function for give */
-struct char_data *give_find_vict(struct char_data * ch, char *arg)
+struct char_data *give_find_vict(struct char_data * ch, char *argg)
 {
   struct char_data *vict;
 
-  if (!*arg) {
+  if (!*argg) {
     send_to_char("To who?\r\n", ch);
     return NULL;
-  } else if (!(vict = get_char_room_vis(ch, arg))) {
+  } else if (!(vict = get_char_room_vis(ch, argg))) {
     send_to_char(NOPERSON, ch);
     return NULL;
   } else if (vict == ch) {
@@ -1122,7 +1123,7 @@ void perform_wear(struct char_data * ch,
 
 
 
-int find_eq_pos(struct char_data * ch, struct obj_data * obj, char *arg)
+int find_eq_pos(struct char_data * ch, struct obj_data * obj, char *arge)
 {
   int where = -1;
 
@@ -1148,7 +1149,7 @@ int find_eq_pos(struct char_data * ch, s
     "\n"
   };
 
-  if (!arg || !*arg) {
+  if (!arge || !*arge) {
     if (CAN_WEAR(obj, ITEM_WEAR_FINGER))      where = WEAR_FINGER_R;
     if (CAN_WEAR(obj, ITEM_WEAR_NECK))        where = WEAR_NECK_1;
     if (CAN_WEAR(obj, ITEM_WEAR_BODY))        where = WEAR_BODY;
@@ -1162,8 +1163,8 @@ int find_eq_pos(struct char_data * ch, s
     if (CAN_WEAR(obj, ITEM_WEAR_WAIST))       where = WEAR_WAIST;
     if (CAN_WEAR(obj, ITEM_WEAR_WRIST))       where = WEAR_WRIST_R;
   } else {
-    if ((where = search_block(arg, keywords, FALSE)) < 0) {
-      sprintf(buf, "'%s'?  What part of your body is THAT?\r\n", arg);
+    if ((where = search_block(arge, keywords, FALSE)) < 0) {
+      sprintf(buf, "'%s'?  What part of your body is THAT?\r\n", arge);
       send_to_char(buf, ch);
     }
   }
diff -up ../stk/act.movement.c ./act.movement.c
--- ../stk/act.movement.c	Thu Jun 19 00:58:35 1997
+++ ./act.movement.c	Fri Jul  4 19:18:50 1997
@@ -31,10 +31,13 @@ extern char *dirs[];
 extern int movement_loss[];
 
 /* external functs */
-int special(struct char_data *ch, int cmd, char *arg);
+int special(struct char_data *ch, int cmd, char *args);
 void death_cry(struct char_data *ch);
-int find_eq_pos(struct char_data * ch, struct obj_data * obj, char *arg);
-
+int find_eq_pos(struct char_data * ch, struct obj_data * obj, char *argq);
+int special(struct char_data *chs, int cmd, char *args);
+int number(int from, int to);
+void stop_follower(struct char_data *ch);
+void add_follower(struct char_data *ch, struct char_data *leader);
 
 
 /* simple function to determine if char can walk on water */
@@ -76,8 +79,6 @@ int do_simple_move(struct char_data *ch,
 {
   int was_in, need_movement;
 
-  int special(struct char_data *ch, int cmd, char *arg);
-
   /*
    * Check for special routines (North is 1 in command list, but 0 here) Note
    * -- only check if following; this avoids 'double spec-proc' bug
@@ -649,9 +650,6 @@ ACMD(do_wake)
 ACMD(do_follow)
 {
   struct char_data *leader;
-
-  void stop_follower(struct char_data *ch);
-  void add_follower(struct char_data *ch, struct char_data *leader);
 
   one_argument(argument, buf);
 
diff -up ../stk/act.offensive.c ./act.offensive.c
--- ../stk/act.offensive.c	Thu Jun 19 00:58:36 1997
+++ ./act.offensive.c	Fri Jul  4 19:21:53 1997
@@ -28,7 +28,7 @@ extern int pk_allowed;
 
 /* extern functions */
 void raw_kill(struct char_data * ch);
-
+int number(int from, int to);
 
 ACMD(do_assist)
 {
@@ -182,7 +182,6 @@ ACMD(do_backstab)
 ACMD(do_order)
 {
   char name[100], message[256];
-  char buf[256];
   bool found = FALSE;
   int org_room;
   struct char_data *vict;
diff -up ../stk/act.other.c ./act.other.c
--- ../stk/act.other.c	Thu Jun 19 00:58:36 1997
+++ ./act.other.c	Fri Jul  4 19:24:49 1997
@@ -35,12 +35,18 @@ extern char *class_abbrevs[];
 
 /* extern procedures */
 SPECIAL(shop_keeper);
+void die(struct char_data * ch);
+void Crash_rentsave(struct char_data * ch, int cost);
+int number(int from, int to);
+ACMD(do_gen_comm);
+void list_skills(struct char_data * ch);
+void appear(struct char_data * ch);
+void perform_immort_vis(struct char_data *ch);
+void stop_follower(struct char_data * ch);
 
 
 ACMD(do_quit)
 {
-  void die(struct char_data * ch);
-  void Crash_rentsave(struct char_data * ch, int cost);
   extern int free_rent;
   sh_int save_room;
   struct descriptor_data *d, *next_d;
@@ -164,9 +170,6 @@ ACMD(do_steal)
   int percent, gold, eq_pos, pcsteal = 0, ohoh = 0;
   extern int pt_allowed;
 
-
-  ACMD(do_gen_comm);
-
   argument = one_argument(argument, obj_name);
   one_argument(argument, vict_name);
 
@@ -269,8 +272,6 @@ ACMD(do_steal)
 
 ACMD(do_practice)
 {
-  void list_skills(struct char_data * ch);
-
   one_argument(argument, arg);
 
   if (*arg)
@@ -283,9 +284,6 @@ ACMD(do_practice)
 
 ACMD(do_visible)
 {
-  void appear(struct char_data * ch);
-  void perform_immort_vis(struct char_data *ch);
-
   if (GET_LEVEL(ch) >= LVL_IMMORT) {
     perform_immort_vis(ch);
     return;
@@ -420,7 +418,6 @@ ACMD(do_ungroup)
 {
   struct follow_type *f, *next_fol;
   struct char_data *tch;
-  void stop_follower(struct char_data * ch);
 
   one_argument(argument, buf);
 
@@ -718,7 +715,7 @@ ACMD(do_display)
 ACMD(do_gen_write)
 {
   FILE *fl;
-  char *tmp, *filename, buf[MAX_STRING_LENGTH];
+  char *tmp, *filename;
   struct stat fbuf;
   extern int max_filesize;
   time_t ct;
diff -up ../stk/act.social.c ./act.social.c
--- ../stk/act.social.c	Thu Jun 19 00:58:36 1997
+++ ./act.social.c	Fri Jul  4 19:25:27 1997
@@ -27,7 +27,8 @@ extern struct room_data *world;
 
 /* extern functions */
 char *fread_action(FILE * fl, int nr);
-
+int number(int from, int to);
+ 
 /* local globals */
 static int list_top = -1;
 
@@ -176,7 +177,7 @@ ACMD(do_insult)
 
 char *fread_action(FILE * fl, int nr)
 {
-  char buf[MAX_STRING_LENGTH], *rslt;
+  char *rslt;
 
   fgets(buf, MAX_STRING_LENGTH, fl);
   if (feof(fl)) {
diff -up ../stk/act.wizard.c ./act.wizard.c
--- ../stk/act.wizard.c	Thu Jun 19 00:58:36 1997
+++ ./act.wizard.c	Fri Jul  4 19:48:06 1997
@@ -67,6 +67,14 @@ extern char *preference_bits[];
 extern char *position_types[];
 extern char *connected_types[];
 
+/* extern functions */
+int number(int from, int to);
+void appear(struct char_data *ch);
+void roll_real_abils(struct char_data *ch);
+void show_shops(struct char_data * ch, char *value);
+void hcontrol_list_houses(struct char_data *ch);
+int parse_class(char argc);
+void do_start(struct char_data *ch);
 
 
 ACMD(do_echo)
@@ -1018,7 +1026,7 @@ ACMD(do_load)
 {
   struct char_data *mob;
   struct obj_data *obj;
-  int number, r_num;
+  int num, r_num;
 
   two_arguments(argument, buf, buf2);
 
@@ -1026,12 +1034,12 @@ ACMD(do_load)
     send_to_char("Usage: load { obj | mob } <number>\r\n", ch);
     return;
   }
-  if ((number = atoi(buf2)) < 0) {
+  if ((num = atoi(buf2)) < 0) {
     send_to_char("A NEGATIVE number??\r\n", ch);
     return;
   }
   if (is_abbrev(buf, "mob")) {
-    if ((r_num = real_mobile(number)) < 0) {
+    if ((r_num = real_mobile(num)) < 0) {
       send_to_char("There is no monster with that number.\r\n", ch);
       return;
     }
@@ -1043,7 +1051,7 @@ ACMD(do_load)
     act("$n has created $N!", FALSE, ch, 0, mob, TO_ROOM);
     act("You create $N.", FALSE, ch, 0, mob, TO_CHAR);
   } else if (is_abbrev(buf, "obj")) {
-    if ((r_num = real_object(number)) < 0) {
+    if ((r_num = real_object(num)) < 0) {
       send_to_char("There is no object with that number.\r\n", ch);
       return;
     }
@@ -1062,7 +1070,7 @@ ACMD(do_vstat)
 {
   struct char_data *mob;
   struct obj_data *obj;
-  int number, r_num;
+  int num, r_num;
 
   two_arguments(argument, buf, buf2);
 
@@ -1070,12 +1078,12 @@ ACMD(do_vstat)
     send_to_char("Usage: vstat { obj | mob } <number>\r\n", ch);
     return;
   }
-  if ((number = atoi(buf2)) < 0) {
+  if ((num = atoi(buf2)) < 0) {
     send_to_char("A NEGATIVE number??\r\n", ch);
     return;
   }
   if (is_abbrev(buf, "mob")) {
-    if ((r_num = real_mobile(number)) < 0) {
+    if ((r_num = real_mobile(num)) < 0) {
       send_to_char("There is no monster with that number.\r\n", ch);
       return;
     }
@@ -1084,7 +1092,7 @@ ACMD(do_vstat)
     do_stat_character(ch, mob);
     extract_char(mob);
   } else if (is_abbrev(buf, "obj")) {
-    if ((r_num = real_object(number)) < 0) {
+    if ((r_num = real_object(num)) < 0) {
       send_to_char("There is no object with that number.\r\n", ch);
       return;
     }
@@ -1158,9 +1166,6 @@ ACMD(do_advance)
   struct char_data *victim;
   char *name = arg, *level = buf2;
   int newlevel, oldlevel;
-  void do_start(struct char_data *ch);
-
-  void gain_exp(struct char_data * ch, int gain);
 
   two_arguments(argument, name, level);
 
@@ -1271,8 +1276,6 @@ ACMD(do_restore)
 
 void perform_immort_vis(struct char_data *ch)
 {
-  void appear(struct char_data *ch);
-
   if (GET_INVIS_LEV(ch) == 0 && !IS_AFFECTED(ch, AFF_HIDE | AFF_INVISIBLE)) {
     send_to_char("You are already fully visible.\r\n", ch);
     return;
@@ -1712,7 +1715,6 @@ ACMD(do_wizutil)
 {
   struct char_data *vict;
   long result;
-  void roll_real_abils(struct char_data *ch);
 
   one_argument(argument, arg);
 
@@ -1842,8 +1844,6 @@ ACMD(do_show)
   extern char *class_abbrevs[];
   extern char *genders[];
   extern int buf_switches, buf_largecount, buf_overflows;
-  void show_shops(struct char_data * ch, char *value);
-  void hcontrol_list_houses(struct char_data *ch);
 
   struct show_struct {
     char *cmd;
@@ -2024,7 +2024,6 @@ ACMD(do_set)
   int on = 0, off = 0, value = 0;
   char is_file = 0, is_mob = 0, is_player = 0;
   int player_i = 0;
-  int parse_class(char arg);
 
   struct set_struct {
     char *cmd;
diff -up ../stk/boards.c ./boards.c
--- ../stk/boards.c	Thu Jun 19 00:58:36 1997
+++ ./boards.c	Fri Jul  4 20:01:08 1997
@@ -59,13 +59,13 @@ TO ADD A NEW BOARD, simply follow our ea
 extern struct room_data *world;
 extern struct descriptor_data *descriptor_list;
 
-int Board_display_msg(int board_type, struct char_data * ch, char *arg);
-int Board_show_board(int board_type, struct char_data * ch, char *arg);
-int Board_remove_msg(int board_type, struct char_data * ch, char *arg);
+int Board_display_msg(int board_type, struct char_data * ch, char *argb);
+int Board_show_board(int board_type, struct char_data * ch, char *argb);
+int Board_remove_msg(int board_type, struct char_data * ch, char *argb);
 void Board_save_board(int board_type);
 void Board_load_board(int board_type);
 void Board_reset_board(int board_num);
-void Board_write_message(int board_type, struct char_data * ch, char *arg);
+void Board_write_message(int board_type, struct char_data * ch, char *argb);
 
 /*
 format:	vnum, read lvl, write lvl, remove lvl, filename, 0 at end
@@ -117,7 +117,6 @@ int find_board(struct char_data * ch)
 void init_boards(void)
 {
   int i, j, fatal_error = 0;
-  char buf[256];
 
   for (i = 0; i < INDEX_SIZE; i++) {
     msg_storage[i] = 0;
@@ -184,12 +183,11 @@ SPECIAL(gen_board)
 }
 
 
-void Board_write_message(int board_type, struct char_data * ch, char *arg)
+void Board_write_message(int board_type, struct char_data * ch, char *argb)
 {
   char *tmstr;
   int len;
   time_t ct;
-  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
 
   if (GET_LEVEL(ch) < WRITE_LVL(board_type)) {
     send_to_char("You are not holy enough to write on this board.\r\n", ch);
@@ -205,13 +203,13 @@ void Board_write_message(int board_type,
     return;
   }
   /* skip blanks */
-  skip_spaces(&arg);
-  delete_doubledollar(arg);
+  skip_spaces(&argb);
+  delete_doubledollar(argb);
 
   /* JE 27 Oct 95 - Truncate headline at 80 chars if it's longer than that */
   arg[81] = '\0';
 
-  if (!*arg) {
+  if (!*argb) {
     send_to_char("We must have a headline!\r\n", ch);
     return;
   }
@@ -220,7 +218,7 @@ void Board_write_message(int board_type,
   *(tmstr + strlen(tmstr) - 1) = '\0';
 
   sprintf(buf2, "(%s)", GET_NAME(ch));
-  sprintf(buf, "%6.10s %-12s :: %s", tmstr, buf2, arg);
+  sprintf(buf, "%6.10s %-12s :: %s", tmstr, buf2, argb);
   len = strlen(buf) + 1;
   if (!(NEW_MSG_INDEX(board_type).heading = (char *) malloc(sizeof(char) * len))) {
     send_to_char("The board is malfunctioning - sorry.\r\n", ch);
@@ -244,17 +242,17 @@ void Board_write_message(int board_type,
 }
 
 
-int Board_show_board(int board_type, struct char_data * ch, char *arg)
+int Board_show_board(int board_type, struct char_data * ch, char *argb)
 {
   int i;
-  char tmp[MAX_STRING_LENGTH], buf[MAX_STRING_LENGTH];
+  char board[MAX_STRING_LENGTH];
 
   if (!ch->desc)
     return 0;
 
-  one_argument(arg, tmp);
+  one_argument(argb, arg);
 
-  if (!*tmp || !isname(tmp, "board bulletin"))
+  if (!*arg || !isname(arg, "board bulletin"))
     return 0;
 
   if (GET_LEVEL(ch) < READ_LVL(board_type)) {
@@ -263,18 +261,18 @@ int Board_show_board(int board_type, str
   }
   act("$n studies the board.", TRUE, ch, 0, 0, TO_ROOM);
 
-  strcpy(buf,
+  strcpy(board,
 	 "This is a bulletin board.  Usage: READ/REMOVE <messg #>, WRITE <header>.\r\n"
 	 "You will need to look at the board to save your message.\r\n");
   if (!num_of_msgs[board_type])
-    strcat(buf, "The board is empty.\r\n");
+    strcat(board, "The board is empty.\r\n");
   else {
-    sprintf(buf + strlen(buf), "There are %d messages on the board.\r\n",
+    sprintf(board + strlen(buf), "There are %d messages on the board.\r\n",
 	    num_of_msgs[board_type]);
     for (i = 0; i < num_of_msgs[board_type]; i++) {
 /*    for (i = num_of_msgs[board_type] - 1; i >= 0; i--) { */
       if (MSG_HEADING(board_type, i))
-	sprintf(buf + strlen(buf), "%-2d : %s\r\n", i + 1, MSG_HEADING(board_type, i));
+	sprintf(board + strlen(board), "%-2d : %s\r\n", i + 1, MSG_HEADING(board_type, i));
       else {
 	log("SYSERR: The board is fubar'd.");
 	send_to_char("Sorry, the board isn't working.\r\n", ch);
@@ -282,22 +280,22 @@ int Board_show_board(int board_type, str
       }
     }
   }
-  page_string(ch->desc, buf, 1);
+  page_string(ch->desc, board, 1);
 
   return 1;
 }
 
 
-int Board_display_msg(int board_type, struct char_data * ch, char *arg)
+int Board_display_msg(int board_type, struct char_data * ch, char *argb)
 {
   char number[MAX_STRING_LENGTH], buffer[MAX_STRING_LENGTH];
   int msg, ind;
 
-  one_argument(arg, number);
+  one_argument(argb, number);
   if (!*number)
     return 0;
   if (isname(number, "board bulletin"))	/* so "read board" works */
-    return (Board_show_board(board_type, ch, arg));
+    return (Board_show_board(board_type, ch, argb));
   if (!isdigit(*number) || (!(msg = atoi(number))))
     return 0;
 
@@ -338,18 +336,16 @@ int Board_display_msg(int board_type, st
   return 1;
 }
 
-
-int Board_remove_msg(int board_type, struct char_data * ch, char *arg)
+int Board_remove_msg(int board_type, struct char_data * ch, char *argb)
 {
   int ind, msg, slot_num;
-  char number[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
   struct descriptor_data *d;
 
-  one_argument(arg, number);
+  one_argument(argb, buf);
 
-  if (!*number || !isdigit(*number))
+  if (!*buf || !isdigit(*buf))
     return 0;
-  if (!(msg = atoi(number)))
+  if (!(msg = atoi(buf)))
     return (0);
 
   if (!num_of_msgs[board_type]) {
diff -up ../stk/boards.h ./boards.h
--- ../stk/boards.h	Thu Jun 19 00:58:36 1997
+++ ./boards.h	Fri Jul  4 19:50:53 1997
@@ -45,10 +45,10 @@ struct board_info_type {
 #define MSG_SLOTNUM(i, j) (msg_index[i][j].slot_num)
 #define MSG_LEVEL(i, j) (msg_index[i][j].level)
 
-int	Board_display_msg(int board_type, struct char_data *ch, char *arg);
-int	Board_show_board(int board_type, struct char_data *ch, char *arg);
-int	Board_remove_msg(int board_type, struct char_data *ch, char *arg);
+int	Board_display_msg(int board_type, struct char_data *ch, char *argb);
+int	Board_show_board(int board_type, struct char_data *ch, char *argb);
+int	Board_remove_msg(int board_type, struct char_data *ch, char *argb);
 void	Board_save_board(int board_type);
 void	Board_load_board(int board_type);
 void	Board_reset_board(int board_num);
-void	Board_write_message(int board_type, struct char_data *ch, char *arg);
+void	Board_write_message(int board_type, struct char_data *ch, char *argb);
diff -up ../stk/castle.c ./castle.c
--- ../stk/castle.c	Thu Jun 19 00:58:36 1997
+++ ./castle.c	Fri Jul  4 20:13:20 1997
@@ -30,6 +30,12 @@ extern struct index_data *mob_index;
 extern struct index_data *obj_index;
 extern struct time_info_data time_info;
 
+/* extern functions */
+ACMD(do_gen_door);
+SPECIAL(guild);
+ACMD(do_follow);
+int number(int from, int to);
+
 /* IMPORTANT!
    The below defined number is the zone number of the Kings Castle.
    Change it to apply to your chosen zone number. The default zone
@@ -256,7 +262,7 @@ int do_npc_rescue(struct char_data * ch_
 
 /* Procedure to block a person trying to enter a room. */
 /* Used by Tim/Tom at Kings bedroom and Dick/David at treasury */
-int block_way(struct char_data * ch, int cmd, char *arg, int iIn_room,
+int block_way(struct char_data * ch, int cmd, char *argm, int iIn_room,
 	          int iProhibited_direction)
 {
 
@@ -341,8 +347,6 @@ void fry_victim(struct char_data * ch)
 /* Used by King Welmar */
 SPECIAL(king_welmar)
 {
-  ACMD(do_gen_door);
-
   static char *monolog[] = {
     "$n proclaims 'Primus in regnis Geticis coronam'.",
     "$n proclaims 'regiam gessi, subiique regis'.",
@@ -356,22 +360,22 @@ SPECIAL(king_welmar)
   static char monolog_path[] = "ABCDPPPP.";
 
   static char *path;
-  static int index;
+  static int index_p;
   static bool move = FALSE;
 
   if (!move) {
     if (time_info.hours == 8 && ch->in_room == R_ROOM(Z_KINGS_C, 51)) {
       move = TRUE;
       path = throne_path;
-      index = 0;
+      index_p = 0;
     } else if (time_info.hours == 21 && ch->in_room == R_ROOM(Z_KINGS_C, 17)) {
       move = TRUE;
       path = bedroom_path;
-      index = 0;
+      index_p = 0;
     } else if (time_info.hours == 12 && ch->in_room == R_ROOM(Z_KINGS_C, 17)) {
       move = TRUE;
       path = monolog_path;
-      index = 0;
+      index_p = 0;
     }
   }
   if (cmd || (GET_POS(ch) < POS_SLEEPING) ||
@@ -387,20 +391,20 @@ SPECIAL(king_welmar)
   if (!move)
     return FALSE;
 
-  switch (path[index]) {
+  switch (path[index_p]) {
   case '0':
   case '1':
   case '2':
   case '3':
   case '4':
   case '5':
-    perform_move(ch, path[index] - 0, 1);
+    perform_move(ch, path[index_p] - 0, 1);
     break;
   case 'A':
   case 'B':
   case 'C':
   case 'D':
-    act(monolog[path[index] - 'A'], FALSE, ch, 0, 0, TO_ROOM);
+    act(monolog[path[index_p] - 'A'], FALSE, ch, 0, 0, TO_ROOM);
     break;
   case 'P':
     break;
@@ -447,7 +451,7 @@ SPECIAL(king_welmar)
     break;
   }
 
-  index++;
+  index_p++;
   return FALSE;
 }
 
@@ -458,11 +462,8 @@ SPECIAL(king_welmar)
 /* Used by the Training Master */
 SPECIAL(training_master)
 {
-
   struct char_data *pupil1, *pupil2, *tch;
 
-  SPECIAL(guild);
-
   if (!AWAKE(ch) || (GET_POS(ch) == POS_FIGHTING))
     return FALSE;
 
@@ -555,10 +556,7 @@ SPECIAL(training_master)
 
 SPECIAL(tom)
 {
-
-  struct char_data *king, *tim;
-
-  ACMD(do_follow);
+  struct char_data *king, *tim_npc;
 
   if (!AWAKE(ch))
     return FALSE;
@@ -570,9 +568,9 @@ SPECIAL(tom)
       do_npc_rescue(ch, king);
   }
   if (!cmd)
-    if ((tim = find_npc_by_name(ch, "Tim", 3)))
-      if (FIGHTING(tim) && 2 * GET_HIT(tim) < GET_HIT(ch))
-	do_npc_rescue(ch, tim);
+    if ((tim_npc = find_npc_by_name(ch, "Tim", 3)))
+      if (FIGHTING(tim_npc) && 2 * GET_HIT(tim_npc) < GET_HIT(ch))
+	do_npc_rescue(ch, tim_npc);
 
   if (!cmd && GET_POS(ch) != POS_FIGHTING)
     banzaii(ch);
@@ -583,10 +581,7 @@ SPECIAL(tom)
 
 SPECIAL(tim)
 {
-
-  struct char_data *king, *tom;
-
-  ACMD(do_follow);
+  struct char_data *king, *tom_npc;
 
   if (!AWAKE(ch))
     return FALSE;
@@ -598,9 +593,9 @@ SPECIAL(tim)
       do_npc_rescue(ch, king);
   }
   if (!cmd)
-    if ((tom = find_npc_by_name(ch, "Tom", 3)))
-      if (FIGHTING(tom) && 2 * GET_HIT(tom) < GET_HIT(ch))
-	do_npc_rescue(ch, tom);
+    if ((tom_npc = find_npc_by_name(ch, "Tom", 3)))
+      if (FIGHTING(tom_npc) && 2 * GET_HIT(tom_npc) < GET_HIT(ch))
+	do_npc_rescue(ch, tom_npc);
 
   if (!cmd && GET_POS(ch) != POS_FIGHTING)
     banzaii(ch);
diff -up ../stk/class.c ./class.c
--- ../stk/class.c	Thu Jun 19 00:58:36 1997
+++ ./class.c	Fri Jul  4 20:16:56 1997
@@ -26,6 +26,9 @@
 #include "spells.h"
 #include "interpreter.h"
 
+/* extern funcs */
+int number(int from, int to);
+void advance_level(struct char_data * ch);
 
 /* Names first */
 
@@ -63,11 +66,11 @@ const char *class_menu =
  * new character is selecting a class and by 'set class' in act.wizard.c.
  */
 
-int parse_class(char arg)
+int parse_class(char argc)
 {
-  arg = LOWER(arg);
+  argc = LOWER(argc);
 
-  switch (arg) {
+  switch (argc) {
   case 'm':
     return CLASS_MAGIC_USER;
     break;
@@ -93,11 +96,11 @@ int parse_class(char arg)
  * 1 << 5, etc.
  */
 
-long find_class_bitvector(char arg)
+long find_class_bitvector(char argc)
 {
-  arg = LOWER(arg);
+  argc = LOWER(argc);
 
-  switch (arg) {
+  switch (argc) {
     case 'm':
       return (1 << 0);
       break;
@@ -293,8 +296,6 @@ void roll_real_abils(struct char_data * 
 /* Some initializations for characters, including initial skills */
 void do_start(struct char_data * ch)
 {
-  void advance_level(struct char_data * ch);
-
   GET_LEVEL(ch) = 1;
   GET_EXP(ch) = 1;
 
diff -up ../stk/comm.c ./comm.c
--- ../stk/comm.c	Thu Jun 19 00:58:36 1997
+++ ./comm.c	Fri Jul  4 19:06:59 1997
@@ -134,7 +134,6 @@ void gettimeofday(struct timeval *t, str
 int main(int argc, char **argv)
 {
   int port;
-  char buf[512];
   int pos = 1;
   char *dir;
 
@@ -756,7 +755,7 @@ void record_usage(void)
 {
   int sockets_connected = 0, sockets_playing = 0;
   struct descriptor_data *d;
-  char buf[256];
+  char rbuf[256];
 
   for (d = descriptor_list; d; d = d->next) {
     sockets_connected++;
@@ -764,18 +763,18 @@ void record_usage(void)
       sockets_playing++;
   }
 
-  sprintf(buf, "nusage: %-3d sockets connected, %-3d sockets playing",
+  sprintf(rbuf, "nusage: %-3d sockets connected, %-3d sockets playing",
 	  sockets_connected, sockets_playing);
-  log(buf);
+  log(rbuf);
 
 #ifdef RUSAGE
   {
     struct rusage ru;
 
     getrusage(0, &ru);
-    sprintf(buf, "rusage: user time: %ld sec, system time: %ld sec, max res size: %ld",
+    sprintf(rbuf, "rusage: user time: %ld sec, system time: %ld sec, max res size: %ld",
 	    ru.ru_utime.tv_sec, ru.ru_stime.tv_sec, ru.ru_maxrss);
-    log(buf);
+    log(rbuf);
   }
 #endif
 
@@ -831,21 +830,18 @@ void make_prompt(struct descriptor_data 
 	    d->showstr_page, d->showstr_count);
     write_to_descriptor(d->descriptor, prompt);
   } else if (!d->connected) {
-    char prompt[MAX_INPUT_LENGTH];
-
     *prompt = '\0';
-
     if (GET_INVIS_LEV(d->character))
-      sprintf(prompt, "i%d ", GET_INVIS_LEV(d->character));
+      sprintf(prompt + strlen(prompt), "i%d ", GET_INVIS_LEV(d->character));
 
     if (PRF_FLAGGED(d->character, PRF_DISPHP))
-      sprintf(prompt, "%s%dH ", prompt, GET_HIT(d->character));
+      sprintf(prompt + strlen(prompt), "%dH ", GET_HIT(d->character));
 
     if (PRF_FLAGGED(d->character, PRF_DISPMANA))
-      sprintf(prompt, "%s%dM ", prompt, GET_MANA(d->character));
+      sprintf(prompt + strlen(prompt), "%dM ", GET_MANA(d->character));
 
     if (PRF_FLAGGED(d->character, PRF_DISPMOVE))
-      sprintf(prompt, "%s%dV ", prompt, GET_MOVE(d->character));
+      sprintf(prompt + strlen(prompt), "%dV ", GET_MOVE(d->character));
 
     strcat(prompt, "> ");
     write_to_descriptor(d->descriptor, prompt);
@@ -1348,7 +1344,6 @@ int perform_subst(struct descriptor_data
 
 void close_socket(struct descriptor_data *d)
 {
-  char buf[128];
   struct descriptor_data *temp;
   long target_idnum = -1;
 
@@ -1518,16 +1513,16 @@ RETSIGTYPE hupsig()
 #else
 sigfunc *my_signal(int signo, sigfunc * func)
 {
-  struct sigaction act, oact;
+  struct sigaction actn, oact;
 
-  act.sa_handler = func;
-  sigemptyset(&act.sa_mask);
-  act.sa_flags = 0;
+  actn.sa_handler = func;
+  sigemptyset(&actn.sa_mask);
+  actn.sa_flags = 0;
 #ifdef SA_INTERRUPT
-  act.sa_flags |= SA_INTERRUPT;	/* SunOS */
+  actn.sa_flags |= SA_INTERRUPT;	/* SunOS */
 #endif
 
-  if (sigaction(signo, &act, &oact) < 0)
+  if (sigaction(signo, &actn, &oact) < 0)
     return SIG_ERR;
 
   return oact.sa_handler;
@@ -1651,10 +1646,8 @@ char *ACTNULL = "<NULL>";
 void perform_act(char *orig, struct char_data *ch, struct obj_data *obj,
 		 void *vict_obj, struct char_data *to)
 {
-  register char *i = NULL, *buf;
   static char lbuf[MAX_STRING_LENGTH];
-
-  buf = lbuf;
+  register char *i = NULL, *bufr = lbuf;
 
   for (;;) {
     if (*orig == '$') {
@@ -1717,16 +1710,16 @@ void perform_act(char *orig, struct char
 	log(buf1);
 	break;
       }
-      while ((*buf = *(i++)))
-	buf++;
+      while ((*bufr = *(i++)))
+	bufr++;
       orig++;
-    } else if (!(*(buf++) = *(orig++)))
+    } else if (!(*(bufr++) = *(orig++)))
       break;
   }
 
-  *(--buf) = '\r';
-  *(++buf) = '\n';
-  *(++buf) = '\0';
+  *(--bufr) = '\r';
+  *(++bufr) = '\n';
+  *(++bufr) = '\0';
 
   SEND_TO_Q(CAP(lbuf), to->desc);
 }
@@ -1739,7 +1732,7 @@ void act(char *str, int hide_invisible, 
 	 struct obj_data *obj, void *vict_obj, int type)
 {
   struct char_data *to;
-  static int sleep;
+  static int sleep_b;
 
   if (!str || !*str)
     return;
@@ -1754,7 +1747,7 @@ void act(char *str, int hide_invisible, 
    */
 
   /* check if TO_SLEEP is there, and remove it if it is. */
-  if ((sleep = (type & TO_SLEEP)))
+  if ((sleep_b = (type & TO_SLEEP)))
     type &= ~TO_SLEEP;
 
 
diff -up ../stk/db.c ./db.c
--- ../stk/db.c	Thu Jun 19 00:58:37 1997
+++ ./db.c	Fri Jul  4 22:56:58 1997
@@ -99,8 +99,8 @@ void char_to_store(struct char_data * ch
 void store_to_char(struct char_file_u * st, struct char_data * ch);
 int is_empty(int zone_nr);
 void reset_zone(int zone);
-int file_to_string(char *name, char *buf);
-int file_to_string_alloc(char *name, char **buf);
+int file_to_string(char *name, char *bufs);
+int file_to_string_alloc(char *name, char **bufs);
 void check_start_rooms(void);
 void renum_world(void);
 void renum_zone_table(void);
@@ -121,6 +121,7 @@ void load_banned(void);
 void Read_Invalid_List(void);
 void boot_the_shops(FILE * shop_f, char *filename, int rec_count);
 int hsort(const void *a, const void *b);
+int number(int from, int to);
 
 /* external vars */
 extern int no_specials;
@@ -425,11 +426,11 @@ void build_player_index(void)
 /* function to count how many hash-mark delimited records exist in a file */
 int count_hash_records(FILE * fl)
 {
-  char buf[128];
+  char bufline[128];
   int count = 0;
 
-  while (fgets(buf, 128, fl))
-    if (*buf == '#')
+  while (fgets(bufline, 128, fl))
+    if (*bufline == '#')
       count++;
 
   return count;
@@ -440,7 +441,7 @@ int count_hash_records(FILE * fl)
 void index_boot(int mode)
 {
   char *index_filename, *prefix;
-  FILE *index, *db_file;
+  FILE *index_f, *db_file;
   int rec_count = 0;
 
   switch (mode) {
@@ -475,14 +476,14 @@ void index_boot(int mode)
 
   sprintf(buf2, "%s/%s", prefix, index_filename);
 
-  if (!(index = fopen(buf2, "r"))) {
+  if (!(index_f = fopen(buf2, "r"))) {
     sprintf(buf1, "Error opening index file '%s'", buf2);
     perror(buf1);
     exit(1);
   }
 
   /* first, count the number of records in the file so we can malloc */
-  fscanf(index, "%s\n", buf1);
+  fscanf(index_f, "%s\n", buf1);
   while (*buf1 != '$') {
     sprintf(buf2, "%s/%s", prefix, buf1);
     if (!(db_file = fopen(buf2, "r"))) {
@@ -497,7 +498,7 @@ void index_boot(int mode)
     }
 
     fclose(db_file);
-    fscanf(index, "%s\n", buf1);
+    fscanf(index_f, "%s\n", buf1);
   }
 
   /* Exit if 0 records, unless this is shops */
@@ -530,8 +531,8 @@ void index_boot(int mode)
     break;
   }
 
-  rewind(index);
-  fscanf(index, "%s\n", buf1);
+  rewind(index_f);
+  fscanf(index_f, "%s\n", buf1);
   while (*buf1 != '$') {
     sprintf(buf2, "%s/%s", prefix, buf1);
     if (!(db_file = fopen(buf2, "r"))) {
@@ -556,7 +557,7 @@ void index_boot(int mode)
     }
 
     fclose(db_file);
-    fscanf(index, "%s\n", buf1);
+    fscanf(index_f, "%s\n", buf1);
   }
 
   /* sort the help index */
@@ -621,7 +622,7 @@ void discrete_load(FILE * fl, int mode)
 long asciiflag_conv(char *flag)
 {
   long flags = 0;
-  int is_number = 1;
+  int is_num = 1;
   register char *p;
 
   for (p = flag; *p; p++) {
@@ -631,10 +632,10 @@ long asciiflag_conv(char *flag)
       flags |= 1 << (26 + (*p - 'A'));
 
     if (!isdigit(*p))
-      is_number = 0;
+      is_num = 0;
   }
 
-  if (is_number)
+  if (is_num)
     flags = atol(flag);
 
   return flags;
@@ -965,18 +966,18 @@ void interpret_espec(char *keyword, char
 #undef CASE
 #undef RANGE
 
-void parse_espec(char *buf, int i, int nr)
+void parse_espec(char *bufe, int i, int nr)
 {
   char *ptr;
 
-  if ((ptr = strchr(buf, ':')) != NULL) {
+  if ((ptr = strchr(bufe, ':')) != NULL) {
     *(ptr++) = '\0';
     while (isspace(*ptr))
       ptr++;
   } else
     ptr = "";
 
-  interpret_espec(buf, ptr, i, nr);
+  interpret_espec(bufe, ptr, i, nr);
 }
 
 
@@ -1191,11 +1192,11 @@ void load_zones(FILE * fl, char *zonenam
 {
   static int zone = 0;
   int cmd_no = 0, num_of_cmds = 0, line_num = 0, tmp, error;
-  char *ptr, buf[256], zname[256];
+  char *ptr, bufz[256], zname[256];
 
   strcpy(zname, zonename);
 
-  while (get_line(fl, buf))
+  while (get_line(fl, bufz))
     num_of_cmds++;		/* this should be correct within 3 or so */
   rewind(fl);
 
@@ -1205,33 +1206,33 @@ void load_zones(FILE * fl, char *zonenam
   } else
     CREATE(Z.cmd, struct reset_com, num_of_cmds);
 
-  line_num += get_line(fl, buf);
+  line_num += get_line(fl, bufz);
 
-  if (sscanf(buf, "#%d", &Z.number) != 1) {
+  if (sscanf(bufz, "#%d", &Z.number) != 1) {
     fprintf(stderr, "Format error in %s, line %d\n", zname, line_num);
     exit(0);
   }
   sprintf(buf2, "beginning of zone #%d", Z.number);
 
-  line_num += get_line(fl, buf);
-  if ((ptr = strchr(buf, '~')) != NULL)	/* take off the '~' if it's there */
+  line_num += get_line(fl, bufz);
+  if ((ptr = strchr(bufz, '~')) != NULL)	/* take off the '~' if it's there */
     *ptr = '\0';
-  Z.name = str_dup(buf);
+  Z.name = str_dup(bufz);
 
-  line_num += get_line(fl, buf);
-  if (sscanf(buf, " %d %d %d ", &Z.top, &Z.lifespan, &Z.reset_mode) != 3) {
+  line_num += get_line(fl, bufz);
+  if (sscanf(bufz, " %d %d %d ", &Z.top, &Z.lifespan, &Z.reset_mode) != 3) {
     fprintf(stderr, "Format error in 3-constant line of %s", zname);
     exit(0);
   }
   cmd_no = 0;
 
   for (;;) {
-    if ((tmp = get_line(fl, buf)) == 0) {
+    if ((tmp = get_line(fl, bufz)) == 0) {
       fprintf(stderr, "Format error in %s - premature end of file\n", zname);
       exit(0);
     }
     line_num += tmp;
-    ptr = buf;
+    ptr = bufz;
     skip_spaces(&ptr);
 
     if ((ZCMD.command = *ptr) == '*')
@@ -1256,7 +1257,7 @@ void load_zones(FILE * fl, char *zonenam
     ZCMD.if_flag = tmp;
 
     if (error) {
-      fprintf(stderr, "Format error in %s, line %d: '%s'\n", zname, line_num, buf);
+      fprintf(stderr, "Format error in %s, line %d: '%s'\n", zname, line_num, bufz);
       exit(0);
     }
     ZCMD.line = line_num;
@@ -1269,14 +1270,14 @@ void load_zones(FILE * fl, char *zonenam
 #undef Z
 
 
-void get_one_line(FILE *fl, char *buf)
+void get_one_line(FILE *fl, char *bufl)
 {
-  if (fgets(buf, READ_SIZE, fl) == NULL) {
+  if (fgets(bufl, READ_SIZE, fl) == NULL) {
     log("error reading help file: not terminated with $?");
     exit(1);
   }
 
-  buf[strlen(buf) - 1] = '\0'; /* take off the trailing \n */
+  bufl[strlen(bufl) - 1] = '\0'; /* take off the trailing \n */
 }
 
 
@@ -1472,7 +1473,6 @@ void zone_update(void)
   int i;
   struct reset_q_element *update_u, *temp;
   static int timer = 0;
-  char buf[128];
 
   /* jelson 10/22/92 */
   if (((++timer * PULSE_ZONE) / PASSES_PER_SEC) >= 60) {
@@ -1541,14 +1541,14 @@ void zone_update(void)
 
 void log_zone_error(int zone, int cmd_no, char *message)
 {
-  char buf[256];
+  char buft[256];
 
-  sprintf(buf, "SYSERR: error in zone file: %s", message);
-  mudlog(buf, NRM, LVL_GOD, TRUE);
+  sprintf(buft, "SYSERR: error in zone file: %s", message);
+  mudlog(buft, NRM, LVL_GOD, TRUE);
 
-  sprintf(buf, "SYSERR: ...offending cmd: '%c' cmd in zone #%d, line %d",
+  sprintf(buft, "SYSERR: ...offending cmd: '%c' cmd in zone #%d, line %d",
 	  ZCMD.command, zone_table[zone].number, ZCMD.line);
-  mudlog(buf, NRM, LVL_GOD, TRUE);
+  mudlog(buft, NRM, LVL_GOD, TRUE);
 }
 
 #define ZONE_ERROR(message) \
@@ -1739,7 +1739,7 @@ int load_char(char *name, struct char_fi
 {
   int player_i;
 
-  int find_name(char *name);
+  int find_name(char *name_f);
 
   if ((player_i = find_name(name)) >= 0) {
     fseek(player_fl, (long) (player_i * sizeof(struct char_file_u)), SEEK_SET);
@@ -1989,11 +1989,11 @@ int create_entry(char *name)
 /* read and allocate space for a '~'-terminated string from a given file */
 char *fread_string(FILE * fl, char *error)
 {
-  char buf[MAX_STRING_LENGTH], tmp[512], *rslt;
+  char bufr[MAX_STRING_LENGTH], tmp[512], *rslt;
   register char *point;
   int done = 0, length = 0, templength = 0;
 
-  *buf = '\0';
+  *bufr = '\0';
 
   do {
     if (!fgets(tmp, 512, fl)) {
@@ -2019,15 +2019,15 @@ char *fread_string(FILE * fl, char *erro
       log(error);
       exit(1);
     } else {
-      strcat(buf + length, tmp);
+      strcat(bufr + length, tmp);
       length += templength;
     }
   } while (!done);
 
   /* allocate space for the new string and copy it */
-  if (strlen(buf) > 0) {
+  if (strlen(bufr) > 0) {
     CREATE(rslt, char, length + 1);
-    strcpy(rslt, buf);
+    strcpy(rslt, bufr);
   } else
     rslt = NULL;
 
@@ -2040,7 +2040,7 @@ void free_char(struct char_data * ch)
 {
   int i;
   struct alias *a;
-  void free_alias(struct alias * a);
+  void free_alias(struct alias * al);
 
   if (ch->player_specials != NULL && ch->player_specials != &dummy_mob) {
     while ((a = GET_ALIASES(ch)) != NULL) {
@@ -2139,30 +2139,30 @@ void free_obj(struct obj_data * obj)
 
 
 /* read contets of a text file, alloc space, point buf to it */
-int file_to_string_alloc(char *name, char **buf)
+int file_to_string_alloc(char *name, char **bufs)
 {
   char temp[MAX_STRING_LENGTH];
 
-  if (*buf)
-    free(*buf);
+  if (*bufs)
+    free(*bufs);
 
   if (file_to_string(name, temp) < 0) {
-    *buf = "";
+    *bufs = "";
     return -1;
   } else {
-    *buf = str_dup(temp);
+    *bufs = str_dup(temp);
     return 0;
   }
 }
 
 
 /* read contents of a text file, and place in buf */
-int file_to_string(char *name, char *buf)
+int file_to_string(char *name, char *buff)
 {
   FILE *fl;
   char tmp[READ_SIZE+3];
 
-  *buf = '\0';
+  *buff = '\0';
 
   if (!(fl = fopen(name, "r"))) {
     sprintf(tmp, "Error reading %s", name);
@@ -2175,14 +2175,14 @@ int file_to_string(char *name, char *buf
     strcat(tmp, "\r\n");
 
     if (!feof(fl)) {
-      if (strlen(buf) + strlen(tmp) + 1 > MAX_STRING_LENGTH) {
-        sprintf(buf, "SYSERR: %s: string too big (%d max)", name,
+      if (strlen(buff) + strlen(tmp) + 1 > MAX_STRING_LENGTH) {
+        sprintf(buff, "SYSERR: %s: string too big (%d max)", name,
 		MAX_STRING_LENGTH);
-	log(buf);
-	*buf = '\0';
+	log(buff);
+	*buff = '\0';
 	return -1;
       }
-      strcat(buf, tmp);
+      strcat(buff, tmp);
     }
   } while (!feof(fl));
 
diff -up ../stk/fight.c ./fight.c
--- ../stk/fight.c	Thu Jun 19 00:58:37 1997
+++ ./fight.c	Fri Jul  4 20:31:24 1997
@@ -42,6 +42,7 @@ void hit(struct char_data * ch, struct c
 void forget(struct char_data * ch, struct char_data * victim);
 void remember(struct char_data * ch, struct char_data * victim);
 int ok_damage_shopkeeper(struct char_data * ch, struct char_data * victim);
+int number(int from, int to);
 
 /* Weapon attack texts */
 struct attack_hit_type attack_hit_text[] =
@@ -165,12 +166,12 @@ void check_killer(struct char_data * ch,
   if (!PLR_FLAGGED(vict, PLR_KILLER) && !PLR_FLAGGED(vict, PLR_THIEF)
       && !PLR_FLAGGED(ch, PLR_KILLER) && !IS_NPC(ch) && !IS_NPC(vict) &&
       (ch != vict)) {
-    char buf[256];
+    char buft[256];
 
     SET_BIT(PLR_FLAGS(ch), PLR_KILLER);
-    sprintf(buf, "PC Killer bit set on %s for initiating attack on %s at %s.",
+    sprintf(buft, "PC Killer bit set on %s for initiating attack on %s at %s.",
 	    GET_NAME(ch), GET_NAME(vict), world[vict->in_room].name);
-    mudlog(buf, BRF, LVL_IMMORT, TRUE);
+    mudlog(buft, BRF, LVL_IMMORT, TRUE);
     send_to_char("If you want to be a PLAYER KILLER, so be it...\r\n", ch);
   }
 }
@@ -389,10 +390,8 @@ void group_gain(struct char_data * ch, s
 
 char *replace_string(char *str, char *weapon_singular, char *weapon_plural)
 {
-  static char buf[256];
-  char *cp;
-
-  cp = buf;
+  static char bufd[256];
+  char *cp = buf;
 
   for (; *str; str++) {
     if (*str == '#') {
@@ -413,7 +412,7 @@ char *replace_string(char *str, char *we
     *cp = 0;
   }				/* For */
 
-  return (buf);
+  return (bufd);
 }
 
 
@@ -421,7 +420,7 @@ char *replace_string(char *str, char *we
 void dam_message(int dam, struct char_data * ch, struct char_data * victim,
 		      int w_type)
 {
-  char *buf;
+  char *bufl;
   int msgnum;
 
   static struct dam_weapon_type {
@@ -501,22 +500,22 @@ void dam_message(int dam, struct char_da
   else			msgnum = 8;
 
   /* damage message to onlookers */
-  buf = replace_string(dam_weapons[msgnum].to_room,
+  bufl = replace_string(dam_weapons[msgnum].to_room,
 	  attack_hit_text[w_type].singular, attack_hit_text[w_type].plural);
-  act(buf, FALSE, ch, NULL, victim, TO_NOTVICT);
+  act(bufl, FALSE, ch, NULL, victim, TO_NOTVICT);
 
   /* damage message to damager */
   send_to_char(CCYEL(ch, C_CMP), ch);
-  buf = replace_string(dam_weapons[msgnum].to_char,
+  bufl = replace_string(dam_weapons[msgnum].to_char,
 	  attack_hit_text[w_type].singular, attack_hit_text[w_type].plural);
-  act(buf, FALSE, ch, NULL, victim, TO_CHAR);
+  act(bufl, FALSE, ch, NULL, victim, TO_CHAR);
   send_to_char(CCNRM(ch, C_CMP), ch);
 
   /* damage message to damagee */
   send_to_char(CCRED(victim, C_CMP), victim);
-  buf = replace_string(dam_weapons[msgnum].to_victim,
+  bufl = replace_string(dam_weapons[msgnum].to_victim,
 	  attack_hit_text[w_type].singular, attack_hit_text[w_type].plural);
-  act(buf, FALSE, ch, NULL, victim, TO_VICT | TO_SLEEP);
+  act(bufl, FALSE, ch, NULL, victim, TO_VICT | TO_SLEEP);
   send_to_char(CCNRM(victim, C_CMP), victim);
 }
 
diff -up ../stk/graph.c ./graph.c
--- ../stk/graph.c	Thu Jun 26 12:01:39 1997
+++ ./graph.c	Fri Jul  4 20:32:08 1997
@@ -34,6 +34,9 @@ extern int top_of_world;
 extern const char *dirs[];
 extern struct room_data *world;
 
+ACMD(do_say);
+int number(int from, int to);
+
 struct bfs_queue_struct {
   sh_int room;
   char dir;
@@ -204,7 +207,6 @@ ACMD(do_track)
 
 void hunt_victim(struct char_data * ch)
 {
-  ACMD(do_say);
   extern struct char_data *character_list;
 
   int dir;
diff -up ../stk/handler.c ./handler.c
--- ../stk/handler.c	Thu Jun 19 00:58:37 1997
+++ ./handler.c	Fri Jul  4 20:42:06 1997
@@ -35,6 +35,11 @@ void free_char(struct char_data * ch);
 void stop_fighting(struct char_data * ch);
 void remove_follower(struct char_data * ch);
 void clearMemory(struct char_data * ch);
+int number(int from, int to);
+int invalid_class(struct char_data *ch, struct obj_data *obj);
+ACMD(do_return);
+void die_follower(struct char_data * ch);
+
 
 char *fname(char *namelist)
 {
@@ -467,7 +472,6 @@ int apply_ac(struct char_data * ch, int 
 void equip_char(struct char_data * ch, struct obj_data * obj, int pos)
 {
   int j;
-  int invalid_class(struct char_data *ch, struct obj_data *obj);
 
   assert(pos >= 0 && pos < NUM_WEARS);
 
@@ -559,20 +563,20 @@ int get_number(char **name)
 {
   int i;
   char *ppos;
-  char number[MAX_INPUT_LENGTH];
+  char numbr[MAX_INPUT_LENGTH];
 
-  *number = '\0';
+  *numbr = '\0';
 
   if ((ppos = strchr(*name, '.'))) {
     *ppos++ = '\0';
-    strcpy(number, *name);
+    strcpy(numbr, *name);
     strcpy(*name, ppos);
 
-    for (i = 0; *(number + i); i++)
-      if (!isdigit(*(number + i)))
+    for (i = 0; *(numbr + i); i++)
+      if (!isdigit(*(numbr + i)))
 	return 0;
 
-    return (atoi(number));
+    return (atoi(numbr));
   }
   return 1;
 }
@@ -611,17 +615,17 @@ struct obj_data *get_obj_num(int nr)
 struct char_data *get_char_room(char *name, int room)
 {
   struct char_data *i;
-  int j = 0, number;
+  int j = 0, num;
   char tmpname[MAX_INPUT_LENGTH];
   char *tmp = tmpname;
 
   strcpy(tmp, name);
-  if (!(number = get_number(&tmp)))
+  if (!(num = get_number(&tmp)))
     return NULL;
 
-  for (i = world[room].people; i && (j <= number); i = i->next_in_room)
+  for (i = world[room].people; i && (j <= num); i = i->next_in_room)
     if (isname(tmp, i->player.name))
-      if (++j == number)
+      if (++j == num)
 	return i;
 
   return NULL;
@@ -816,10 +820,6 @@ void extract_char(struct char_data * ch)
 
   extern struct char_data *combat_list;
 
-  ACMD(do_return);
-
-  void die_follower(struct char_data * ch);
-
   if (!IS_NPC(ch) && !ch->desc) {
     for (t_desc = descriptor_list; t_desc; t_desc = t_desc->next)
       if (t_desc->original == ch)
@@ -918,7 +918,7 @@ struct char_data *get_player_vis(struct 
 struct char_data *get_char_room_vis(struct char_data * ch, char *name)
 {
   struct char_data *i;
-  int j = 0, number;
+  int j = 0, num;
   char tmpname[MAX_INPUT_LENGTH];
   char *tmp = tmpname;
 
@@ -928,13 +928,13 @@ struct char_data *get_char_room_vis(stru
 
   /* 0.<name> means PC with name */
   strcpy(tmp, name);
-  if (!(number = get_number(&tmp)))
+  if (!(num = get_number(&tmp)))
     return get_player_vis(ch, tmp, 1);
 
-  for (i = world[ch->in_room].people; i && j <= number; i = i->next_in_room)
+  for (i = world[ch->in_room].people; i && j <= num; i = i->next_in_room)
     if (isname(tmp, i->player.name))
       if (CAN_SEE(ch, i))
-	if (++j == number)
+	if (++j == num)
 	  return i;
 
   return NULL;
@@ -944,7 +944,7 @@ struct char_data *get_char_room_vis(stru
 struct char_data *get_char_vis(struct char_data * ch, char *name)
 {
   struct char_data *i;
-  int j = 0, number;
+  int j = 0, num;
   char tmpname[MAX_INPUT_LENGTH];
   char *tmp = tmpname;
 
@@ -953,12 +953,12 @@ struct char_data *get_char_vis(struct ch
     return i;
 
   strcpy(tmp, name);
-  if (!(number = get_number(&tmp)))
+  if (!(num = get_number(&tmp)))
     return get_player_vis(ch, tmp, 0);
 
-  for (i = character_list; i && (j <= number); i = i->next)
+  for (i = character_list; i && (j <= num); i = i->next)
     if (isname(tmp, i->player.name) && CAN_SEE(ch, i))
-      if (++j == number)
+      if (++j == num)
 	return i;
 
   return NULL;
@@ -970,18 +970,18 @@ struct obj_data *get_obj_in_list_vis(str
 				              struct obj_data * list)
 {
   struct obj_data *i;
-  int j = 0, number;
+  int j = 0, num;
   char tmpname[MAX_INPUT_LENGTH];
   char *tmp = tmpname;
 
   strcpy(tmp, name);
-  if (!(number = get_number(&tmp)))
+  if (!(num = get_number(&tmp)))
     return NULL;
 
-  for (i = list; i && (j <= number); i = i->next_content)
+  for (i = list; i && (j <= num); i = i->next_content)
     if (isname(tmp, i->name))
       if (CAN_SEE_OBJ(ch, i))
-	if (++j == number)
+	if (++j == num)
 	  return i;
 
   return NULL;
@@ -994,7 +994,7 @@ struct obj_data *get_obj_in_list_vis(str
 struct obj_data *get_obj_vis(struct char_data * ch, char *name)
 {
   struct obj_data *i;
-  int j = 0, number;
+  int j = 0, num;
   char tmpname[MAX_INPUT_LENGTH];
   char *tmp = tmpname;
 
@@ -1007,14 +1007,14 @@ struct obj_data *get_obj_vis(struct char
     return i;
 
   strcpy(tmp, name);
-  if (!(number = get_number(&tmp)))
+  if (!(num = get_number(&tmp)))
     return NULL;
 
   /* ok.. no luck yet. scan the entire obj list   */
-  for (i = object_list; i && (j <= number); i = i->next)
+  for (i = object_list; i && (j <= num); i = i->next)
     if (isname(tmp, i->name))
       if (CAN_SEE_OBJ(ch, i))
-	if (++j == number)
+	if (++j == num)
 	  return i;
 
   return NULL;
@@ -1023,12 +1023,12 @@ struct obj_data *get_obj_vis(struct char
 
 
 struct obj_data *get_object_in_equip_vis(struct char_data * ch,
-		           char *arg, struct obj_data * equipment[], int *j)
+		           char *arge, struct obj_data * equipment[], int *j)
 {
   for ((*j) = 0; (*j) < NUM_WEARS; (*j)++)
     if (equipment[(*j)])
       if (CAN_SEE_OBJ(ch, equipment[(*j)]))
-	if (isname(arg, equipment[(*j)]->name))
+	if (isname(arge, equipment[(*j)]->name))
 	  return (equipment[(*j)]);
 
   return NULL;
@@ -1037,44 +1037,44 @@ struct obj_data *get_object_in_equip_vis
 
 char *money_desc(int amount)
 {
-  static char buf[128];
+  static char bufr[128];
 
   if (amount <= 0) {
     log("SYSERR: Try to create negative or 0 money.");
     return NULL;
   }
   if (amount == 1)
-    strcpy(buf, "a gold coin");
+    strcpy(bufr, "a gold coin");
   else if (amount <= 10)
-    strcpy(buf, "a tiny pile of gold coins");
+    strcpy(bufr, "a tiny pile of gold coins");
   else if (amount <= 20)
-    strcpy(buf, "a handful of gold coins");
+    strcpy(bufr, "a handful of gold coins");
   else if (amount <= 75)
-    strcpy(buf, "a little pile of gold coins");
+    strcpy(bufr, "a little pile of gold coins");
   else if (amount <= 200)
-    strcpy(buf, "a small pile of gold coins");
+    strcpy(bufr, "a small pile of gold coins");
   else if (amount <= 1000)
-    strcpy(buf, "a pile of gold coins");
+    strcpy(bufr, "a pile of gold coins");
   else if (amount <= 5000)
-    strcpy(buf, "a big pile of gold coins");
+    strcpy(bufr, "a big pile of gold coins");
   else if (amount <= 10000)
-    strcpy(buf, "a large heap of gold coins");
+    strcpy(bufr, "a large heap of gold coins");
   else if (amount <= 20000)
-    strcpy(buf, "a huge mound of gold coins");
+    strcpy(bufr, "a huge mound of gold coins");
   else if (amount <= 75000)
-    strcpy(buf, "an enormous mound of gold coins");
+    strcpy(bufr, "an enormous mound of gold coins");
   else if (amount <= 150000)
-    strcpy(buf, "a small mountain of gold coins");
+    strcpy(bufr, "a small mountain of gold coins");
   else if (amount <= 250000)
-    strcpy(buf, "a mountain of gold coins");
+    strcpy(bufr, "a mountain of gold coins");
   else if (amount <= 500000)
-    strcpy(buf, "a huge mountain of gold coins");
+    strcpy(bufr, "a huge mountain of gold coins");
   else if (amount <= 1000000)
-    strcpy(buf, "an enormous mountain of gold coins");
+    strcpy(bufr, "an enormous mountain of gold coins");
   else
-    strcpy(buf, "an absolutely colossal mountain of gold coins");
+    strcpy(bufr, "an absolutely colossal mountain of gold coins");
 
-  return buf;
+  return bufr;
 }
 
 
@@ -1082,7 +1082,7 @@ struct obj_data *create_money(int amount
 {
   struct obj_data *obj;
   struct extra_descr_data *new_descr;
-  char buf[200];
+  char bufm[200];
 
   if (amount <= 0) {
     log("SYSERR: Try to create negative or 0 money.");
@@ -1100,23 +1100,23 @@ struct obj_data *create_money(int amount
   } else {
     obj->name = str_dup("coins gold");
     obj->short_description = str_dup(money_desc(amount));
-    sprintf(buf, "%s is lying here.", money_desc(amount));
-    obj->description = str_dup(CAP(buf));
+    sprintf(bufm, "%s is lying here.", money_desc(amount));
+    obj->description = str_dup(CAP(bufm));
 
     new_descr->keyword = str_dup("coins gold");
     if (amount < 10) {
-      sprintf(buf, "There are %d coins.", amount);
-      new_descr->description = str_dup(buf);
+      sprintf(bufm, "There are %d coins.", amount);
+      new_descr->description = str_dup(bufm);
     } else if (amount < 100) {
-      sprintf(buf, "There are about %d coins.", 10 * (amount / 10));
-      new_descr->description = str_dup(buf);
+      sprintf(bufm, "There are about %d coins.", 10 * (amount / 10));
+      new_descr->description = str_dup(bufm);
     } else if (amount < 1000) {
-      sprintf(buf, "It looks to be about %d coins.", 100 * (amount / 100));
-      new_descr->description = str_dup(buf);
+      sprintf(bufm, "It looks to be about %d coins.", 100 * (amount / 100));
+      new_descr->description = str_dup(bufm);
     } else if (amount < 100000) {
-      sprintf(buf, "You guess there are, maybe, %d coins.",
+      sprintf(bufm, "You guess there are, maybe, %d coins.",
 	      1000 * ((amount / 1000) + number(0, (amount / 1000))));
-      new_descr->description = str_dup(buf);
+      new_descr->description = str_dup(bufm);
     } else
       new_descr->description = str_dup("There are a LOT of coins.");
   }
@@ -1148,13 +1148,13 @@ struct obj_data *create_money(int amount
 /* The routine returns a pointer to the next word in *arg (just like the  */
 /* one_argument routine).                                                 */
 
-int generic_find(char *arg, int bitvector, struct char_data * ch,
+int generic_find(char *argf, int bitvector, struct char_data * ch,
 		     struct char_data ** tar_ch, struct obj_data ** tar_obj)
 {
   int i, found;
   char name[256];
 
-  one_argument(arg, name);
+  one_argument(argf, name);
 
   if (!*name)
     return (0);
@@ -1202,12 +1202,12 @@ int generic_find(char *arg, int bitvecto
 
 
 /* a function to scan for "all" or "all.x" */
-int find_all_dots(char *arg)
+int find_all_dots(char *argd)
 {
-  if (!strcmp(arg, "all"))
+  if (!strcmp(argd, "all"))
     return FIND_ALL;
-  else if (!strncmp(arg, "all.", 4)) {
-    strcpy(arg, arg + 4);
+  else if (!strncmp(argd, "all.", 4)) {
+    strcpy(argd, argd + 4);
     return FIND_ALLDOT;
   } else
     return FIND_INDIV;
diff -up ../stk/handler.h ./handler.h
--- ../stk/handler.h	Thu Jun 19 00:58:37 1997
+++ ./handler.h	Fri Jul  4 19:53:08 1997
@@ -65,12 +65,12 @@ struct obj_data *get_obj_in_list_vis(str
 struct obj_data *list);
 struct obj_data *get_obj_vis(struct char_data *ch, char *name);
 struct obj_data *get_object_in_equip_vis(struct char_data *ch,
-char *arg, struct obj_data *equipment[], int *j);
+char *argt, struct obj_data *equipment[], int *j);
 
 
 /* find all dots */
 
-int	find_all_dots(char *arg);
+int	find_all_dots(char *argd);
 
 #define FIND_INDIV	0
 #define FIND_ALL	1
@@ -79,8 +79,8 @@ int	find_all_dots(char *arg);
 
 /* Generic Find */
 
-int	generic_find(char *arg, int bitvector, struct char_data *ch,
-struct char_data **tar_ch, struct obj_data **tar_obj);
+int	generic_find(char *argf, int bitvector, struct char_data *ch,
+		struct char_data **tar_ch, struct obj_data **tar_obj);
 
 #define FIND_CHAR_ROOM     1
 #define FIND_CHAR_WORLD    2
diff -up ../stk/house.c ./house.c
--- ../stk/house.c	Thu Jun 19 00:58:37 1997
+++ ./house.c	Fri Jul  4 20:47:27 1997
@@ -52,15 +52,15 @@ int House_get_filename(int vnum, char *f
 int House_load(int vnum)
 {
   FILE *fl;
-  char fname[MAX_STRING_LENGTH];
+  char flname[MAX_STRING_LENGTH];
   struct obj_file_elem object;
   int rnum;
 
   if ((rnum = real_room(vnum)) == -1)
     return 0;
-  if (!House_get_filename(vnum, fname))
+  if (!House_get_filename(vnum, flname))
     return 0;
-  if (!(fl = fopen(fname, "r+b"))) {
+  if (!(fl = fopen(flname, "r+b"))) {
     /* no file found */
     return 0;
   }
@@ -118,7 +118,6 @@ void House_restore_weight(struct obj_dat
 void House_crashsave(int vnum)
 {
   int rnum;
-  char buf[MAX_STRING_LENGTH];
   FILE *fp;
 
   if ((rnum = real_room(vnum)) == -1)
@@ -142,12 +141,12 @@ void House_crashsave(int vnum)
 /* Delete a house save file */
 void House_delete_file(int vnum)
 {
-  char buf[MAX_INPUT_LENGTH], fname[MAX_INPUT_LENGTH];
+  char flname[MAX_INPUT_LENGTH];
   FILE *fl;
 
-  if (!House_get_filename(vnum, fname))
+  if (!House_get_filename(vnum, flname))
     return;
-  if (!(fl = fopen(fname, "rb"))) {
+  if (!(fl = fopen(flname, "rb"))) {
     if (errno != ENOENT) {
       sprintf(buf, "SYSERR: Error deleting house file #%d. (1)", vnum);
       perror(buf);
@@ -155,7 +154,7 @@ void House_delete_file(int vnum)
     return;
   }
   fclose(fl);
-  if (unlink(fname) < 0) {
+  if (unlink(flname) < 0) {
     sprintf(buf, "SYSERR: Error deleting house file #%d. (2)", vnum);
     perror(buf);
   }
@@ -166,15 +165,14 @@ void House_delete_file(int vnum)
 void House_listrent(struct char_data * ch, int vnum)
 {
   FILE *fl;
-  char fname[MAX_STRING_LENGTH];
-  char buf[MAX_STRING_LENGTH];
+  char flname[MAX_STRING_LENGTH];
   struct obj_file_elem object;
   struct obj_data *obj;
 
 
-  if (!House_get_filename(vnum, fname))
+  if (!House_get_filename(vnum, flname))
     return;
-  if (!(fl = fopen(fname, "rb"))) {
+  if (!(fl = fopen(flname, "rb"))) {
     sprintf(buf, "No objects on file for house #%d.\r\n", vnum);
     send_to_char(buf, ch);
     return;
@@ -343,7 +341,7 @@ void hcontrol_list_houses(struct char_da
 
 
 
-void hcontrol_build_house(struct char_data * ch, char *arg)
+void hcontrol_build_house(struct char_data * ch, char *argb)
 {
   char arg1[MAX_INPUT_LENGTH];
   struct house_control_rec temp_house;
@@ -356,7 +354,7 @@ void hcontrol_build_house(struct char_da
   }
 
   /* first arg: house's vnum */
-  arg = one_argument(arg, arg1);
+  argb = one_argument(argb, arg1);
   if (!*arg1) {
     send_to_char(HCONTROL_FORMAT, ch);
     return;
@@ -372,7 +370,7 @@ void hcontrol_build_house(struct char_da
   }
 
   /* second arg: direction of house's exit */
-  arg = one_argument(arg, arg1);
+  argb = one_argument(argb, arg1);
   if (!*arg1) {
     send_to_char(HCONTROL_FORMAT, ch);
     return;
@@ -398,7 +396,7 @@ void hcontrol_build_house(struct char_da
   }
 
   /* third arg: player's name */
-  arg = one_argument(arg, arg1);
+  argb = one_argument(argb, arg1);
   if (!*arg1) {
     send_to_char(HCONTROL_FORMAT, ch);
     return;
@@ -430,16 +428,16 @@ void hcontrol_build_house(struct char_da
 
 
 
-void hcontrol_destroy_house(struct char_data * ch, char *arg)
+void hcontrol_destroy_house(struct char_data * ch, char *argd)
 {
   int i, j;
   sh_int real_atrium, real_house;
 
-  if (!*arg) {
+  if (!*argd) {
     send_to_char(HCONTROL_FORMAT, ch);
     return;
   }
-  if ((i = find_house(atoi(arg))) < 0) {
+  if ((i = find_house(atoi(argd))) < 0) {
     send_to_char("Unknown house.\r\n", ch);
     return;
   }
@@ -475,16 +473,16 @@ void hcontrol_destroy_house(struct char_
 }
 
 
-void hcontrol_pay_house(struct char_data * ch, char *arg)
+void hcontrol_pay_house(struct char_data * ch, char *argh)
 {
   int i;
 
-  if (!*arg)
+  if (!*argh)
     send_to_char(HCONTROL_FORMAT, ch);
-  else if ((i = find_house(atoi(arg))) < 0)
+  else if ((i = find_house(atoi(argh))) < 0)
     send_to_char("Unknown house.\r\n", ch);
   else {
-    sprintf(buf, "Payment for house %s collected by %s.", arg, GET_NAME(ch));
+    sprintf(buf, "Payment for house %s collected by %s.", argh, GET_NAME(ch));
     mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
 
     house_control[i].last_payment = time(0);
diff -up ../stk/interpreter.c ./interpreter.c
--- ../stk/interpreter.c	Thu Jun 19 00:58:37 1997
+++ ./interpreter.c	Fri Jul  4 20:55:33 1997
@@ -47,7 +47,7 @@ void echo_off(struct descriptor_data *d)
 void do_start(struct char_data *ch);
 void init_char(struct char_data *ch);
 int create_entry(char *name);
-int special(struct char_data *ch, int cmd, char *arg);
+int special(struct char_data *ch, int cmd, char *args);
 int isbanned(char *hostname);
 int Valid_Name(char *newname);
 
@@ -822,24 +822,24 @@ int perform_alias(struct descriptor_data
  * it to be returned.  Returns -1 if not found; 0..n otherwise.  Array
  * must be terminated with a '\n' so it knows to stop searching.
  */
-int search_block(char *arg, char **list, bool exact)
+int search_block(char *argb, char **list, bool exact)
 {
   register int i, l;
 
   /* Make into lower case, and get length of string */
-  for (l = 0; *(arg + l); l++)
-    *(arg + l) = LOWER(*(arg + l));
+  for (l = 0; *(argb + l); l++)
+    *(argb + l) = LOWER(*(argb + l));
 
   if (exact) {
     for (i = 0; **(list + i) != '\n'; i++)
-      if (!strcmp(arg, *(list + i)))
+      if (!strcmp(argb, *(list + i)))
 	return (i);
   } else {
     if (!l)
       l = 1;			/* Avoid "" to match the first available
 				 * string */
     for (i = 0; **(list + i) != '\n'; i++)
-      if (!strncmp(arg, *(list + i), l))
+      if (!strncmp(argb, *(list + i), l))
 	return (i);
   }
 
@@ -865,19 +865,19 @@ void skip_spaces(char **string)
 
 char *delete_doubledollar(char *string)
 {
-  char *read, *write;
+  char *reads, *writes;
 
-  if ((write = strchr(string, '$')) == NULL)
+  if ((writes = strchr(string, '$')) == NULL)
     return string;
 
-  read = write;
+  reads = writes;
 
-  while (*read)
-    if ((*(write++) = *(read++)) == '$')
-      if (*read == '$')
-	read++;
+  while (*reads)
+    if ((*(writes++) = *(reads++)) == '$')
+      if (*reads == '$')
+	reads++;
 
-  *write = '\0';
+  *writes = '\0';
 
   return string;
 }
@@ -1030,7 +1030,7 @@ int find_command(char *command)
 }
 
 
-int special(struct char_data *ch, int cmd, char *arg)
+int special(struct char_data *ch, int cmd, char *args)
 {
   register struct obj_data *i;
   register struct char_data *k;
@@ -1038,31 +1038,31 @@ int special(struct char_data *ch, int cm
 
   /* special in room? */
   if (GET_ROOM_SPEC(ch->in_room) != NULL)
-    if (GET_ROOM_SPEC(ch->in_room) (ch, world + ch->in_room, cmd, arg))
+    if (GET_ROOM_SPEC(ch->in_room) (ch, world + ch->in_room, cmd, args))
       return 1;
 
   /* special in equipment list? */
   for (j = 0; j < NUM_WEARS; j++)
     if (GET_EQ(ch, j) && GET_OBJ_SPEC(GET_EQ(ch, j)) != NULL)
-      if (GET_OBJ_SPEC(GET_EQ(ch, j)) (ch, GET_EQ(ch, j), cmd, arg))
+      if (GET_OBJ_SPEC(GET_EQ(ch, j)) (ch, GET_EQ(ch, j), cmd, args))
 	return 1;
 
   /* special in inventory? */
   for (i = ch->carrying; i; i = i->next_content)
     if (GET_OBJ_SPEC(i) != NULL)
-      if (GET_OBJ_SPEC(i) (ch, i, cmd, arg))
+      if (GET_OBJ_SPEC(i) (ch, i, cmd, args))
 	return 1;
 
   /* special in mobile present? */
   for (k = world[ch->in_room].people; k; k = k->next_in_room)
     if (GET_MOB_SPEC(k) != NULL)
-      if (GET_MOB_SPEC(k) (ch, k, cmd, arg))
+      if (GET_MOB_SPEC(k) (ch, k, cmd, args))
 	return 1;
 
   /* special in object present? */
   for (i = world[ch->in_room].contents; i; i = i->next_content)
     if (GET_OBJ_SPEC(i) != NULL)
-      if (GET_OBJ_SPEC(i) (ch, i, cmd, arg))
+      if (GET_OBJ_SPEC(i) (ch, i, cmd, args))
 	return 1;
 
   return 0;
@@ -1089,15 +1089,15 @@ int find_name(char *name)
 }
 
 
-int _parse_name(char *arg, char *name)
+int _parse_name(char *argp, char *name)
 {
   int i;
 
   /* skip whitespaces */
-  for (; isspace(*arg); arg++);
+  for (; isspace(*argp); argp++);
 
-  for (i = 0; (*name = *arg); arg++, i++, name++)
-    if (!isalpha(*arg))
+  for (i = 0; (*name = *argp); argp++, i++, name++)
+    if (!isalpha(*argp))
       return 1;
 
   if (!i)
@@ -1236,9 +1236,9 @@ int perform_dupe_check(struct descriptor
 
 
 /* deal with newcomers and other non-playing sockets */
-void nanny(struct descriptor_data *d, char *arg)
+void nanny(struct descriptor_data *d, char *argn)
 {
-  char buf[128];
+  char bufn[128];
   int player_i, load_result;
   char tmp_name[MAX_INPUT_LENGTH];
   struct char_file_u tmp_store;
@@ -1250,9 +1250,9 @@ void nanny(struct descriptor_data *d, ch
   sh_int load_room;
 
   int load_char(char *name, struct char_file_u *char_element);
-  int parse_class(char arg);
+  int parse_class(char argc);
 
-  skip_spaces(&arg);
+  skip_spaces(&argn);
 
   switch (STATE(d)) {
   case CON_GET_NAME:		/* wait for input of name */
@@ -1262,12 +1262,12 @@ void nanny(struct descriptor_data *d, ch
       CREATE(d->character->player_specials, struct player_special_data, 1);
       d->character->desc = d;
     }
-    if (!*arg)
+    if (!*argn)
       close_socket(d);
     else {
-      if ((_parse_name(arg, tmp_name)) || strlen(tmp_name) < 2 ||
+      if ((_parse_name(argn, tmp_name)) || strlen(tmp_name) < 2 ||
 	  strlen(tmp_name) > MAX_NAME_LENGTH ||
-	  fill_word(strcpy(buf, tmp_name)) || reserved_word(buf)) {
+	  fill_word(strcpy(bufn, tmp_name)) || reserved_word(bufn)) {
 	SEND_TO_Q("Invalid name, please try another.\r\n"
 		  "Name: ", d);
 	return;
@@ -1285,8 +1285,8 @@ void nanny(struct descriptor_data *d, ch
 	  CREATE(d->character->player.name, char, strlen(tmp_name) + 1);
 	  strcpy(d->character->player.name, CAP(tmp_name));
 	  GET_PFILEPOS(d->character) = player_i;
-	  sprintf(buf, "Did I get that right, %s (Y/N)? ", tmp_name);
-	  SEND_TO_Q(buf, d);
+	  sprintf(bufn, "Did I get that right, %s (Y/N)? ", tmp_name);
+	  SEND_TO_Q(bufn, d);
 	  STATE(d) = CON_NAME_CNFRM;
 	} else {
 	  /* undo it just in case they are set */
@@ -1309,36 +1309,36 @@ void nanny(struct descriptor_data *d, ch
 	CREATE(d->character->player.name, char, strlen(tmp_name) + 1);
 	strcpy(d->character->player.name, CAP(tmp_name));
 
-	sprintf(buf, "Did I get that right, %s (Y/N)? ", tmp_name);
-	SEND_TO_Q(buf, d);
+	sprintf(bufn, "Did I get that right, %s (Y/N)? ", tmp_name);
+	SEND_TO_Q(bufn, d);
 	STATE(d) = CON_NAME_CNFRM;
       }
     }
     break;
   case CON_NAME_CNFRM:		/* wait for conf. of new name    */
-    if (UPPER(*arg) == 'Y') {
+    if (UPPER(*argn) == 'Y') {
       if (isbanned(d->host) >= BAN_NEW) {
-	sprintf(buf, "Request for new char %s denied from [%s] (siteban)",
+	sprintf(bufn, "Request for new char %s denied from [%s] (siteban)",
 		GET_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
+	mudlog(bufn, NRM, LVL_GOD, TRUE);
 	SEND_TO_Q("Sorry, new characters are not allowed from your site!\r\n", d);
 	STATE(d) = CON_CLOSE;
 	return;
       }
       if (restrict) {
 	SEND_TO_Q("Sorry, new players can't be created at the moment.\r\n", d);
-	sprintf(buf, "Request for new char %s denied from %s (wizlock)",
+	sprintf(bufn, "Request for new char %s denied from %s (wizlock)",
 		GET_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
+	mudlog(bufn, NRM, LVL_GOD, TRUE);
 	STATE(d) = CON_CLOSE;
 	return;
       }
       SEND_TO_Q("New character.\r\n", d);
-      sprintf(buf, "Give me a password for %s: ", GET_NAME(d->character));
-      SEND_TO_Q(buf, d);
+      sprintf(bufn, "Give me a password for %s: ", GET_NAME(d->character));
+      SEND_TO_Q(bufn, d);
       echo_off(d);
       STATE(d) = CON_NEWPASSWD;
-    } else if (*arg == 'n' || *arg == 'N') {
+    } else if (*argn == 'n' || *argn == 'N') {
       SEND_TO_Q("Okay, what IS it, then? ", d);
       free(d->character->player.name);
       d->character->player.name = NULL;
@@ -1360,12 +1360,12 @@ void nanny(struct descriptor_data *d, ch
 
     echo_on(d);    /* turn echo back on */
 
-    if (!*arg)
+    if (!*argn)
       close_socket(d);
     else {
-      if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
-	sprintf(buf, "Bad PW: %s [%s]", GET_NAME(d->character), d->host);
-	mudlog(buf, BRF, LVL_GOD, TRUE);
+      if (strncmp(CRYPT(argn, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
+	sprintf(bufn, "Bad PW: %s [%s]", GET_NAME(d->character), d->host);
+	mudlog(bufn, BRF, LVL_GOD, TRUE);
 	GET_BAD_PWS(d->character)++;
 	save_char(d->character, NOWHERE);
 	if (++(d->bad_pws) >= max_bad_pws) {	/* 3 strikes and you're out. */
@@ -1384,17 +1384,17 @@ void nanny(struct descriptor_data *d, ch
 	  !PLR_FLAGGED(d->character, PLR_SITEOK)) {
 	SEND_TO_Q("Sorry, this char has not been cleared for login from your site!\r\n", d);
 	STATE(d) = CON_CLOSE;
-	sprintf(buf, "Connection attempt for %s denied from %s",
+	sprintf(bufn, "Connection attempt for %s denied from %s",
 		GET_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
+	mudlog(bufn, NRM, LVL_GOD, TRUE);
 	return;
       }
       if (GET_LEVEL(d->character) < restrict) {
 	SEND_TO_Q("The game is temporarily restricted.. try again later.\r\n", d);
 	STATE(d) = CON_CLOSE;
-	sprintf(buf, "Request for login denied for %s [%s] (wizlock)",
+	sprintf(bufn, "Request for login denied for %s [%s] (wizlock)",
 		GET_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
+	mudlog(bufn, NRM, LVL_GOD, TRUE);
 	return;
       }
       /* check and make sure no other copies of this player are logged in */
@@ -1406,15 +1406,15 @@ void nanny(struct descriptor_data *d, ch
       else
 	SEND_TO_Q(motd, d);
 
-      sprintf(buf, "%s [%s] has connected.", GET_NAME(d->character), d->host);
-      mudlog(buf, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE);
+      sprintf(bufn, "%s [%s] has connected.", GET_NAME(d->character), d->host);
+      mudlog(bufn, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE);
 
       if (load_result) {
-	sprintf(buf, "\r\n\r\n\007\007\007"
+	sprintf(bufn, "\r\n\r\n\007\007\007"
 		"%s%d LOGIN FAILURE%s SINCE LAST SUCCESSFUL LOGIN.%s\r\n",
 		CCRED(d->character, C_SPR), load_result,
 		(load_result > 1) ? "S" : "", CCNRM(d->character, C_SPR));
-	SEND_TO_Q(buf, d);
+	SEND_TO_Q(bufn, d);
 	GET_BAD_PWS(d->character) = 0;
       }
       SEND_TO_Q("\r\n\n*** PRESS RETURN: ", d);
@@ -1424,13 +1424,13 @@ void nanny(struct descriptor_data *d, ch
 
   case CON_NEWPASSWD:
   case CON_CHPWD_GETNEW:
-    if (!*arg || strlen(arg) > MAX_PWD_LENGTH || strlen(arg) < 3 ||
-	!str_cmp(arg, GET_NAME(d->character))) {
+    if (!*argn || strlen(argn) > MAX_PWD_LENGTH || strlen(argn) < 3 ||
+	!str_cmp(argn, GET_NAME(d->character))) {
       SEND_TO_Q("\r\nIllegal password.\r\n", d);
       SEND_TO_Q("Password: ", d);
       return;
     }
-    strncpy(GET_PASSWD(d->character), CRYPT(arg, GET_NAME(d->character)), MAX_PWD_LENGTH);
+    strncpy(GET_PASSWD(d->character), CRYPT(argn, GET_NAME(d->character)), MAX_PWD_LENGTH);
     *(GET_PASSWD(d->character) + MAX_PWD_LENGTH) = '\0';
 
     SEND_TO_Q("\r\nPlease retype password: ", d);
@@ -1443,7 +1443,7 @@ void nanny(struct descriptor_data *d, ch
 
   case CON_CNFPASSWD:
   case CON_CHPWD_VRFY:
-    if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character),
+    if (strncmp(CRYPT(argn, GET_PASSWD(d->character)), GET_PASSWD(d->character),
 		MAX_PWD_LENGTH)) {
       SEND_TO_Q("\r\nPasswords don't match... start over.\r\n", d);
       SEND_TO_Q("Password: ", d);
@@ -1469,7 +1469,7 @@ void nanny(struct descriptor_data *d, ch
     break;
 
   case CON_QSEX:		/* query sex of new user         */
-    switch (*arg) {
+    switch (*argn) {
     case 'm':
     case 'M':
       d->character->player.sex = SEX_MALE;
@@ -1491,7 +1491,7 @@ void nanny(struct descriptor_data *d, ch
     break;
 
   case CON_QCLASS:
-    load_result = parse_class(*arg);
+    load_result = parse_class(*argn);
     if (load_result == CLASS_UNDEFINED) {
       SEND_TO_Q("\r\nThat's not a class.\r\nClass: ", d);
       return;
@@ -1506,8 +1506,8 @@ void nanny(struct descriptor_data *d, ch
     SEND_TO_Q("\r\n\n*** PRESS RETURN: ", d);
     STATE(d) = CON_RMOTD;
 
-    sprintf(buf, "%s [%s] new player.", GET_NAME(d->character), d->host);
-    mudlog(buf, NRM, LVL_IMMORT, TRUE);
+    sprintf(bufn, "%s [%s] new player.", GET_NAME(d->character), d->host);
+    mudlog(bufn, NRM, LVL_IMMORT, TRUE);
     break;
 
   case CON_RMOTD:		/* read CR after printing motd   */
@@ -1516,7 +1516,7 @@ void nanny(struct descriptor_data *d, ch
     break;
 
   case CON_MENU:		/* get selection from main menu  */
-    switch (*arg) {
+    switch (*argn) {
     case '0':
       close_socket(d);
       break;
@@ -1606,7 +1606,7 @@ void nanny(struct descriptor_data *d, ch
     break;
 
   case CON_CHPWD_GETOLD:
-    if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
+    if (strncmp(CRYPT(argn, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
       echo_on(d);
       SEND_TO_Q("\r\nIncorrect password.\r\n", d);
       SEND_TO_Q(MENU, d);
@@ -1621,7 +1621,7 @@ void nanny(struct descriptor_data *d, ch
 
   case CON_DELCNF1:
     echo_on(d);
-    if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
+    if (strncmp(CRYPT(argn, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
       SEND_TO_Q("\r\nIncorrect password.\r\n", d);
       SEND_TO_Q(MENU, d);
       STATE(d) = CON_MENU;
@@ -1634,7 +1634,7 @@ void nanny(struct descriptor_data *d, ch
     break;
 
   case CON_DELCNF2:
-    if (!strcmp(arg, "yes") || !strcmp(arg, "YES")) {
+    if (!strcmp(argn, "yes") || !strcmp(argn, "YES")) {
       if (PLR_FLAGGED(d->character, PLR_FROZEN)) {
 	SEND_TO_Q("You try to kill yourself, but the ice stops you.\r\n", d);
 	SEND_TO_Q("Character not deleted.\r\n\r\n", d);
@@ -1645,12 +1645,12 @@ void nanny(struct descriptor_data *d, ch
 	SET_BIT(PLR_FLAGS(d->character), PLR_DELETED);
       save_char(d->character, NOWHERE);
       Crash_delete_file(GET_NAME(d->character));
-      sprintf(buf, "Character '%s' deleted!\r\n"
+      sprintf(bufn, "Character '%s' deleted!\r\n"
 	      "Goodbye.\r\n", GET_NAME(d->character));
-      SEND_TO_Q(buf, d);
-      sprintf(buf, "%s (lev %d) has self-deleted.", GET_NAME(d->character),
+      SEND_TO_Q(bufn, d);
+      sprintf(bufn, "%s (lev %d) has self-deleted.", GET_NAME(d->character),
 	      GET_LEVEL(d->character));
-      mudlog(buf, NRM, LVL_GOD, TRUE);
+      mudlog(bufn, NRM, LVL_GOD, TRUE);
       STATE(d) = CON_CLOSE;
       return;
     } else {
diff -up ../stk/interpreter.h ./interpreter.h
--- ../stk/interpreter.h	Thu Jun 19 00:58:37 1997
+++ ./interpreter.h	Fri Jul  4 19:51:28 1997
@@ -22,7 +22,7 @@ extern struct command_info cmd_info[];
 
 
 void	command_interpreter(struct char_data *ch, char *argument);
-int	search_block(char *arg, char **list, bool exact);
+int	search_block(char *argb, char **list, bool exact);
 char	lower( char c );
 char	*one_argument(char *argument, char *first_arg);
 char	*one_word(char *argument, char *first_arg);
@@ -30,7 +30,7 @@ char	*any_one_arg(char *argument, char *
 char	*two_arguments(char *argument, char *first_arg, char *second_arg);
 int	fill_word(char *argument);
 void	half_chop(char *string, char *arg1, char *arg2);
-void	nanny(struct descriptor_data *d, char *arg);
+void	nanny(struct descriptor_data *d, char *argn);
 int	is_abbrev(char *arg1, char *arg2);
 int	is_number(char *str);
 int	find_command(char *command);
diff -up ../stk/limits.c ./limits.c
--- ../stk/limits.c	Thu Jun 19 00:58:37 1997
+++ ./limits.c	Fri Jul  4 21:00:17 1997
@@ -30,6 +30,7 @@ extern struct room_data *world;
 extern int max_exp_gain;
 extern int max_exp_loss;
 
+void Crash_rentsave(struct char_data *ch, int cost);
 
 /* When age < 15 return the value p0 */
 /* When age in 15..29 calculate the line between p1 & p2 */
@@ -37,19 +38,19 @@ extern int max_exp_loss;
 /* When age in 45..59 calculate the line between p3 & p4 */
 /* When age in 60..79 calculate the line between p4 & p5 */
 /* When age >= 80 return the value p6 */
-int graf(int age, int p0, int p1, int p2, int p3, int p4, int p5, int p6)
+int graf(int ageg, int p0, int p1, int p2, int p3, int p4, int p5, int p6)
 {
 
-  if (age < 15)
+  if (ageg < 15)
     return (p0);		/* < 15   */
-  else if (age <= 29)
-    return (int) (p1 + (((age - 15) * (p2 - p1)) / 15));	/* 15..29 */
-  else if (age <= 44)
-    return (int) (p2 + (((age - 30) * (p3 - p2)) / 15));	/* 30..44 */
-  else if (age <= 59)
-    return (int) (p3 + (((age - 45) * (p4 - p3)) / 15));	/* 45..59 */
-  else if (age <= 79)
-    return (int) (p4 + (((age - 60) * (p5 - p4)) / 20));	/* 60..79 */
+  else if (ageg <= 29)
+    return (int) (p1 + (((ageg - 15) * (p2 - p1)) / 15));	/* 15..29 */
+  else if (ageg <= 44)
+    return (int) (p2 + (((ageg - 30) * (p3 - p2)) / 15));	/* 30..44 */
+  else if (ageg <= 59)
+    return (int) (p3 + (((ageg - 45) * (p4 - p3)) / 15));	/* 45..59 */
+  else if (ageg <= 79)
+    return (int) (p4 + (((ageg - 60) * (p5 - p4)) / 20));	/* 60..79 */
   else
     return (p6);		/* >= 80 */
 }
@@ -209,16 +210,16 @@ void set_title(struct char_data * ch, ch
 
 void check_autowiz(struct char_data * ch)
 {
-  char buf[100];
+  char bufr[100];
   extern int use_autowiz;
   extern int min_wizlist_lev;
   pid_t getpid(void);
 
   if (use_autowiz && GET_LEVEL(ch) >= LVL_IMMORT) {
-    sprintf(buf, "nice ../bin/autowiz %d %s %d %s %d &", min_wizlist_lev,
+    sprintf(bufr, "nice ../bin/autowiz %d %s %d %s %d &", min_wizlist_lev,
 	    WIZLIST_FILE, LVL_IMMORT, IMMLIST_FILE, (int) getpid());
     mudlog("Initiating autowiz.", CMP, LVL_IMMORT, FALSE);
-    system(buf);
+    system(bufr);
   }
 }
 
@@ -228,7 +229,7 @@ void gain_exp(struct char_data * ch, int
 {
   int is_altered = FALSE;
   int num_levels = 0;
-  char buf[128];
+  char bufe[128];
 
   if (!IS_NPC(ch) && ((GET_LEVEL(ch) < 1 || GET_LEVEL(ch) >= LVL_IMMORT)))
     return;
@@ -252,8 +253,8 @@ void gain_exp(struct char_data * ch, int
       if (num_levels == 1)
         send_to_char("You rise a level!\r\n", ch);
       else {
-	sprintf(buf, "You rise %d levels!\r\n", num_levels);
-	send_to_char(buf, ch);
+	sprintf(bufe, "You rise %d levels!\r\n", num_levels);
+	send_to_char(bufe, ch);
       }
       set_title(ch, NULL);
       check_autowiz(ch);
@@ -337,7 +338,6 @@ void gain_condition(struct char_data * c
 void check_idling(struct char_data * ch)
 {
   extern int free_rent;
-  void Crash_rentsave(struct char_data *ch, int cost);
 
   if (++(ch->char_specials.timer) > 8)
     if (GET_WAS_IN(ch) == NOWHERE && ch->in_room != NOWHERE) {
diff -up ../stk/magic.c ./magic.c
--- ../stk/magic.c	Thu Jun 19 00:58:37 1997
+++ ./magic.c	Fri Jul  4 21:03:02 1997
@@ -39,13 +39,13 @@ extern struct apply_mod_defaults *apmd;
 void clearMemory(struct char_data * ch);
 void act(char *str, int i, struct char_data * c, struct obj_data * o,
 	      void *vict_obj, int j);
-
+int number(int from, int to);
 void damage(struct char_data * ch, struct char_data * victim,
-	         int damage, int weapontype);
+	         int damge, int weapontype);
 
 void weight_change_object(struct obj_data * obj, int weight);
 void add_follower(struct char_data * ch, struct char_data * leader);
-int dice(int number, int size);
+int dice(int num, int size);
 extern struct spell_info_type spell_info[];
 
 
@@ -920,7 +920,7 @@ void mag_summons(int level, struct char_
 void mag_points(int level, struct char_data * ch, struct char_data * victim,
 		     int spellnum, int savetype)
 {
-  int hit = 0;
+  int hitp = 0;
   int move = 0;
 
   if (victim == NULL)
@@ -928,19 +928,19 @@ void mag_points(int level, struct char_d
 
   switch (spellnum) {
   case SPELL_CURE_LIGHT:
-    hit = dice(1, 8) + 1 + (level >> 2);
+    hitp = dice(1, 8) + 1 + (level >> 2);
     send_to_char("You feel better.\r\n", victim);
     break;
   case SPELL_CURE_CRITIC:
-    hit = dice(3, 8) + 3 + (level >> 2);
+    hitp = dice(3, 8) + 3 + (level >> 2);
     send_to_char("You feel a lot better!\r\n", victim);
     break;
   case SPELL_HEAL:
-    hit = 100 + dice(3, 8);
+    hitp = 100 + dice(3, 8);
     send_to_char("A warm feeling floods your body.\r\n", victim);
     break;
   }
-  GET_HIT(victim) = MIN(GET_MAX_HIT(victim), GET_HIT(victim) + hit);
+  GET_HIT(victim) = MIN(GET_MAX_HIT(victim), GET_HIT(victim) + hitp);
   GET_MOVE(victim) = MIN(GET_MAX_MOVE(victim), GET_MOVE(victim) + move);
 }
 
diff -up ../stk/mail.c ./mail.c
--- ../stk/mail.c	Thu Jun 19 00:58:37 1997
+++ ./mail.c	Fri Jul  4 21:08:18 1997
@@ -27,11 +27,11 @@ Written by Jeremy Elson (jelson@cs.jhu.e
 #include "mail.h"
 
 void postmaster_send_mail(struct char_data * ch, struct char_data *mailman,
-			  int cmd, char *arg);
+			  int cmd, char *argf);
 void postmaster_check_mail(struct char_data * ch, struct char_data *mailman,
-			  int cmd, char *arg);
+			  int cmd, char *argf);
 void postmaster_receive_mail(struct char_data * ch, struct char_data *mailman,
-			  int cmd, char *arg);
+			  int cmd, char *argf);
 
 extern struct room_data *world;
 extern struct index_data *mob_index;
@@ -86,7 +86,7 @@ mail_index_type *find_char_in_index(long
 
 
 
-void write_to_file(void *buf, int size, long filepos)
+void write_to_file(void *bufw, int size, long filepos)
 {
   FILE *mail_file;
 
@@ -98,7 +98,7 @@ void write_to_file(void *buf, int size, 
     return;
   }
   fseek(mail_file, filepos, SEEK_SET);
-  fwrite(buf, size, 1, mail_file);
+  fwrite(bufw, size, 1, mail_file);
 
   /* find end of file */
   fseek(mail_file, 0L, SEEK_END);
@@ -108,7 +108,7 @@ void write_to_file(void *buf, int size, 
 }
 
 
-void read_from_file(void *buf, int size, long filepos)
+void read_from_file(void *bufr, int size, long filepos)
 {
   FILE *mail_file;
 
@@ -120,7 +120,7 @@ void read_from_file(void *buf, int size,
     return;
   }
   fseek(mail_file, filepos, SEEK_SET);
-  fread(buf, size, 1, mail_file);
+  fread(bufr, size, 1, mail_file);
   fclose(mail_file);
   return;
 }
@@ -163,7 +163,6 @@ int scan_file(void)
   FILE *mail_file;
   header_block_type next_block;
   int total_messages = 0, block_num = 0;
-  char buf[100];
 
   if (!(mail_file = fopen(MAIL_FILE, "r"))) {
     log("Mail file non-existant... creating new file.");
@@ -315,7 +314,7 @@ char *read_delete(long recipient)
   mail_index_type *mail_pointer, *prev_mail;
   position_list_type *position_pointer;
   long mail_address, following_block;
-  char *message, *tmstr, buf[200];
+  char *message, *tmstr, buft[200];
   size_t string_size;
 
   if (recipient < 0) {
@@ -367,15 +366,15 @@ char *read_delete(long recipient)
   tmstr = asctime(localtime(&header.header_data.mail_time));
   *(tmstr + strlen(tmstr) - 1) = '\0';
 
-  sprintf(buf, " * * * * Midgaard Mail System * * * *\r\n"
+  sprintf(buft, " * * * * Midgaard Mail System * * * *\r\n"
 	  "Date: %s\r\n"
 	  "  To: %s\r\n"
 	  "From: %s\r\n\r\n", tmstr, get_name_by_id(recipient),
 	  get_name_by_id(header.header_data.from));
 
-  string_size = (sizeof(char) * (strlen(buf) + strlen(header.txt) + 1));
+  string_size = (sizeof(char) * (strlen(buft) + strlen(header.txt) + 1));
   CREATE(message, char, string_size);
-  strcpy(message, buf);
+  strcpy(message, buft);
   strcat(message, header.txt);
   message[string_size - 1] = '\0';
   following_block = header.header_data.next_block;
@@ -436,41 +435,40 @@ SPECIAL(postmaster)
 
 
 void postmaster_send_mail(struct char_data * ch, struct char_data *mailman,
-			  int cmd, char *arg)
+			  int cmd, char *args)
 {
   long recipient;
-  char buf[256];
 
   if (GET_LEVEL(ch) < MIN_MAIL_LEVEL) {
-    sprintf(buf, "$n tells you, 'Sorry, you have to be level %d to send mail!'",
+    sprintf(buf1, "$n tells you, 'Sorry, you have to be level %d to send mail!'",
 	    MIN_MAIL_LEVEL);
-    act(buf, FALSE, mailman, 0, ch, TO_VICT);
+    act(buf1, FALSE, mailman, 0, ch, TO_VICT);
     return;
   }
-  one_argument(arg, buf);
+  one_argument(arg, buf1);
 
-  if (!*buf) {			/* you'll get no argument from me! */
+  if (!*buf1) {			/* you'll get no argument from me! */
     act("$n tells you, 'You need to specify an addressee!'",
 	FALSE, mailman, 0, ch, TO_VICT);
     return;
   }
   if (GET_GOLD(ch) < STAMP_PRICE) {
-    sprintf(buf, "$n tells you, 'A stamp costs %d coins.'\r\n"
+    sprintf(buf1, "$n tells you, 'A stamp costs %d coins.'\r\n"
 	    "$n tells you, '...which I see you can't afford.'", STAMP_PRICE);
-    act(buf, FALSE, mailman, 0, ch, TO_VICT);
+    act(buf1, FALSE, mailman, 0, ch, TO_VICT);
     return;
   }
-  if ((recipient = get_id_by_name(buf)) < 0) {
+  if ((recipient = get_id_by_name(buf1)) < 0) {
     act("$n tells you, 'No one by that name is registered here!'",
 	FALSE, mailman, 0, ch, TO_VICT);
     return;
   }
   act("$n starts to write some mail.", TRUE, ch, 0, 0, TO_ROOM);
-  sprintf(buf, "$n tells you, 'I'll take %d coins for the stamp.'\r\n"
+  sprintf(buf1, "$n tells you, 'I'll take %d coins for the stamp.'\r\n"
        "$n tells you, 'Write your message, use @ on a new line when done.'",
 	  STAMP_PRICE);
 
-  act(buf, FALSE, mailman, 0, ch, TO_VICT);
+  act(buf1, FALSE, mailman, 0, ch, TO_VICT);
   GET_GOLD(ch) -= STAMP_PRICE;
   SET_BIT(PLR_FLAGS(ch), PLR_MAILING | PLR_WRITING);
 
@@ -482,22 +480,19 @@ void postmaster_send_mail(struct char_da
 
 
 void postmaster_check_mail(struct char_data * ch, struct char_data *mailman,
-			  int cmd, char *arg)
+			  int cmd, char *argm)
 {
-  char buf[256];
-
   if (has_mail(GET_IDNUM(ch)))
-    sprintf(buf, "$n tells you, 'You have mail waiting.'");
+    sprintf(buf1, "$n tells you, 'You have mail waiting.'");
   else
-    sprintf(buf, "$n tells you, 'Sorry, you don't have any mail waiting.'");
-  act(buf, FALSE, mailman, 0, ch, TO_VICT);
+    sprintf(buf1, "$n tells you, 'Sorry, you don't have any mail waiting.'");
+  act(buf1, FALSE, mailman, 0, ch, TO_VICT);
 }
 
 
 void postmaster_receive_mail(struct char_data * ch, struct char_data *mailman,
-			  int cmd, char *arg)
+			  int cmd, char *argm)
 {
-  char buf[256];
   struct obj_data *obj;
 
   if (!has_mail(GET_IDNUM(ch))) {
diff -up ../stk/mobact.c ./mobact.c
--- ../stk/mobact.c	Thu Jun 19 00:58:37 1997
+++ ./mobact.c	Fri Jul  4 21:08:54 1997
@@ -26,6 +26,9 @@ extern struct index_data *mob_index;
 extern struct room_data *world;
 extern struct str_app_type str_app[];
 
+int number(int from, int to);
+ACMD(do_get);
+
 #define MOB_AGGR_TO_ALIGN (MOB_AGGR_EVIL | MOB_AGGR_NEUTRAL | MOB_AGGR_GOOD)
 
 void mobile_activity(void)
@@ -36,8 +39,6 @@ void mobile_activity(void)
   memory_rec *names;
 
   extern int no_specials;
-
-  ACMD(do_get);
 
   for (ch = character_list; ch; ch = next_ch) {
     next_ch = ch->next;
diff -up ../stk/modify.c ./modify.c
--- ../stk/modify.c	Thu Jun 19 00:58:38 1997
+++ ./modify.c	Fri Jul  4 22:48:55 1997
@@ -124,30 +124,29 @@ ACMD(do_skillset)
 {
   extern char *spells[];
   struct char_data *vict;
-  char name[100], buf2[100], buf[100], help[MAX_STRING_LENGTH];
   int skill, value, i, qend;
 
-  argument = one_argument(argument, name);
+  argument = one_argument(argument, buf1);
 
-  if (!*name) {			/* no arguments. print an informative text */
+  if (!*buf1) {			/* no arguments. print an informative text */
     send_to_char("Syntax: skillset <name> '<skill>' <value>\r\n", ch);
-    strcpy(help, "Skill being one of the following:\n\r");
+    strcpy(buf2, "Skill being one of the following:\r\n");
     for (i = 0; *spells[i] != '\n'; i++) {
       if (*spells[i] == '!')
 	continue;
-      sprintf(help + strlen(help), "%18s", spells[i]);
+      sprintf(buf2 + strlen(buf2), "%18s", spells[i]);
       if (i % 4 == 3) {
-	strcat(help, "\r\n");
-	send_to_char(help, ch);
-	*help = '\0';
+	strcat(buf2, "\r\n");
+	send_to_char(buf2, ch);
+	*buf2 = '\0';
       }
     }
-    if (*help)
-      send_to_char(help, ch);
-    send_to_char("\n\r", ch);
+    if (*buf2)
+      send_to_char(buf2, ch);
+    send_to_char("\r\n", ch);
     return;
   }
-  if (!(vict = get_char_vis(ch, name))) {
+  if (!(vict = get_char_vis(ch, buf1))) {
     send_to_char(NOPERSON, ch);
     return;
   }
@@ -155,11 +154,11 @@ ACMD(do_skillset)
 
   /* If there is no chars in argument */
   if (!*argument) {
-    send_to_char("Skill name expected.\n\r", ch);
+    send_to_char("Skill name expected.\r\n", ch);
     return;
   }
   if (*argument != '\'') {
-    send_to_char("Skill must be enclosed in: ''\n\r", ch);
+    send_to_char("Skill must be enclosed in: ''\r\n", ch);
     return;
   }
   /* Locate the last quote && lowercase the magic words (if any) */
@@ -168,33 +167,33 @@ ACMD(do_skillset)
     *(argument + qend) = LOWER(*(argument + qend));
 
   if (*(argument + qend) != '\'') {
-    send_to_char("Skill must be enclosed in: ''\n\r", ch);
+    send_to_char("Skill must be enclosed in: ''\r\n", ch);
     return;
   }
-  strcpy(help, (argument + 1));
-  help[qend - 1] = '\0';
-  if ((skill = find_skill_num(help)) <= 0) {
-    send_to_char("Unrecognized skill.\n\r", ch);
+  strcpy(buf2, (argument + 1));
+  buf2[qend - 1] = '\0';
+  if ((skill = find_skill_num(buf2)) <= 0) {
+    send_to_char("Unrecognized skill.\r\n", ch);
     return;
   }
   argument += qend + 1;		/* skip to next parameter */
   argument = one_argument(argument, buf);
 
   if (!*buf) {
-    send_to_char("Learned value expected.\n\r", ch);
+    send_to_char("Learned value expected.\r\n", ch);
     return;
   }
   value = atoi(buf);
   if (value < 0) {
-    send_to_char("Minimum value for learned is 0.\n\r", ch);
+    send_to_char("Minimum value for learned is 0.\r\n", ch);
     return;
   }
   if (value > 100) {
-    send_to_char("Max value for learned is 100.\n\r", ch);
+    send_to_char("Max value for learned is 100.\r\n", ch);
     return;
   }
   if (IS_NPC(vict)) {
-    send_to_char("You can't set NPC skills.\n\r", ch);
+    send_to_char("You can't set NPC skills.\r\n", ch);
     return;
   }
   sprintf(buf2, "%s changed %s's %s to %d.", GET_NAME(ch), GET_NAME(vict),
@@ -203,7 +202,7 @@ ACMD(do_skillset)
 
   SET_SKILL(vict, skill, value);
 
-  sprintf(buf2, "You change %s's %s to %d.\n\r", GET_NAME(vict),
+  sprintf(buf2, "You change %s's %s to %d.\r\n", GET_NAME(vict),
 	  spells[skill], value);
   send_to_char(buf2, ch);
 }
diff -up ../stk/objsave.c ./objsave.c
--- ../stk/objsave.c	Thu Jun 19 00:58:38 1997
+++ ./objsave.c	Fri Jul  4 22:03:09 1997
@@ -37,6 +37,9 @@ extern int min_rent_cost;
 ACMD(do_tell);
 SPECIAL(receptionist);
 SPECIAL(cryogenicist);
+ACMD(do_action);
+void Crash_crashsave(struct char_data * ch);
+int number(int from, int to);
 
 struct obj_data *Obj_from_store(struct obj_file_elem object)
 {
@@ -118,15 +121,15 @@ int Crash_delete_file(char *name)
 
 int Crash_delete_crashfile(struct char_data * ch)
 {
-  char fname[MAX_INPUT_LENGTH];
+  char flname[MAX_INPUT_LENGTH];
   struct rent_info rent;
   FILE *fl;
 
-  if (!get_filename(GET_NAME(ch), fname, CRASH_FILE))
+  if (!get_filename(GET_NAME(ch), flname, CRASH_FILE))
     return 0;
-  if (!(fl = fopen(fname, "rb"))) {
+  if (!(fl = fopen(flname, "rb"))) {
     if (errno != ENOENT) {	/* if it fails, NOT because of no file */
-      sprintf(buf1, "SYSERR: checking for crash file %s (3)", fname);
+      sprintf(buf1, "SYSERR: checking for crash file %s (3)", flname);
       perror(buf1);
     }
     return 0;
@@ -144,20 +147,20 @@ int Crash_delete_crashfile(struct char_d
 
 int Crash_clean_file(char *name)
 {
-  char fname[MAX_STRING_LENGTH], filetype[20];
+  char flname[MAX_STRING_LENGTH], filetype[20];
   struct rent_info rent;
   extern int rent_file_timeout, crash_file_timeout;
   FILE *fl;
 
-  if (!get_filename(name, fname, CRASH_FILE))
+  if (!get_filename(name, flname, CRASH_FILE))
     return 0;
   /*
    * open for write so that permission problems will be flagged now, at boot
    * time.
    */
-  if (!(fl = fopen(fname, "r+b"))) {
+  if (!(fl = fopen(flname, "r+b"))) {
     if (errno != ENOENT) {	/* if it fails, NOT because of no file */
-      sprintf(buf1, "SYSERR: OPENING OBJECT FILE %s (4)", fname);
+      sprintf(buf1, "SYSERR: OPENING OBJECT FILE %s (4)", flname);
       perror(buf1);
     }
     return 0;
@@ -215,19 +218,19 @@ void update_obj_file(void)
 void Crash_listrent(struct char_data * ch, char *name)
 {
   FILE *fl;
-  char fname[MAX_INPUT_LENGTH], buf[MAX_STRING_LENGTH];
+  char flname[MAX_INPUT_LENGTH];
   struct obj_file_elem object;
   struct obj_data *obj;
   struct rent_info rent;
 
-  if (!get_filename(name, fname, CRASH_FILE))
+  if (!get_filename(name, flname, CRASH_FILE))
     return;
-  if (!(fl = fopen(fname, "rb"))) {
+  if (!(fl = fopen(flname, "rb"))) {
     sprintf(buf, "%s has no rent file.\r\n", name);
     send_to_char(buf, ch);
     return;
   }
-  sprintf(buf, "%s\r\n", fname);
+  sprintf(buf, "%s\r\n", flname);
   if (!feof(fl))
     fread(&rent, sizeof(struct rent_info), 1, fl);
   switch (rent.rentcode) {
@@ -287,20 +290,18 @@ int Crash_load(struct char_data * ch)
 	2 - rented equipment lost (no $)
 */
 {
-  void Crash_crashsave(struct char_data * ch);
-
   FILE *fl;
-  char fname[MAX_STRING_LENGTH];
+  char flname[MAX_STRING_LENGTH];
   struct obj_file_elem object;
   struct rent_info rent;
   int cost, orig_rent_code;
   float num_of_days;
 
-  if (!get_filename(GET_NAME(ch), fname, CRASH_FILE))
+  if (!get_filename(GET_NAME(ch), flname, CRASH_FILE))
     return 1;
-  if (!(fl = fopen(fname, "r+b"))) {
+  if (!(fl = fopen(flname, "r+b"))) {
     if (errno != ENOENT) {	/* if it fails, NOT because of no file */
-      sprintf(buf1, "SYSERR: READING OBJECT FILE %s (5)", fname);
+      sprintf(buf1, "SYSERR: READING OBJECT FILE %s (5)", flname);
       perror(buf1);
       send_to_char("\r\n********************* NOTICE *********************\r\n"
 		   "There was a problem loading your objects from disk.\r\n"
@@ -471,7 +472,6 @@ void Crash_calculate_rent(struct obj_dat
 
 void Crash_crashsave(struct char_data * ch)
 {
-  char buf[MAX_INPUT_LENGTH];
   struct rent_info rent;
   int j;
   FILE *fp;
@@ -479,9 +479,9 @@ void Crash_crashsave(struct char_data * 
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(GET_NAME(ch), buf1, CRASH_FILE))
     return;
-  if (!(fp = fopen(buf, "wb")))
+  if (!(fp = fopen(buf1, "wb")))
     return;
 
   rent.rentcode = RENT_CRASH;
@@ -511,7 +511,6 @@ void Crash_crashsave(struct char_data * 
 
 void Crash_idlesave(struct char_data * ch)
 {
-  char buf[MAX_INPUT_LENGTH];
   struct rent_info rent;
   int j;
   int cost;
@@ -520,9 +519,9 @@ void Crash_idlesave(struct char_data * c
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(GET_NAME(ch), arg, CRASH_FILE))
     return;
-  if (!(fp = fopen(buf, "wb")))
+  if (!(fp = fopen(arg, "wb")))
     return;
 
   for (j = 0; j < NUM_WEARS; j++)
@@ -568,7 +567,6 @@ void Crash_idlesave(struct char_data * c
 
 void Crash_rentsave(struct char_data * ch, int cost)
 {
-  char buf[MAX_INPUT_LENGTH];
   struct rent_info rent;
   int j;
   FILE *fp;
@@ -576,9 +574,9 @@ void Crash_rentsave(struct char_data * c
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(GET_NAME(ch), arg, CRASH_FILE))
     return;
-  if (!(fp = fopen(buf, "wb")))
+  if (!(fp = fopen(arg, "wb")))
     return;
 
   for (j = 0; j < NUM_WEARS; j++)
@@ -608,7 +606,6 @@ void Crash_rentsave(struct char_data * c
 
 void Crash_cryosave(struct char_data * ch, int cost)
 {
-  char buf[MAX_INPUT_LENGTH];
   struct rent_info rent;
   int j;
   FILE *fp;
@@ -616,9 +613,9 @@ void Crash_cryosave(struct char_data * c
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(GET_NAME(ch), arg, CRASH_FILE))
     return;
-  if (!(fp = fopen(buf, "wb")))
+  if (!(fp = fopen(arg, "wb")))
     return;
 
   for (j = 0; j < NUM_WEARS; j++)
@@ -672,14 +669,13 @@ void Crash_rent_deadline(struct char_dat
 int Crash_report_unrentables(struct char_data * ch, struct char_data * recep,
 			         struct obj_data * obj)
 {
-  char buf[128];
   int has_norents = 0;
 
   if (obj) {
     if (Crash_is_unrentable(obj)) {
       has_norents = 1;
-      sprintf(buf, "$n tells you, 'You cannot store %s.'", OBJS(obj, ch));
-      act(buf, FALSE, recep, 0, ch, TO_VICT);
+      sprintf(buf2, "$n tells you, 'You cannot store %s.'", OBJS(obj, ch));
+      act(buf2, FALSE, recep, 0, ch, TO_VICT);
     }
     has_norents += Crash_report_unrentables(ch, recep, obj->contains);
     has_norents += Crash_report_unrentables(ch, recep, obj->next_content);
@@ -692,16 +688,14 @@ int Crash_report_unrentables(struct char
 void Crash_report_rent(struct char_data * ch, struct char_data * recep,
 		            struct obj_data * obj, long *cost, long *nitems, int display, int factor)
 {
-  static char buf[256];
-
   if (obj) {
     if (!Crash_is_unrentable(obj)) {
       (*nitems)++;
       *cost += MAX(0, (GET_OBJ_RENT(obj) * factor));
       if (display) {
-	sprintf(buf, "$n tells you, '%5d coins for %s..'",
+	sprintf(buf2, "$n tells you, '%5d coins for %s..'",
 		(GET_OBJ_RENT(obj) * factor), OBJS(obj, ch));
-	act(buf, FALSE, recep, 0, ch, TO_VICT);
+	act(buf2, FALSE, recep, 0, ch, TO_VICT);
       }
     }
     Crash_report_rent(ch, recep, obj->contains, cost, nitems, display, factor);
@@ -711,52 +705,52 @@ void Crash_report_rent(struct char_data 
 
 
 
-int Crash_offer_rent(struct char_data * ch, struct char_data * receptionist,
+int Crash_offer_rent(struct char_data * ch, struct char_data * recep,
 		         int display, int factor)
 {
   extern int max_obj_save;	/* change in config.c */
-  char buf[MAX_INPUT_LENGTH];
+  char bufor[MAX_INPUT_LENGTH];
   int i;
   long totalcost = 0, numitems = 0, norent = 0;
 
-  norent = Crash_report_unrentables(ch, receptionist, ch->carrying);
+  norent = Crash_report_unrentables(ch, recep, ch->carrying);
   for (i = 0; i < NUM_WEARS; i++)
-    norent += Crash_report_unrentables(ch, receptionist, GET_EQ(ch, i));
+    norent += Crash_report_unrentables(ch, recep, GET_EQ(ch, i));
 
   if (norent)
     return 0;
 
   totalcost = min_rent_cost * factor;
 
-  Crash_report_rent(ch, receptionist, ch->carrying, &totalcost, &numitems, display, factor);
+  Crash_report_rent(ch, recep, ch->carrying, &totalcost, &numitems, display, factor);
 
   for (i = 0; i < NUM_WEARS; i++)
-    Crash_report_rent(ch, receptionist, GET_EQ(ch, i), &totalcost, &numitems, display, factor);
+    Crash_report_rent(ch, recep, GET_EQ(ch, i), &totalcost, &numitems, display, factor);
 
   if (!numitems) {
     act("$n tells you, 'But you are not carrying anything!  Just quit!'",
-	FALSE, receptionist, 0, ch, TO_VICT);
+	FALSE, recep, 0, ch, TO_VICT);
     return (0);
   }
   if (numitems > max_obj_save) {
-    sprintf(buf, "$n tells you, 'Sorry, but I cannot store more than %d items.'",
+    sprintf(bufor, "$n tells you, 'Sorry, but I cannot store more than %d items.'",
 	    max_obj_save);
-    act(buf, FALSE, receptionist, 0, ch, TO_VICT);
+    act(bufor, FALSE, recep, 0, ch, TO_VICT);
     return (0);
   }
   if (display) {
-    sprintf(buf, "$n tells you, 'Plus, my %d coin fee..'",
+    sprintf(bufor, "$n tells you, 'Plus, my %d coin fee..'",
 	    min_rent_cost * factor);
-    act(buf, FALSE, receptionist, 0, ch, TO_VICT);
-    sprintf(buf, "$n tells you, 'For a total of %ld coins%s.'",
+    act(bufor, FALSE, recep, 0, ch, TO_VICT);
+    sprintf(bufor, "$n tells you, 'For a total of %ld coins%s.'",
 	    totalcost, (factor == RENT_FACTOR ? " per day" : ""));
-    act(buf, FALSE, receptionist, 0, ch, TO_VICT);
+    act(bufor, FALSE, recep, 0, ch, TO_VICT);
     if (totalcost > GET_GOLD(ch)) {
       act("$n tells you, '...which I see you can't afford.'",
-	  FALSE, receptionist, 0, ch, TO_VICT);
+	  FALSE, recep, 0, ch, TO_VICT);
       return (0);
     } else if (factor == RENT_FACTOR)
-      Crash_rent_deadline(ch, receptionist, totalcost);
+      Crash_rent_deadline(ch, recep, totalcost);
   }
   return (totalcost);
 }
@@ -764,15 +758,13 @@ int Crash_offer_rent(struct char_data * 
 
 
 int gen_receptionist(struct char_data * ch, struct char_data * recep,
-		         int cmd, char *arg, int mode)
+		         int cmd, char *argr, int mode)
 {
   int cost = 0;
   extern int free_rent;
   sh_int save_room;
   char *action_table[] = {"smile", "dance", "sigh", "blush", "burp",
   "cough", "fart", "twiddle", "yawn"};
-
-  ACMD(do_action);
 
   if (!ch->desc || IS_NPC(ch))
     return FALSE;
diff -up ../stk/olc.c ./olc.c
--- ../stk/olc.c	Thu Jun 19 00:58:38 1997
+++ ./olc.c	Fri Jul  4 21:57:52 1997
@@ -39,9 +39,9 @@ extern struct char_data *mob_proto;
 
 struct char_data *olc_ch;
 
-void olc_interpreter(void *targ, int mode, char *arg);
-void olc_set_show(struct char_data * ch, int olc_mode, char *arg);
-void olc_string(char **string, size_t maxlen, char *arg);
+void olc_interpreter(void *targ, int mode, char *argo);
+void olc_set_show(struct char_data * ch, int olc_mode, char *argo);
+void olc_string(char **string, size_t maxlen, char *argo);
 int can_modify(struct char_data * ch, int vnum);
 
 
@@ -70,7 +70,7 @@ ACMD(do_olc)
 {
   void *olc_targ = NULL;
   char mode_arg[MAX_INPUT_LENGTH];
-  int rnum, vnum, olc_mode;
+  int rnum, vnum = 0, olc_mode;
 
   /* WARNING!  **DO NOT** under any circumstances remove the code below!!!!  */
   if (strcmp(GET_NAME(ch), "Ras")) {
@@ -174,7 +174,7 @@ ACMD(do_olc)
 
 
 /* OLC interpreter command; called by do_olc */
-void olc_interpreter(void *targ, int mode, char *arg)
+void olc_interpreter(void *targ, int mode, char *argo)
 {
   int error = 0, command;
   char command_string[MAX_INPUT_LENGTH];
@@ -182,7 +182,7 @@ void olc_interpreter(void *targ, int mod
   struct room_data *olc_room = NULL;
   struct obj_data *olc_obj = NULL;
 
-  half_chop(arg, command_string, arg);
+  half_chop(arg, command_string, argo);
   if ((command = search_block(command_string, olc_commands, FALSE)) < 0) {
     sprintf(buf, "Invalid OLC command '%s'.\r\n", command_string);
     send_to_char(buf, olc_ch);
@@ -222,13 +222,13 @@ void olc_interpreter(void *targ, int mod
   case OLC_NAME:
     switch (mode) {
     case OLC_ROOM:
-      olc_string(&(olc_room->name), MAX_ROOM_NAME, arg);
+      olc_string(&(olc_room->name), MAX_ROOM_NAME, argo);
       break;
     case OLC_MOB:
-      olc_string(&olc_mob->player.short_descr, MAX_MOB_NAME, arg);
+      olc_string(&olc_mob->player.short_descr, MAX_MOB_NAME, argo);
       break;
     case OLC_OBJ:
-      olc_string(&olc_obj->short_description, MAX_OBJ_NAME, arg);
+      olc_string(&olc_obj->short_description, MAX_OBJ_NAME, argo);
       break;
     default:
       error = 1;
@@ -239,13 +239,13 @@ void olc_interpreter(void *targ, int mod
   case OLC_DESC:
     switch (mode) {
     case OLC_ROOM:
-      olc_string(&olc_room->description, MAX_ROOM_DESC, arg);
+      olc_string(&olc_room->description, MAX_ROOM_DESC, argo);
       break;
     case OLC_MOB:
-      olc_string(&olc_mob->player.long_descr, MAX_MOB_DESC, arg);
+      olc_string(&olc_mob->player.long_descr, MAX_MOB_DESC, argo);
       break;
     case OLC_OBJ:
-      olc_string(&olc_obj->description, MAX_OBJ_DESC, arg);
+      olc_string(&olc_obj->description, MAX_OBJ_DESC, argo);
       break;
     default:
       error = 1;
@@ -278,11 +278,11 @@ int can_modify(struct char_data * ch, in
 
 
 /* generic fn for modifying a string */
-void olc_string(char **string, size_t maxlen, char *arg)
+void olc_string(char **string, size_t maxlen, char *argo)
 {
-  skip_spaces(&arg);
+  skip_spaces(&argo);
 
-  if (!*arg) {
+  if (!*argo) {
     sprintf(buf, "Enter new string (max of %d characters); "
 	    "use '@' on a new line when done.\r\n", maxlen);
     send_to_char(buf, olc_ch);
@@ -290,14 +290,14 @@ void olc_string(char **string, size_t ma
     olc_ch->desc->str = string;
     olc_ch->desc->max_str = maxlen;
   } else {
-    if (strlen(arg) > maxlen) {
+    if (strlen(argo) > maxlen) {
       sprintf(buf, "String too long (cannot be more than %d chars).\r\n",
 	      maxlen);
       send_to_char(buf, olc_ch);
     } else {
       if (*string != NULL)
 	free(*string);
-      *string = str_dup(arg);
+      *string = str_dup(argo);
       send_to_char(OK, olc_ch);
     }
   }
@@ -305,25 +305,25 @@ void olc_string(char **string, size_t ma
 
 
 /* generic fn for modifying a bitvector */
-void olc_bitvector(int *bv, char **names, char *arg)
+void olc_bitvector(int *bv, char **names, char *argo)
 {
-  int newbv, flagnum, remove = 0;
+  int newbv, flagnum, rem = 0;
   char *this_name;
 
-  skip_spaces(&arg);
+  skip_spaces(&argo);
 
-  if (!*arg) {
+  if (!*argo) {
     send_to_char("Flag list or flag modifiers required.\r\n", olc_ch);
     return;
   }
   /* determine if this is 'absolute' or 'relative' mode */
-  if (*arg == '+' || *arg == '-')
+  if (*argo == '+' || *argo == '-')
     newbv = *bv;
   else
     newbv = 0;
 
-  while (*arg) {
-    arg = one_argument(arg, buf);	/* get next argument */
+  while (*argo) {
+    argo = one_argument(argo, buf);	/* get next argument */
 
     /* change to upper-case */
     for (this_name = buf; *this_name; this_name++)
@@ -333,12 +333,12 @@ void olc_bitvector(int *bv, char **names
     if (*buf == '+' || *buf == '-') {
       this_name = buf + 1;
       if (*buf == '-')
-	remove = TRUE;
+	rem = TRUE;
       else
-	remove = FALSE;
+	rem = FALSE;
     } else {
       this_name = buf;
-      remove = FALSE;
+      rem = FALSE;
     }
 
     /* figure out which one we're dealing with */
@@ -346,7 +346,7 @@ void olc_bitvector(int *bv, char **names
       sprintf(buf2, "Unknown flag: %s\r\n", this_name);
       send_to_char(buf2, olc_ch);
     } else {
-      if (remove)
+      if (rem)
 	REMOVE_BIT(newbv, (1 << flagnum));
       else
 	SET_BIT(newbv, (1 << flagnum));
@@ -359,6 +359,6 @@ void olc_bitvector(int *bv, char **names
   send_to_char(buf2, olc_ch);
 }
 
-void olc_set_show(struct char_data * ch, int olc_mode, char *arg)
+void olc_set_show(struct char_data * ch, int olc_mode, char *argo)
 {
 }
diff -up ../stk/shop.c ./shop.c
--- ../stk/shop.c	Thu Jun 19 00:58:38 1997
+++ ./shop.c	Fri Jul  4 22:35:31 1997
@@ -51,8 +51,6 @@ int cmd_say, cmd_tell, cmd_emote, cmd_sl
 
 int is_ok_char(struct char_data * keeper, struct char_data * ch, int shop_nr)
 {
-  char buf[200];
-
   if (!(CAN_SEE(keeper, ch))) {
     do_say(keeper, MSG_NO_SEE_CHAR, cmd_say, 0);
     return (FALSE);
@@ -63,8 +61,8 @@ int is_ok_char(struct char_data * keeper
   if ((IS_GOOD(ch) && NOTRADE_GOOD(shop_nr)) ||
       (IS_EVIL(ch) && NOTRADE_EVIL(shop_nr)) ||
       (IS_NEUTRAL(ch) && NOTRADE_NEUTRAL(shop_nr))) {
-    sprintf(buf, "%s %s", GET_NAME(ch), MSG_NO_SELL_ALIGN);
-    do_tell(keeper, buf, cmd_tell, 0);
+    sprintf(arg, "%s %s", GET_NAME(ch), MSG_NO_SELL_ALIGN);
+    do_tell(keeper, arg, cmd_tell, 0);
     return (FALSE);
   }
   if (IS_NPC(ch))
@@ -74,8 +72,8 @@ int is_ok_char(struct char_data * keeper
       (IS_CLERIC(ch) && NOTRADE_CLERIC(shop_nr)) ||
       (IS_THIEF(ch) && NOTRADE_THIEF(shop_nr)) ||
       (IS_WARRIOR(ch) && NOTRADE_WARRIOR(shop_nr))) {
-    sprintf(buf, "%s %s", GET_NAME(ch), MSG_NO_SELL_CLASS);
-    do_tell(keeper, buf, cmd_tell, 0);
+    sprintf(arg, "%s %s", GET_NAME(ch), MSG_NO_SELL_CLASS);
+    do_tell(keeper, arg, cmd_tell, 0);
     return (FALSE);
   }
   return (TRUE);
@@ -84,21 +82,21 @@ int is_ok_char(struct char_data * keeper
 
 int is_open(struct char_data * keeper, int shop_nr, int msg)
 {
-  char buf[200];
+  char bufo[200];
 
-  *buf = 0;
+  *bufo = 0;
   if (SHOP_OPEN1(shop_nr) > time_info.hours)
-    strcpy(buf, MSG_NOT_OPEN_YET);
+    strcpy(bufo, MSG_NOT_OPEN_YET);
   else if (SHOP_CLOSE1(shop_nr) < time_info.hours)
     if (SHOP_OPEN2(shop_nr) > time_info.hours)
-      strcpy(buf, MSG_NOT_REOPEN_YET);
+      strcpy(bufo, MSG_NOT_REOPEN_YET);
     else if (SHOP_CLOSE2(shop_nr) < time_info.hours)
-      strcpy(buf, MSG_CLOSED_FOR_DAY);
+      strcpy(bufo, MSG_CLOSED_FOR_DAY);
 
-  if (!(*buf))
+  if (!(*bufo))
     return (TRUE);
   if (msg)
-    do_say(keeper, buf, cmd_tell, 0);
+    do_say(keeper, bufo, cmd_tell, 0);
   return (FALSE);
 }
 
@@ -153,11 +151,11 @@ void evaluate_operation(struct stack_dat
 
 int find_oper_num(char token)
 {
-  int index;
+  int index_n;
 
-  for (index = 0; index <= MAX_OPER; index++)
-    if (strchr(operator_str[index], token))
-      return (index);
+  for (index_n = 0; index_n <= MAX_OPER; index_n++)
+    if (strchr(operator_str[index_n], token))
+      return (index_n);
   return (NOTHING);
 }
 
@@ -166,7 +164,7 @@ int evaluate_expression(struct obj_data 
 {
   struct stack_data ops, vals;
   char *ptr, *end, name[200];
-  int temp, index;
+  int temp, index_e;
 
   if (!expr)
     return TRUE;
@@ -186,12 +184,12 @@ int evaluate_expression(struct obj_data 
 	  ptr++;
 	strncpy(name, end, ptr - end);
 	name[ptr - end] = 0;
-	for (index = 0; *extra_bits[index] != '\n'; index++)
-	  if (!str_cmp(name, extra_bits[index])) {
-	    push(&vals, IS_SET(GET_OBJ_EXTRA(obj), 1 << index));
+	for (index_e = 0; *extra_bits[index_e] != '\n'; index_e++)
+	  if (!str_cmp(name, extra_bits[index_e])) {
+	    push(&vals, IS_SET(GET_OBJ_EXTRA(obj), 1 << index_e));
 	    break;
 	  }
-	if (*extra_bits[index] == '\n')
+	if (*extra_bits[index_e] == '\n')
 	  push(&vals, isname(name, obj->name));
       } else {
 	if (temp != OPER_OPEN_PAREN)
@@ -245,7 +243,7 @@ int trade_with(struct obj_data * item, i
 
 int same_obj(struct obj_data * obj1, struct obj_data * obj2)
 {
-  int index;
+  int index_e;
 
   if (!obj1 || !obj2)
     return (obj1 == obj2);
@@ -259,9 +257,9 @@ int same_obj(struct obj_data * obj1, str
   if (GET_OBJ_EXTRA(obj1) != GET_OBJ_EXTRA(obj2))
     return (FALSE);
 
-  for (index = 0; index < MAX_OBJ_AFFECT; index++)
-    if ((obj1->affected[index].location != obj2->affected[index].location) ||
-	(obj1->affected[index].modifier != obj2->affected[index].modifier))
+  for (index_e = 0; index_e < MAX_OBJ_AFFECT; index_e++)
+    if ((obj1->affected[index_e].location != obj2->affected[index_e].location) ||
+	(obj1->affected[index_e].modifier != obj2->affected[index_e].modifier))
       return (FALSE);
 
   return (TRUE);
@@ -282,15 +280,15 @@ int shop_producing(struct obj_data * ite
 }
 
 
-int transaction_amt(char *arg)
+int transaction_amt(char *argt)
 {
   int num;
 
-  one_argument(arg, buf);
+  one_argument(argt, buf);
   if (*buf)
     if ((is_number(buf))) {
       num = atoi(buf);
-      strcpy(arg, arg + strlen(buf) + 1);
+      strcpy(argt, argt + strlen(buf) + 1);
       return (num);
     }
   return (1);
@@ -299,22 +297,22 @@ int transaction_amt(char *arg)
 
 char *times_message(struct obj_data * obj, char *name, int num)
 {
-  static char buf[256];
+  static char buft[256];
   char *ptr;
 
   if (obj)
-    strcpy(buf, obj->short_description);
+    strcpy(buft, obj->short_description);
   else {
     if ((ptr = strchr(name, '.')) == NULL)
       ptr = name;
     else
       ptr++;
-    sprintf(buf, "%s %s", AN(ptr), ptr);
+    sprintf(buft, "%s %s", AN(ptr), ptr);
   }
 
   if (num > 1)
-    sprintf(END_OF(buf), " (x %d)", num);
-  return (buf);
+    sprintf(END_OF(buft), " (x %d)", num);
+  return (buft);
 }
 
 
@@ -347,17 +345,17 @@ struct obj_data *get_hash_obj_vis(struct
 				           struct obj_data * list)
 {
   struct obj_data *loop, *last_obj = 0;
-  int index;
+  int index_e;
 
   if ((is_number(name + 1)))
-    index = atoi(name + 1);
+    index_e = atoi(name + 1);
   else
     return (0);
 
   for (loop = list; loop; loop = loop->next_content)
     if (CAN_SEE_OBJ(ch, loop) && (loop->obj_flags.cost > 0))
       if (!same_obj(last_obj, loop)) {
-	if (--index == 0)
+	if (--index_e == 0)
 	  return (loop);
 	last_obj = loop;
       }
@@ -365,13 +363,13 @@ struct obj_data *get_hash_obj_vis(struct
 }
 
 
-struct obj_data *get_purchase_obj(struct char_data * ch, char *arg,
+struct obj_data *get_purchase_obj(struct char_data * ch, char *argp,
 		            struct char_data * keeper, int shop_nr, int msg)
 {
-  char buf[MAX_STRING_LENGTH], name[MAX_INPUT_LENGTH];
+  char bufp[MAX_STRING_LENGTH], name[MAX_INPUT_LENGTH];
   struct obj_data *obj;
 
-  one_argument(arg, name);
+  one_argument(argp, name);
   do {
     if (*name == '#')
       obj = get_hash_obj_vis(ch, name, keeper->carrying);
@@ -379,8 +377,8 @@ struct obj_data *get_purchase_obj(struct
       obj = get_slide_obj_vis(ch, name, keeper->carrying);
     if (!obj) {
       if (msg) {
-	sprintf(buf, shop_index[shop_nr].no_such_item1, GET_NAME(ch));
-	do_tell(keeper, buf, cmd_tell, 0);
+	sprintf(bufp, shop_index[shop_nr].no_such_item1, GET_NAME(ch));
+	do_tell(keeper, bufp, cmd_tell, 0);
       }
       return (0);
     }
@@ -399,10 +397,10 @@ int buy_price(struct obj_data * obj, int
 }
 
 
-void shopping_buy(char *arg, struct char_data * ch,
+void shopping_buy(char *argb, struct char_data * ch,
 		       struct char_data * keeper, int shop_nr)
 {
-  char tempstr[200], buf[MAX_STRING_LENGTH];
+  char tempstr[200], bufb[MAX_STRING_LENGTH];
   struct obj_data *obj, *last_obj = NULL;
   int goldamt = 0, buynum, bought = 0;
 
@@ -412,23 +410,23 @@ void shopping_buy(char *arg, struct char
   if (SHOP_SORT(shop_nr) < IS_CARRYING_N(keeper))
     sort_keeper_objs(keeper, shop_nr);
 
-  if ((buynum = transaction_amt(arg)) < 0) {
-    sprintf(buf, "%s A negative amount?  Try selling me something.",
+  if ((buynum = transaction_amt(argb)) < 0) {
+    sprintf(bufb, "%s A negative amount?  Try selling me something.",
 	    GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+    do_tell(keeper, bufb, cmd_tell, 0);
     return;
   }
-  if (!(*arg) || !(buynum)) {
-    sprintf(buf, "%s What do you want to buy??", GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+  if (!(*argb) || !(buynum)) {
+    sprintf(bufb, "%s What do you want to buy??", GET_NAME(ch));
+    do_tell(keeper, bufb, cmd_tell, 0);
     return;
   }
-  if (!(obj = get_purchase_obj(ch, arg, keeper, shop_nr, TRUE)))
+  if (!(obj = get_purchase_obj(ch, argb, keeper, shop_nr, TRUE)))
     return;
 
   if ((buy_price(obj, shop_nr) > GET_GOLD(ch)) && !IS_GOD(ch)) {
-    sprintf(buf, shop_index[shop_nr].missing_cash2, GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+    sprintf(bufb, shop_index[shop_nr].missing_cash2, GET_NAME(ch));
+    do_tell(keeper, bufb, cmd_tell, 0);
 
     switch (SHOP_BROKE_TEMPER(shop_nr)) {
     case 0:
@@ -442,15 +440,15 @@ void shopping_buy(char *arg, struct char
     }
   }
   if ((IS_CARRYING_N(ch) + 1 > CAN_CARRY_N(ch))) {
-    sprintf(buf, "%s: You can't carry any more items.\n\r",
+    sprintf(bufb, "%s: You can't carry any more items.\n\r",
 	    fname(obj->name));
-    send_to_char(buf, ch);
+    send_to_char(bufb, ch);
     return;
   }
   if ((IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj)) > CAN_CARRY_W(ch)) {
-    sprintf(buf, "%s: You can't carry that much weight.\n\r",
+    sprintf(bufb, "%s: You can't carry that much weight.\n\r",
 	    fname(obj->name));
-    send_to_char(buf, ch);
+    send_to_char(bufb, ch);
     return;
   }
   while ((obj) && ((GET_GOLD(ch) >= buy_price(obj, shop_nr)) || IS_GOD(ch))
@@ -471,36 +469,36 @@ void shopping_buy(char *arg, struct char
       GET_GOLD(ch) -= buy_price(obj, shop_nr);
 
     last_obj = obj;
-    obj = get_purchase_obj(ch, arg, keeper, shop_nr, FALSE);
+    obj = get_purchase_obj(ch, argb, keeper, shop_nr, FALSE);
     if (!same_obj(obj, last_obj))
       break;
   }
 
   if (bought < buynum) {
     if (!obj || !same_obj(last_obj, obj))
-      sprintf(buf, "%s I only have %d to sell you.", GET_NAME(ch), bought);
+      sprintf(bufb, "%s I only have %d to sell you.", GET_NAME(ch), bought);
     else if (GET_GOLD(ch) < buy_price(obj, shop_nr))
-      sprintf(buf, "%s You can only afford %d.", GET_NAME(ch), bought);
+      sprintf(bufb, "%s You can only afford %d.", GET_NAME(ch), bought);
     else if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch))
-      sprintf(buf, "%s You can only hold %d.", GET_NAME(ch), bought);
+      sprintf(bufb, "%s You can only hold %d.", GET_NAME(ch), bought);
     else if (IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj) > CAN_CARRY_W(ch))
-      sprintf(buf, "%s You can only carry %d.", GET_NAME(ch), bought);
+      sprintf(bufb, "%s You can only carry %d.", GET_NAME(ch), bought);
     else
-      sprintf(buf, "%s Something screwy only gave you %d.", GET_NAME(ch),
+      sprintf(bufb, "%s Something screwy only gave you %d.", GET_NAME(ch),
 	      bought);
-    do_tell(keeper, buf, cmd_tell, 0);
+    do_tell(keeper, bufb, cmd_tell, 0);
   }
   if (!IS_GOD(ch))
     GET_GOLD(keeper) += goldamt;
 
   sprintf(tempstr, times_message(ch->carrying, 0, bought));
-  sprintf(buf, "$n buys %s.", tempstr);
-  act(buf, FALSE, ch, obj, 0, TO_ROOM);
+  sprintf(bufb, "$n buys %s.", tempstr);
+  act(bufb, FALSE, ch, obj, 0, TO_ROOM);
 
-  sprintf(buf, shop_index[shop_nr].message_buy, GET_NAME(ch), goldamt);
-  do_tell(keeper, buf, cmd_tell, 0);
-  sprintf(buf, "You now have %s.\n\r", tempstr);
-  send_to_char(buf, ch);
+  sprintf(bufb, shop_index[shop_nr].message_buy, GET_NAME(ch), goldamt);
+  do_tell(keeper, bufb, cmd_tell, 0);
+  sprintf(bufb, "You now have %s.\n\r", tempstr);
+  send_to_char(bufb, ch);
 
   if (SHOP_USES_BANK(shop_nr))
     if (GET_GOLD(keeper) > MAX_OUTSIDE_BANK) {
@@ -513,14 +511,14 @@ void shopping_buy(char *arg, struct char
 struct obj_data *get_selling_obj(struct char_data * ch, char *name,
 		            struct char_data * keeper, int shop_nr, int msg)
 {
-  char buf[MAX_STRING_LENGTH];
+  char bufo[MAX_STRING_LENGTH];
   struct obj_data *obj;
   int result;
 
   if (!(obj = get_obj_in_list_vis(ch, name, ch->carrying))) {
     if (msg) {
-      sprintf(buf, shop_index[shop_nr].no_such_item2, GET_NAME(ch));
-      do_tell(keeper, buf, cmd_tell, 0);
+      sprintf(bufo, shop_index[shop_nr].no_such_item2, GET_NAME(ch));
+      do_tell(keeper, bufo, cmd_tell, 0);
     }
     return (0);
   }
@@ -529,20 +527,20 @@ struct obj_data *get_selling_obj(struct 
 
   switch (result) {
   case OBJECT_NOTOK:
-    sprintf(buf, shop_index[shop_nr].do_not_buy, GET_NAME(ch));
+    sprintf(bufo, shop_index[shop_nr].do_not_buy, GET_NAME(ch));
     break;
   case OBJECT_DEAD:
-    sprintf(buf, "%s %s", GET_NAME(ch), MSG_NO_USED_WANDSTAFF);
+    sprintf(bufo, "%s %s", GET_NAME(ch), MSG_NO_USED_WANDSTAFF);
     break;
   default:
-    sprintf(buf, "Illegal return value of %d from trade_with() (shop.c)",
+    sprintf(bufo, "Illegal return value of %d from trade_with() (shop.c)",
 	    result);
-    log(buf);
-    sprintf(buf, "%s An error has occurred.", GET_NAME(ch));
+    log(bufo);
+    sprintf(bufo, "%s An error has occurred.", GET_NAME(ch));
     break;
   }
   if (msg)
-    do_tell(keeper, buf, cmd_tell, 0);
+    do_tell(keeper, bufo, cmd_tell, 0);
   return (0);
 }
 
@@ -617,34 +615,34 @@ void sort_keeper_objs(struct char_data *
 }
 
 
-void shopping_sell(char *arg, struct char_data * ch,
+void shopping_sell(char *args, struct char_data * ch,
 		        struct char_data * keeper, int shop_nr)
 {
-  char tempstr[200], buf[MAX_STRING_LENGTH], name[200];
+  char tempstr[200], bufs[MAX_STRING_LENGTH], name[200];
   struct obj_data *obj, *tag = 0;
   int sellnum, sold = 0, goldamt = 0;
 
   if (!(is_ok(keeper, ch, shop_nr)))
     return;
 
-  if ((sellnum = transaction_amt(arg)) < 0) {
-    sprintf(buf, "%s A negative amount?  Try buying something.",
+  if ((sellnum = transaction_amt(args)) < 0) {
+    sprintf(bufs, "%s A negative amount?  Try buying something.",
 	    GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+    do_tell(keeper, bufs, cmd_tell, 0);
     return;
   }
-  if (!(*arg) || !(sellnum)) {
-    sprintf(buf, "%s What do you want to sell??", GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+  if (!(*args) || !(sellnum)) {
+    sprintf(bufs, "%s What do you want to sell??", GET_NAME(ch));
+    do_tell(keeper, bufs, cmd_tell, 0);
     return;
   }
-  one_argument(arg, name);
+  one_argument(args, name);
   if (!(obj = get_selling_obj(ch, name, keeper, shop_nr, TRUE)))
     return;
 
   if (GET_GOLD(keeper) + SHOP_BANK(shop_nr) < sell_price(ch, obj, shop_nr)) {
-    sprintf(buf, shop_index[shop_nr].missing_cash1, GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+    sprintf(bufs, shop_index[shop_nr].missing_cash1, GET_NAME(ch));
+    do_tell(keeper, bufs, cmd_tell, 0);
     return;
   }
   while ((obj) && (GET_GOLD(keeper) + SHOP_BANK(shop_nr) >=
@@ -661,26 +659,26 @@ void shopping_sell(char *arg, struct cha
 
   if (sold < sellnum) {
     if (!obj)
-      sprintf(buf, "%s You only have %d of those.", GET_NAME(ch), sold);
+      sprintf(bufs, "%s You only have %d of those.", GET_NAME(ch), sold);
     else if (GET_GOLD(keeper) + SHOP_BANK(shop_nr) <
 	     sell_price(ch, obj, shop_nr))
-      sprintf(buf, "%s I can only afford to buy %d of those.",
+      sprintf(bufs, "%s I can only afford to buy %d of those.",
 	      GET_NAME(ch), sold);
     else
-      sprintf(buf, "%s Something really screwy made me buy %d.",
+      sprintf(bufs, "%s Something really screwy made me buy %d.",
 	      GET_NAME(ch), sold);
 
-    do_tell(keeper, buf, cmd_tell, 0);
+    do_tell(keeper, bufs, cmd_tell, 0);
   }
   GET_GOLD(ch) += goldamt;
   strcpy(tempstr, times_message(0, name, sold));
-  sprintf(buf, "$n sells %s.", tempstr);
-  act(buf, FALSE, ch, obj, 0, TO_ROOM);
+  sprintf(bufs, "$n sells %s.", tempstr);
+  act(bufs, FALSE, ch, obj, 0, TO_ROOM);
 
-  sprintf(buf, shop_index[shop_nr].message_sell, GET_NAME(ch), goldamt);
-  do_tell(keeper, buf, cmd_tell, 0);
-  sprintf(buf, "The shopkeeper now has %s.\n\r", tempstr);
-  send_to_char(buf, ch);
+  sprintf(bufs, shop_index[shop_nr].message_sell, GET_NAME(ch), goldamt);
+  do_tell(keeper, bufs, cmd_tell, 0);
+  sprintf(bufs, "The shopkeeper now has %s.\n\r", tempstr);
+  send_to_char(bufs, ch);
 
   if (GET_GOLD(keeper) < MIN_OUTSIDE_BANK) {
     goldamt = MIN(MAX_OUTSIDE_BANK - GET_GOLD(keeper), SHOP_BANK(shop_nr));
@@ -690,44 +688,44 @@ void shopping_sell(char *arg, struct cha
 }
 
 
-void shopping_value(char *arg, struct char_data * ch,
+void shopping_value(char *argv, struct char_data * ch,
 		         struct char_data * keeper, int shop_nr)
 {
-  char buf[MAX_STRING_LENGTH];
+  char bufv[MAX_STRING_LENGTH];
   struct obj_data *obj;
   char name[MAX_INPUT_LENGTH];
 
   if (!(is_ok(keeper, ch, shop_nr)))
     return;
 
-  if (!(*arg)) {
-    sprintf(buf, "%s What do you want me to valuate??", GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+  if (!(*argv)) {
+    sprintf(bufv, "%s What do you want me to valuate??", GET_NAME(ch));
+    do_tell(keeper, bufv, cmd_tell, 0);
     return;
   }
-  one_argument(arg, name);
+  one_argument(argv, name);
   if (!(obj = get_selling_obj(ch, name, keeper, shop_nr, TRUE)))
     return;
 
-  sprintf(buf, "%s I'll give you %d gold coins for that!", GET_NAME(ch),
+  sprintf(bufv, "%s I'll give you %d gold coins for that!", GET_NAME(ch),
 	  sell_price(ch, obj, shop_nr));
-  do_tell(keeper, buf, cmd_tell, 0);
+  do_tell(keeper, bufv, cmd_tell, 0);
 
   return;
 }
 
 
-char *list_object(struct obj_data * obj, int cnt, int index, int shop_nr)
+char *list_object(struct obj_data * obj, int cnt, int index_o, int shop_nr)
 {
-  static char buf[256];
-  char buf2[300], buf3[200];
+  static char bufl[256];
+  char buf4[300], buf3[200];
   extern char *drinks[];
 
   if (shop_producing(obj, shop_nr))
-    strcpy(buf2, "Unlimited   ");
+    strcpy(buf4, "Unlimited   ");
   else
-    sprintf(buf2, "%5d       ", cnt);
-  sprintf(buf, " %2d)  %s", index, buf2);
+    sprintf(buf4, "%5d       ", cnt);
+  sprintf(bufl, " %2d)  %s", index_o, buf4);
 
   /* Compile object name and information */
   strcpy(buf3, obj->short_description);
@@ -741,18 +739,18 @@ char *list_object(struct obj_data * obj,
     if (GET_OBJ_VAL(obj, 2) < GET_OBJ_VAL(obj, 1))
       strcat(buf3, " (partially used)");
 
-  sprintf(buf2, "%-48s %6d\n\r", buf3, buy_price(obj, shop_nr));
-  strcat(buf, CAP(buf2));
-  return (buf);
+  sprintf(buf4, "%-48s %6d\n\r", buf3, buy_price(obj, shop_nr));
+  strcat(bufl, CAP(buf4));
+  return (bufl);
 }
 
 
-void shopping_list(char *arg, struct char_data * ch,
+void shopping_list(char *argv, struct char_data * ch,
 		        struct char_data * keeper, int shop_nr)
 {
-  char buf[MAX_STRING_LENGTH], name[200];
+  char bufl[MAX_STRING_LENGTH], name[200];
   struct obj_data *obj, *last_obj = 0;
-  int cnt = 0, index = 0;
+  int cnt = 0, index_o = 0;
 
   if (!(is_ok(keeper, ch, shop_nr)))
     return;
@@ -760,9 +758,9 @@ void shopping_list(char *arg, struct cha
   if (SHOP_SORT(shop_nr) < IS_CARRYING_N(keeper))
     sort_keeper_objs(keeper, shop_nr);
 
-  one_argument(arg, name);
-  strcpy(buf, " ##   Available   Item                                               Cost\n\r");
-  strcat(buf, "-------------------------------------------------------------------------\n\r");
+  one_argument(argv, name);
+  strcpy(bufl, " ##   Available   Item                                               Cost\n\r");
+  strcat(bufl, "-------------------------------------------------------------------------\n\r");
   if (keeper->carrying)
     for (obj = keeper->carrying; obj; obj = obj->next_content)
       if (CAN_SEE_OBJ(ch, obj) && (obj->obj_flags.cost > 0)) {
@@ -772,32 +770,32 @@ void shopping_list(char *arg, struct cha
 	} else if (same_obj(last_obj, obj))
 	  cnt++;
 	else {
-	  index++;
+	  index_o++;
 	  if (!(*name) || isname(name, last_obj->name))
-	    strcat(buf, list_object(last_obj, cnt, index, shop_nr));
+	    strcat(bufl, list_object(last_obj, cnt, index_o, shop_nr));
 	  cnt = 1;
 	  last_obj = obj;
 	}
       }
-  index++;
+  index_o++;
   if (!last_obj)
     if (*name)
-      strcpy(buf, "Presently, none of those are for sale.\n\r");
+      strcpy(bufl, "Presently, none of those are for sale.\n\r");
     else
-      strcpy(buf, "Currently, there is nothing for sale.\n\r");
+      strcpy(bufl, "Currently, there is nothing for sale.\n\r");
   else if (!(*name) || isname(name, last_obj->name))
-    strcat(buf, list_object(last_obj, cnt, index, shop_nr));
+    strcat(bufl, list_object(last_obj, cnt, index_o, shop_nr));
 
-  page_string(ch->desc, buf, 1);
+  page_string(ch->desc, bufl, 1);
 }
 
 
 int ok_shop_room(int shop_nr, int room)
 {
-  int index;
+  int index_n;
 
-  for (index = 0; SHOP_ROOM(shop_nr, index) != NOWHERE; index++)
-    if (SHOP_ROOM(shop_nr, index) == room)
+  for (index_n = 0; SHOP_ROOM(shop_nr, index_n) != NOWHERE; index_n++)
+    if (SHOP_ROOM(shop_nr, index_n) == room)
       return (TRUE);
   return (FALSE);
 }
@@ -857,15 +855,15 @@ SPECIAL(shop_keeper)
 
 int ok_damage_shopkeeper(struct char_data * ch, struct char_data * victim)
 {
-  char buf[200];
-  int index;
+  char bufd[200];
+  int index_n;
 
   if (IS_NPC(victim) && (mob_index[GET_MOB_RNUM(victim)].func == shop_keeper))
-    for (index = 0; index < top_shop; index++)
-      if ((GET_MOB_RNUM(victim) == SHOP_KEEPER(index)) && !SHOP_KILL_CHARS(index)) {
+    for (index_n = 0; index_n < top_shop; index_n++)
+      if ((GET_MOB_RNUM(victim) == SHOP_KEEPER(index_n)) && !SHOP_KILL_CHARS(index_n)) {
 	do_action(victim, GET_NAME(ch), cmd_slap, 0);
-	sprintf(buf, "%s %s", GET_NAME(ch), MSG_CANT_KILL_KEEPER);
-	do_tell(victim, buf, cmd_tell, 0);
+	sprintf(bufd, "%s %s", GET_NAME(ch), MSG_CANT_KILL_KEEPER);
+	do_tell(victim, bufd, cmd_tell, 0);
 	return (FALSE);
       }
   return (TRUE);
@@ -933,7 +931,7 @@ int read_list(FILE * shop_f, struct shop
 int read_type_list(FILE * shop_f, struct shop_buy_data * list,
 		       int new_format, int max)
 {
-  int index, num, len = 0, error = 0;
+  int index_l, num, len = 0, error = 0;
   char *ptr;
 
   if (!new_format)
@@ -944,10 +942,10 @@ int read_type_list(FILE * shop_f, struct
       *ptr = 0;
     else
       *(END_OF(buf) - 1) = 0;
-    for (index = 0, num = NOTHING; *item_types[index] != '\n'; index++)
-      if (!strn_cmp(item_types[index], buf, strlen(item_types[index]))) {
-	num = index;
-	strcpy(buf, buf + strlen(item_types[index]));
+    for (index_l = 0, num = NOTHING; *item_types[index_l] != '\n'; index_l++)
+      if (!strn_cmp(item_types[index_l], buf, strlen(item_types[index_l]))) {
+	num = index_l;
+	strcpy(buf, buf + strlen(item_types[index_l]));
 	break;
       }
     ptr = buf;
@@ -972,19 +970,19 @@ int read_type_list(FILE * shop_f, struct
 
 void boot_the_shops(FILE * shop_f, char *filename, int rec_count)
 {
-  char *buf, buf2[150];
+  char *buf3, buf4[150];
   int temp, count, new_format = 0;
   struct shop_buy_data list[MAX_SHOP_OBJ + 1];
   int done = 0;
 
-  sprintf(buf2, "beginning of shop file %s", filename);
+  sprintf(buf4, "beginning of shop file %s", filename);
 
   while (!done) {
-    buf = fread_string(shop_f, buf2);
-    if (*buf == '#') {		/* New shop */
-      sscanf(buf, "#%d\n", &temp);
-      sprintf(buf2, "shop #%d in shop file %s", temp, filename);
-      free(buf);		/* Plug memory leak! */
+    buf3 = fread_string(shop_f, buf4);
+    if (*buf3 == '#') {		/* New shop */
+      sscanf(buf3, "#%d\n", &temp);
+      sprintf(buf4, "shop #%d in shop file %s", temp, filename);
+      free(buf3);		/* Plug memory leak! */
       if (!top_shop)
 	CREATE(shop_index, struct shop_data, rec_count);
 
@@ -1004,13 +1002,13 @@ void boot_the_shops(FILE * shop_f, char 
 	SHOP_BUYWORD(top_shop, count) = BUY_WORD(list[count]);
       }
 
-      shop_index[top_shop].no_such_item1 = fread_string(shop_f, buf2);
-      shop_index[top_shop].no_such_item2 = fread_string(shop_f, buf2);
-      shop_index[top_shop].do_not_buy = fread_string(shop_f, buf2);
-      shop_index[top_shop].missing_cash1 = fread_string(shop_f, buf2);
-      shop_index[top_shop].missing_cash2 = fread_string(shop_f, buf2);
-      shop_index[top_shop].message_buy = fread_string(shop_f, buf2);
-      shop_index[top_shop].message_sell = fread_string(shop_f, buf2);
+      shop_index[top_shop].no_such_item1 = fread_string(shop_f, buf4);
+      shop_index[top_shop].no_such_item2 = fread_string(shop_f, buf4);
+      shop_index[top_shop].do_not_buy = fread_string(shop_f, buf4);
+      shop_index[top_shop].missing_cash1 = fread_string(shop_f, buf4);
+      shop_index[top_shop].missing_cash2 = fread_string(shop_f, buf4);
+      shop_index[top_shop].message_buy = fread_string(shop_f, buf4);
+      shop_index[top_shop].message_sell = fread_string(shop_f, buf4);
       read_line(shop_f, "%d", &SHOP_BROKE_TEMPER(top_shop));
       read_line(shop_f, "%d", &SHOP_BITVECTOR(top_shop));
       read_line(shop_f, "%d", &SHOP_KEEPER(top_shop));
@@ -1033,11 +1031,11 @@ void boot_the_shops(FILE * shop_f, char 
       SHOP_FUNC(top_shop) = 0;
       top_shop++;
     } else {
-      if (*buf == '$')		/* EOF */
+      if (*buf3 == '$')		/* EOF */
 	done = TRUE;
-      else if (strstr(buf, VERSION3_TAG))	/* New format marker */
+      else if (strstr(buf3, VERSION3_TAG))	/* New format marker */
 	new_format = 1;
-      free(buf);		/* Plug memory leak! */
+      free(buf3);		/* Plug memory leak! */
     }
   }
 }
@@ -1045,39 +1043,39 @@ void boot_the_shops(FILE * shop_f, char 
 
 void assign_the_shopkeepers(void)
 {
-  int index;
+  int index_n;
 
   cmd_say = find_command("say");
   cmd_tell = find_command("tell");
   cmd_emote = find_command("emote");
   cmd_slap = find_command("slap");
   cmd_puke = find_command("puke");
-  for (index = 0; index < top_shop; index++) {
-    if (mob_index[SHOP_KEEPER(index)].func)
-      SHOP_FUNC(index) = mob_index[SHOP_KEEPER(index)].func;
-    mob_index[SHOP_KEEPER(index)].func = shop_keeper;
+  for (index_n = 0; index_n < top_shop; index_n++) {
+    if (mob_index[SHOP_KEEPER(index_n)].func)
+      SHOP_FUNC(index_n) = mob_index[SHOP_KEEPER(index_n)].func;
+    mob_index[SHOP_KEEPER(index_n)].func = shop_keeper;
   }
 }
 
 
 char *customer_string(int shop_nr, int detailed)
 {
-  int index, cnt = 1;
-  static char buf[256];
+  int index_c, cnt = 1;
+  static char bufc[256];
 
-  *buf = 0;
-  for (index = 0; *trade_letters[index] != '\n'; index++, cnt *= 2)
+  *bufc = 0;
+  for (index_c = 0; *trade_letters[index_c] != '\n'; index_c++, cnt *= 2)
     if (!(SHOP_TRADE_WITH(shop_nr) & cnt))
       if (detailed) {
-	if (*buf)
-	  strcat(buf, ", ");
-	strcat(buf, trade_letters[index]);
+	if (*bufc)
+	  strcat(bufc, ", ");
+	strcat(bufc, trade_letters[index_c]);
       } else
-	sprintf(END_OF(buf), "%c", *trade_letters[index]);
+	sprintf(END_OF(bufc), "%c", *trade_letters[index_c]);
     else if (!detailed)
-      strcat(buf, "_");
+      strcat(bufc, "_");
 
-  return (buf);
+  return (bufc);
 }
 
 
@@ -1107,14 +1105,14 @@ void list_all_shops(struct char_data * c
 }
 
 
-void handle_detailed_list(char *buf, char *buf1, struct char_data * ch)
+void handle_detailed_list(char *b1, char *b2, struct char_data * ch)
 {
-  if ((strlen(buf1) + strlen(buf) < 78) || (strlen(buf) < 20))
-    strcat(buf, buf1);
+  if ((strlen(b2) + strlen(b1) < 78) || (strlen(b1) < 20))
+    strcat(b1, b2);
   else {
-    strcat(buf, "\n\r");
-    send_to_char(buf, ch);
-    sprintf(buf, "            %s", buf1);
+    strcat(b1, "\r\n");
+    send_to_char(b1, ch);
+    sprintf(b1, "            %s", b2);
   }
 }
 
@@ -1123,23 +1121,23 @@ void list_detailed_shop(struct char_data
 {
   struct obj_data *obj;
   struct char_data *k;
-  int index, temp;
+  int index_n, temp;
 
   sprintf(buf, "Vnum:       [%5d], Rnum: [%5d]\n\r", SHOP_NUM(shop_nr),
 	  shop_nr + 1);
   send_to_char(buf, ch);
 
   strcpy(buf, "Rooms:      ");
-  for (index = 0; SHOP_ROOM(shop_nr, index) != NOWHERE; index++) {
-    if (index)
+  for (index_n = 0; SHOP_ROOM(shop_nr, index_n) != NOWHERE; index_n++) {
+    if (index_n)
       strcat(buf, ", ");
-    if ((temp = real_room(SHOP_ROOM(shop_nr, index))) != NOWHERE)
+    if ((temp = real_room(SHOP_ROOM(shop_nr, index_n))) != NOWHERE)
       sprintf(buf1, "%s (#%d)", world[temp].name, world[temp].number);
     else
-      sprintf(buf1, "<UNKNOWN> (#%d)", SHOP_ROOM(shop_nr, index));
+      sprintf(buf1, "<UNKNOWN> (#%d)", SHOP_ROOM(shop_nr, index_n));
     handle_detailed_list(buf, buf1, ch);
   }
-  if (!index)
+  if (!index_n)
     send_to_char("Rooms:      None!\n\r", ch);
   else {
     strcat(buf, "\n\r");
@@ -1165,15 +1163,15 @@ void list_detailed_shop(struct char_data
   send_to_char(buf, ch);
 
   strcpy(buf, "Produces:   ");
-  for (index = 0; SHOP_PRODUCT(shop_nr, index) != NOTHING; index++) {
-    obj = &obj_proto[SHOP_PRODUCT(shop_nr, index)];
-    if (index)
+  for (index_n = 0; SHOP_PRODUCT(shop_nr, index_n) != NOTHING; index_n++) {
+    obj = &obj_proto[SHOP_PRODUCT(shop_nr, index_n)];
+    if (index_n)
       strcat(buf, ", ");
     sprintf(buf1, "%s (#%d)", obj->short_description,
-	    obj_index[SHOP_PRODUCT(shop_nr, index)].virtual);
+	    obj_index[SHOP_PRODUCT(shop_nr, index_n)].virtual);
     handle_detailed_list(buf, buf1, ch);
   }
-  if (!index)
+  if (!index_n)
     send_to_char("Produces:   Nothing!\n\r", ch);
   else {
     strcat(buf, "\n\r");
@@ -1181,18 +1179,18 @@ void list_detailed_shop(struct char_data
   }
 
   strcpy(buf, "Buys:       ");
-  for (index = 0; SHOP_BUYTYPE(shop_nr, index) != NOTHING; index++) {
-    if (index)
+  for (index_n = 0; SHOP_BUYTYPE(shop_nr, index_n) != NOTHING; index_n++) {
+    if (index_n)
       strcat(buf, ", ");
-    sprintf(buf1, "%s (#%d) ", item_types[SHOP_BUYTYPE(shop_nr, index)],
-	    SHOP_BUYTYPE(shop_nr, index));
-    if (SHOP_BUYWORD(shop_nr, index))
-      sprintf(END_OF(buf1), "[%s]", SHOP_BUYWORD(shop_nr, index));
+    sprintf(buf1, "%s (#%d) ", item_types[SHOP_BUYTYPE(shop_nr, index_n)],
+	    SHOP_BUYTYPE(shop_nr, index_n));
+    if (SHOP_BUYWORD(shop_nr, index_n))
+      sprintf(END_OF(buf1), "[%s]", SHOP_BUYWORD(shop_nr, index_n));
     else
       strcat(buf1, "[all]");
     handle_detailed_list(buf, buf1, ch);
   }
-  if (!index)
+  if (!index_n)
     send_to_char("Buys:       Nothing!\n\r", ch);
   else {
     strcat(buf, "\n\r");
@@ -1211,14 +1209,14 @@ void list_detailed_shop(struct char_data
 }
 
 
-void show_shops(struct char_data * ch, char *arg)
+void show_shops(struct char_data * ch, char *args)
 {
   int shop_nr;
 
-  if (!*arg)
+  if (!*args)
     list_all_shops(ch);
   else {
-    if (!str_cmp(arg, ".")) {
+    if (!str_cmp(args, ".")) {
       for (shop_nr = 0; shop_nr < top_shop; shop_nr++)
 	if (ok_shop_room(shop_nr, world[ch->in_room].number))
 	  break;
@@ -1227,8 +1225,8 @@ void show_shops(struct char_data * ch, c
 	send_to_char("This isn't a shop!\n\r", ch);
 	return;
       }
-    } else if (is_number(arg))
-      shop_nr = atoi(arg) - 1;
+    } else if (is_number(args))
+      shop_nr = atoi(args) - 1;
     else
       shop_nr = -1;
 
diff -up ../stk/spec_procs.c ./spec_procs.c
--- ../stk/spec_procs.c	Thu Jun 19 00:58:38 1997
+++ ./spec_procs.c	Fri Jul  4 22:39:23 1997
@@ -32,7 +32,11 @@ extern struct command_info cmd_info[];
 
 /* extern functions */
 void add_follower(struct char_data * ch, struct char_data * leader);
-
+ACMD(do_say);
+ACMD(do_drop);
+char *fname(char *namelist);
+ACMD(do_gen_door);
+int number(int from, int to);
 
 struct social_type {
   char *cmd;
@@ -69,28 +73,28 @@ void sort_spells(void)
 
 char *how_good(int percent)
 {
-  static char buf[256];
+  static char bufg[256];
 
   if (percent == 0)
-    strcpy(buf, " (not learned)");
+    strcpy(bufg, " (not learned)");
   else if (percent <= 10)
-    strcpy(buf, " (awful)");
+    strcpy(bufg, " (awful)");
   else if (percent <= 20)
-    strcpy(buf, " (bad)");
+    strcpy(bufg, " (bad)");
   else if (percent <= 40)
-    strcpy(buf, " (poor)");
+    strcpy(bufg, " (poor)");
   else if (percent <= 55)
-    strcpy(buf, " (average)");
+    strcpy(bufg, " (average)");
   else if (percent <= 70)
-    strcpy(buf, " (fair)");
+    strcpy(bufg, " (fair)");
   else if (percent <= 80)
-    strcpy(buf, " (good)");
+    strcpy(bufg, " (good)");
   else if (percent <= 85)
-    strcpy(buf, " (very good)");
+    strcpy(bufg, " (very good)");
   else
-    strcpy(buf, " (superb)");
+    strcpy(bufg, " (superb)");
 
-  return (buf);
+  return (bufg);
 }
 
 char *prac_types[] = {
@@ -197,9 +201,6 @@ SPECIAL(dump)
   struct obj_data *k;
   int value = 0;
 
-  ACMD(do_drop);
-  char *fname(char *namelist);
-
   for (k = world[ch->in_room].contents; k; k = world[ch->in_room].contents) {
     act("$p vanishes in a puff of smoke!", FALSE, 0, k, 0, TO_ROOM);
     extract_obj(k);
@@ -231,8 +232,6 @@ SPECIAL(dump)
 
 SPECIAL(mayor)
 {
-  ACMD(do_gen_door);
-
   static char open_path[] =
   "W3a3003b33000c111d0d111Oe333333Oe22c222112212111a1S.";
 
@@ -240,30 +239,30 @@ SPECIAL(mayor)
   "W3a3003b33000c111d0d111CE333333CE22c222112212111a1S.";
 
   static char *path;
-  static int index;
+  static int index_m;
   static bool move = FALSE;
 
   if (!move) {
     if (time_info.hours == 6) {
       move = TRUE;
       path = open_path;
-      index = 0;
+      index_m = 0;
     } else if (time_info.hours == 20) {
       move = TRUE;
       path = close_path;
-      index = 0;
+      index_m = 0;
     }
   }
   if (cmd || !move || (GET_POS(ch) < POS_SLEEPING) ||
       (GET_POS(ch) == POS_FIGHTING))
     return FALSE;
 
-  switch (path[index]) {
+  switch (path[index_m]) {
   case '0':
   case '1':
   case '2':
   case '3':
-    perform_move(ch, path[index] - '0', 1);
+    perform_move(ch, path[index_m] - '0', 1);
     break;
 
   case 'W':
@@ -319,7 +318,7 @@ SPECIAL(mayor)
 
   }
 
-  index++;
+  index_m++;
   return FALSE;
 }
 
@@ -466,8 +465,8 @@ SPECIAL(guild_guard)
   int i;
   extern int guild_info[][3];
   struct char_data *guard = (struct char_data *) me;
-  char *buf = "The guard humiliates you, and blocks your way.\r\n";
-  char *buf2 = "The guard humiliates $n, and blocks $s way.";
+  char *bufr = "The guard humiliates you, and blocks your way.\r\n";
+  char *bufr2 = "The guard humiliates $n, and blocks $s way.";
 
   if (!IS_MOVE(cmd) || IS_AFFECTED(guard, AFF_BLIND))
     return FALSE;
@@ -479,8 +478,8 @@ SPECIAL(guild_guard)
     if ((IS_NPC(ch) || GET_CLASS(ch) != guild_info[i][0]) &&
 	world[ch->in_room].number == guild_info[i][1] &&
 	cmd == guild_info[i][2]) {
-      send_to_char(buf, ch);
-      act(buf2, FALSE, ch, 0, 0, TO_ROOM);
+      send_to_char(bufr, ch);
+      act(bufr2, FALSE, ch, 0, 0, TO_ROOM);
       return TRUE;
     }
   }
@@ -492,8 +491,6 @@ SPECIAL(guild_guard)
 
 SPECIAL(puff)
 {
-  ACMD(do_say);
-
   if (cmd)
     return (0);
 
@@ -614,7 +611,7 @@ SPECIAL(cityguard)
 
 SPECIAL(pet_shops)
 {
-  char buf[MAX_STRING_LENGTH], pet_name[256];
+  char pet_name[256];
   int pet_room;
   struct char_data *pet;
 
diff -up ../stk/spell_parser.c ./spell_parser.c
--- ../stk/spell_parser.c	Thu Jun 19 00:58:38 1997
+++ ./spell_parser.c	Fri Jul  4 22:41:09 1997
@@ -22,6 +22,7 @@
 #include "db.h"
 
 struct spell_info_type spell_info[TOP_SPELL_DEFINE + 1];
+int number(int from, int to);
 
 #define SINFO spell_info[spellnum]
 
@@ -284,16 +285,16 @@ char *skill_name(int num)
 	 
 int find_skill_num(char *name)
 {
-  int index = 0, ok;
+  int index_s = 0, ok;
   char *temp, *temp2;
   char first[256], first2[256];
 
-  while (*spells[++index] != '\n') {
-    if (is_abbrev(name, spells[index]))
-      return index;
+  while (*spells[++index_s] != '\n') {
+    if (is_abbrev(name, spells[index_s]))
+      return index_s;
 
     ok = 1;
-    temp = any_one_arg(spells[index], first);
+    temp = any_one_arg(spells[index_s], first);
     temp2 = any_one_arg(name, first2);
     while (*first && *first2 && ok) {
       if (!is_abbrev(first2, first))
@@ -303,7 +304,7 @@ int find_skill_num(char *name)
     }
 
     if (ok && !*first2)
-      return index;
+      return index_s;
   }
 
   return -1;
@@ -553,11 +554,11 @@ void mag_objectmagic(struct char_data * 
 int cast_spell(struct char_data * ch, struct char_data * tch,
 	           struct obj_data * tobj, int spellnum)
 {
-  char buf[256];
+  char bufc[256];
 
   if (spellnum < 0 || spellnum > TOP_SPELL_DEFINE) {
-    sprintf(buf, "SYSERR: cast_spell trying to call spellnum %d\n", spellnum);
-    log(buf);
+    sprintf(bufc, "SYSERR: cast_spell trying to call spellnum %d\n", spellnum);
+    log(bufc);
     return 0;
   }
     
@@ -747,26 +748,26 @@ ACMD(do_cast)
 
 void spell_level(int spell, int class, int level)
 {
-  char buf[256];
+  char bufl[256];
   int bad = 0;
 
   if (spell < 0 || spell > TOP_SPELL_DEFINE) {
-    sprintf(buf, "SYSERR: attempting assign to illegal spellnum %d", spell);
-    log(buf);
+    sprintf(bufl, "SYSERR: attempting assign to illegal spellnum %d", spell);
+    log(bufl);
     return;
   }
 
   if (class < 0 || class >= NUM_CLASSES) {
-    sprintf(buf, "SYSERR: assigning '%s' to illegal class %d",
+    sprintf(bufl, "SYSERR: assigning '%s' to illegal class %d",
 	    skill_name(spell), class);
-    log(buf);
+    log(bufl);
     bad = 1;
   }
 
   if (level < 1 || level > LVL_IMPL) {
-    sprintf(buf, "SYSERR: assigning '%s' to illegal level %d",
+    sprintf(bufl, "SYSERR: assigning '%s' to illegal level %d",
 	    skill_name(spell), level);
-    log(buf);
+    log(bufl);
     bad = 1;
   }
 
diff -up ../stk/spells.c ./spells.c
--- ../stk/spells.c	Thu Jun 19 00:58:38 1997
+++ ./spells.c	Fri Jul  4 21:50:12 1997
@@ -41,9 +41,12 @@ extern struct apply_mod_defaults *apmd;
 void clearMemory(struct char_data * ch);
 void act(char *str, int i, struct char_data * c, struct obj_data * o,
 	      void *vict_obj, int j);
-
+int number(int from, int to);
 void damage(struct char_data * ch, struct char_data * victim,
-	         int damage, int weapontype);
+	         int damge, int weapontype);
+struct time_info_data age(struct char_data * ch);
+void name_to_drinkcon(struct obj_data * obj, int type);
+void name_from_drinkcon(struct obj_data * obj);
 
 void weight_change_object(struct obj_data * obj, int weight);
 void add_follower(struct char_data * ch, struct char_data * leader);
@@ -58,9 +61,6 @@ ASPELL(spell_create_water)
 {
   int water;
 
-  void name_to_drinkcon(struct obj_data * obj, int type);
-  void name_from_drinkcon(struct obj_data * obj);
-
   if (ch == NULL || obj == NULL)
     return;
   level = MAX(MIN(level, LVL_IMPL), 1);
@@ -276,8 +276,6 @@ ASPELL(spell_identify)
 {
   int i;
   int found;
-
-  struct time_info_data age(struct char_data * ch);
 
   extern char *spells[];
 
Common subdirectories: ../stk/util and ./util
diff -up ../stk/utils.c ./utils.c
--- ../stk/utils.c	Thu Jun 19 00:58:39 1997
+++ ./utils.c	Fri Jul  4 21:38:25 1997
@@ -38,14 +38,14 @@ int number(int from, int to)
 
 
 /* simulates dice roll */
-int dice(int number, int size)
+int dice(int num, int size)
 {
   int sum = 0;
 
-  if (size <= 0 || number <= 0)
+  if (size <= 0 || num <= 0)
     return 0;
 
-  while (number-- > 0)
+  while (num-- > 0)
     sum += ((random() % size) + 1);
 
   return sum;
diff -up ../stk/utils.h ./utils.h
--- ../stk/utils.h	Thu Jun 19 00:58:39 1997
+++ ./utils.h	Fri Jul  4 20:13:42 1997
@@ -27,11 +27,10 @@ void	log(char *str);
 int	touch(char *path);
 void	mudlog(char *str, char type, int level, byte file);
 void	log_death_trap(struct char_data *ch);
-int	number(int from, int to);
 int	dice(int number, int size);
 void	sprintbit(long vektor, char *names[], char *result);
 void	sprinttype(int type, char *names[], char *result);
-int	get_line(FILE *fl, char *buf);
+int	get_line(FILE *fl, char *bufl);
 int	get_filename(char *orig_name, char *filename, int mode);
 struct time_info_data age(struct char_data *ch);
 int	num_pc_in_room(struct room_data *room);