[Crossfire-cvs] CVS commit: crossfire/server

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

Module Name:	crossfire
Committed By:	garbled
Date:		Fri Dec 13 07:23:00 UTC 2002

Modified Files:
	crossfire/server: player.c

Log Message:
Per Mark's suggestion, make it so attacktype is only transferred to arrows
that have AT_PHYSICAL only.  To avoid fire/cold arrows and the like.



Start of context diffs


Index: crossfire/server/player.c
diff -c crossfire/server/player.c:1.110 crossfire/server/player.c:1.111
*** crossfire/server/player.c:1.110	Thu Dec 12 21:09:49 2002
--- crossfire/server/player.c	Thu Dec 12 23:23:00 2002
***************
*** 1,6 ****
  /*
   * static char *rcsid_player_c =
!  *   "$Id: player.c,v 1.110 2002/12/13 05:09:49 garbled Exp $";
   */
  
  /*
--- 1,6 ----
  /*
   * static char *rcsid_player_c =
!  *   "$Id: player.c,v 1.111 2002/12/13 07:23:00 garbled Exp $";
   */
  
  /*
***************
*** 1376,1389 ****
  	    dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc -
  	    bow->stats.wc;
  	arrow->level = SK_level (op);
! 	arrow->attacktype |= bow->attacktype;
  	if (bow->slaying != NULL)
  	    arrow->slaying = strdup(bow->slaying);
      } else {
  	arrow->stats.wc= op->stats.wc - bow->magic - arrow->magic -
  		    arrow->stats.wc;
  	arrow->level = op->level;
! 	arrow->attacktype |= bow->attacktype;
  	if (bow->slaying != NULL)
  	    arrow->slaying = strdup(bow->slaying);
      }
--- 1376,1391 ----
  	    dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc -
  	    bow->stats.wc;
  	arrow->level = SK_level (op);
! 	if (arrow->attacktype == AT_PHYSICAL)
! 	    arrow->attacktype |= bow->attacktype;
  	if (bow->slaying != NULL)
  	    arrow->slaying = strdup(bow->slaying);
      } else {
  	arrow->stats.wc= op->stats.wc - bow->magic - arrow->magic -
  		    arrow->stats.wc;
  	arrow->level = op->level;
! 	if (arrow->attacktype == AT_PHYSICAL)
! 	    arrow->attacktype |= bow->attacktype;
  	if (bow->slaying != NULL)
  	    arrow->slaying = strdup(bow->slaying);
      }