Crossfire Mailing List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

0.91.6 container/pickup fix.




 Here is a patch.  You will probably need to use the -l flag to
patch, since this is just a quick cut and paste (and thus tabs are
converted to spaces in this process)

*** 1.12        1994/11/09 03:31:55
--- c_object.c  1994/11/19 06:17:22
***************
*** 281,287 ****
  
  void pick_up(object *op,object *alt) 
  {
!     object *tmp, *split;
  
      if(alt)
        tmp=alt;
--- 281,287 ----
  
  void pick_up(object *op,object *alt) 
  {
!     object *tmp=NULL, *split=NULL;
  
      if(alt)
        tmp=alt;
***************
*** 326,334 ****
       * pick_up_object will split them again, but no easy solution
       * to that problem.
       */
!     if (tmp!=split) {
        tmp->nrof += split->nrof;
!       free(split);
      }
      pick_up_object(op, alt, tmp, op->contr->count);
      op->contr->count=0;
--- 326,334 ----
       * pick_up_object will split them again, but no easy solution
       * to that problem.
       */
!     if (split && tmp!=split) {
        tmp->nrof += split->nrof;
!       free_object(split);
      }
      pick_up_object(op, alt, tmp, op->contr->count);
      op->contr->count=0;

 --Mark