Difference for server/apply.c from version 1.66 to 1.67


version 1.66 version 1.67
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_apply_c =   * static char *rcsid_apply_c =
  *   "$Id: apply.c,v 1.66 2002/09/23 06:27:54 mwedel Exp $";   *   "$Id: apply.c,v 1.67 2002/09/28 07:19:39 mwedel Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 670
 
Line 670
     }      }
   }    }
   item=arch_to_object(converter->other_arch);    item=arch_to_object(converter->other_arch);
     if (!item) {
       LOG(llevError,"Broken converter %s at %s (%d, %d)\n",
    converter->name, converter->map->path, converter->x, converter->y);
       return 0;
     }
   if(CONV_NR(converter))    if(CONV_NR(converter))
     item->nrof=CONV_NR(converter);      item->nrof=CONV_NR(converter);
   if(nr)    if(nr)
Line 1001
 
Line 1006
                        shop_mat);                         shop_mat);
      }       }
  }   }
    /* Don't teleport things like spell effects */
    if (QUERY_FLAG(op, FLAG_NO_PICK)) return 0;
   
  /* Removed code that checked for multipart objects - it appears that   /* Removed code that checked for multipart objects - it appears that
  * the teleport function should be able to handle this just fine.   * the teleport function should be able to handle this just fine.
  */   */


Legend:
line(s) removed in v.1.66 
line(s) changed
 line(s) added in v.1.67

File made using version 1.98 of cvs2html by leaf at 2011-07-21 17:23