Difference for server/apply.c from version 1.126 to 1.127


version 1.126 version 1.127
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_apply_c =   * static char *rcsid_apply_c =
  *   "$Id: apply.c,v 1.126 2005/05/21 17:35:31 tchize Exp $";   *   "$Id: apply.c,v 1.127 2005/05/21 19:33:10 akirschbaum Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 2663
 
Line 2663
      tmp2->above = op->above;       tmp2->above = op->above;
      tmp2->stats.food = op->stats.food;       tmp2->stats.food = op->stats.food;
      CLEAR_FLAG(tmp2, FLAG_APPLIED);       CLEAR_FLAG(tmp2, FLAG_APPLIED);
        if (QUERY_FLAG(op, FLAG_INV_LOCKED))
    SET_FLAG(tmp2, FLAG_INV_LOCKED);
      if (who->type == PLAYER)       if (who->type == PLAYER)
  esrv_del_item(who->contr, (tag_t)op->count);   esrv_del_item(who->contr, (tag_t)op->count);
      remove_ob(op);       remove_ob(op);
Line 3145
 
Line 3147
      tmp2 = arch_to_object(op->other_arch);       tmp2 = arch_to_object(op->other_arch);
      tmp2->stats.food = op->stats.food;       tmp2->stats.food = op->stats.food;
      SET_FLAG(tmp2, FLAG_APPLIED);       SET_FLAG(tmp2, FLAG_APPLIED);
        if (QUERY_FLAG(op, FLAG_INV_LOCKED))
    SET_FLAG(tmp2, FLAG_INV_LOCKED);
      insert_ob_in_ob(tmp2, who);       insert_ob_in_ob(tmp2, who);
   
      /* Remove the old lantern */       /* Remove the old lantern */


Legend:
line(s) removed in v.1.126 
line(s) changed
 line(s) added in v.1.127

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