Difference for server/c_object.c from version 1.4 to 1.5


version 1.4 version 1.5
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_c_object_c =   * static char *rcsid_c_object_c =
  *   "$Id: c_object.c,v 1.4 2000/03/22 07:32:21 cvs Exp $";   *   "$Id: c_object.c,v 1.5 2000/05/26 09:50:49 jec Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 198
 
Line 198
    return change_skill(pl,skillno);     return change_skill(pl,skillno);
 }  }
   
 void apply_inventory(object *op) {  
   object *inv;  
   if(op->contr->last_used!=NULL) {  
     inv=op->contr->last_used;  
     if(QUERY_FLAG(inv, FLAG_FREED)||inv->count!=op->contr->last_used_id||  
        inv->env==NULL||(inv->env!=op&&inv->env->env!=op)) {  
       op->contr->last_used=NULL;  
       op->contr->last_used_id=0;  
       apply_inventory(op);  
       return;  
     }  
   } else {  
     for (inv=op->inv; inv && inv->invisible; inv=inv->below) ;  
   }  
   if(inv) {  
     if(!apply(op,inv,0)) {  
       new_draw_info_format(NDI_UNIQUE, 0, op,  
  "I don't know how to apply the %s.",query_name(inv));  
     }  
   } else {  
     new_draw_info(NDI_UNIQUE, 0,op, "You have nothing to apply!");  
   }  
 }  
   
 int command_apply (object *op, char *params)  int command_apply (object *op, char *params)
 {  {
   if (!params) {    if (!params) {
     apply_below(op);      player_apply_below(op);
     return 0;      return 0;
   }    }
   else {    else {
Line 245
 
Line 221
   
     inv=find_best_object_match(op, params);      inv=find_best_object_match(op, params);
     if (inv) {      if (inv) {
  if(!apply(op,inv,aflag)) {   player_apply(op,inv,aflag,0);
    new_draw_info_format(NDI_UNIQUE, 0, op,  
      "I don't know how to apply the %s.",query_name(inv));  
  }  
     } else      } else
    new_draw_info_format(NDI_UNIQUE, 0, op,     new_draw_info_format(NDI_UNIQUE, 0, op,
      "Could not find any match to %s.",params);       "Could not find any match to %s.",params);
Line 680
 
Line 653
   
     tmp->x = op->x;      tmp->x = op->x;
     tmp->y = op->y;      tmp->y = op->y;
     insert_ob_in_map(tmp, op->map);      insert_ob_in_map(tmp, op->map, op);
   
       SET_FLAG (op, FLAG_NO_APPLY);
     remove_ob(op);      remove_ob(op);
     insert_ob_in_map_simple(op, op->map);      insert_ob_in_map_simple(op, op->map);
       CLEAR_FLAG (op, FLAG_NO_APPLY);
   
     /* Call this before we update the various windows/players.  At least      /* Call this before we update the various windows/players.  At least
      * that we, we know the weight is correct.       * that we, we know the weight is correct.


Legend:
line(s) removed in v.1.4 
line(s) changed
 line(s) added in v.1.5

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