[Crossfire-cvs] CVS commit: crossfire/server

[<cro...@li...>]

Module Name:	crossfire
Committed By:	tchize
Date:		Sat Aug  2 16:02:51 UTC 2003

Modified Files:
	crossfire/server: c_object.c

Log Message:
Correct a bug in find_best_object_apply_match so now match is coherent
with find_best_object_match
patch according to what submitted by Nicolas Wegeer on cf-devel mailing
on 1st of august 2003 with subject
"[CF-Devel] Patch submission: apply item matching bug"



Start of context diffs


Index: crossfire/server/c_object.c
diff -c crossfire/server/c_object.c:1.49 crossfire/server/c_object.c:1.50
*** crossfire/server/c_object.c:1.49	Thu Jun 26 04:27:43 2003
--- crossfire/server/c_object.c	Sat Aug  2 09:02:50 2003
***************
*** 1,6 ****
  /*
   * static char *rcsid_c_object_c =
!  *   "$Id: c_object.c,v 1.49 2003/06/26 11:27:43 gros Exp $";
   */
  /*
      CrossFire, A Multiplayer game for X-windows
--- 1,6 ----
  /*
   * static char *rcsid_c_object_c =
!  *   "$Id: c_object.c,v 1.50 2003/08/02 16:02:50 tchize Exp $";
   */
  /*
      CrossFire, A Multiplayer game for X-windows
***************
*** 83,89 ****
  
      for (tmp=pl->inv; tmp; tmp=tmp->below) {
  	if (tmp->invisible) continue;
! 	if ((tmpmatch=item_matched_string(pl, tmp, params))>=match_val) {
  	  if ((aflag==AP_APPLY) && (QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
  	  if ((aflag==AP_UNAPPLY) && (!QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
  	    match_val=tmpmatch;
--- 83,89 ----
  
      for (tmp=pl->inv; tmp; tmp=tmp->below) {
  	if (tmp->invisible) continue;
! 	if ((tmpmatch=item_matched_string(pl, tmp, params))>match_val) {
  	  if ((aflag==AP_APPLY) && (QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
  	  if ((aflag==AP_UNAPPLY) && (!QUERY_FLAG(tmp,FLAG_APPLIED))) continue;
  	    match_val=tmpmatch;