*** cque.c	1995/03/20 23:59:59	1.8
--- cque.c	1999/08/08 23:52:30
***************
*** 107,120 ****
      for (point = mudstate.qfirst; point; point = point->next)
  	if (que_want(point, player, object)) {
  	    numhalted++;
! 	    point->player = 0;
  	}
      /* Object queue */
  
      for (point = mudstate.qlfirst; point; point = point->next)
  	if (que_want(point, player, object)) {
  	    numhalted++;
! 	    point->player = 0;
  	}
      /* Wait queue */
  
--- 115,128 ----
      for (point = mudstate.qfirst; point; point = point->next)
  	if (que_want(point, player, object)) {
  	    numhalted++;
! 	    point->player = -1;
  	}
      /* Object queue */
  
      for (point = mudstate.qlfirst; point; point = point->next)
  	if (que_want(point, player, object)) {
  	    numhalted++;
! 	    point->player = -1;
  	}
      /* Wait queue */
  
***************
*** 665,676 ****
  	    return count;
  	}
  	player = mudstate.qfirst->player;
! 	if ((player > 0) && !Going(player)) {
  	    giveto(player, mudconf.waitcost);
  	    mudstate.curr_enactor = mudstate.qfirst->cause;
  	    mudstate.curr_player = player;
  	    a_Queue(Owner(player), -1);
! 	    mudstate.qfirst->player = 0;
  	    if (!Halted(player)) {
  
  		/* Load scratch args */
--- 687,698 ----
  	    return count;
  	}
  	player = mudstate.qfirst->player;
! 	if (Good_obj(player) && !Going(player)) {
  	    giveto(player, mudconf.waitcost);
  	    mudstate.curr_enactor = mudstate.qfirst->cause;
  	    mudstate.curr_player = player;
  	    a_Queue(Owner(player), -1);
! 	    mudstate.qfirst->player = -1;
  	    if (!Halted(player)) {
  
  		/* Load scratch args */
***************
*** 796,802 ****
  		free_lbuf(bp);
  	    }
  	    free_lbuf(bufp);
! 	} else if (tmp->player == 0) {
  	    (*qdel)++;
  	}
      }
--- 866,872 ----
  		free_lbuf(bp);
  	    }
  	    free_lbuf(bufp);
! 	} else if (tmp->player == -1) {
  	    (*qdel)++;
  	}
      }