[Crossfire-cvs] CVS commit: crossfire/server

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

Module Name:	crossfire
Committed By:	garbled
Date:		Wed Dec 18 16:52:13 UTC 2002

Modified Files:
	crossfire/server: spell_effect.c

Log Message:
Don't allow players to alchemy cauldrons into gold nuggets.



Start of context diffs


Index: crossfire/server/spell_effect.c
diff -c crossfire/server/spell_effect.c:1.85 crossfire/server/spell_effect.c:1.86
*** crossfire/server/spell_effect.c:1.85	Wed Dec 18 08:39:59 2002
--- crossfire/server/spell_effect.c	Wed Dec 18 08:52:12 2002
***************
*** 1,6 ****
  /*
   * static char *rcsid_spell_effect_c =
!  *   "$Id: spell_effect.c,v 1.85 2002/12/18 16:39:59 garbled Exp $";
   */
  
  
--- 1,6 ----
  /*
   * static char *rcsid_spell_effect_c =
!  *   "$Id: spell_effect.c,v 1.86 2002/12/18 16:52:12 garbled Exp $";
   */
  
  
***************
*** 2089,2095 ****
  	value=0;
      else if (obj->type==MONEY || obj->type==GEM)
  	value /=3;
!     else if (QUERY_FLAG(obj,FLAG_UNPAID)) value=0;
      else
  	value *= 0.9;
  
--- 2089,2096 ----
  	value=0;
      else if (obj->type==MONEY || obj->type==GEM)
  	value /=3;
!     else if (QUERY_FLAG(obj, FLAG_UNPAID))
! 	value=0;
      else
  	value *= 0.9;
  
***************
*** 2171,2183 ****
  
  	for(tmp=get_map_ob(op->map,x,y);tmp!=NULL;tmp=next) {
            next=tmp->above;
! 	  if (tmp->weight>0 && !QUERY_FLAG(tmp, FLAG_NO_PICK)
! 	      && !QUERY_FLAG(tmp, FLAG_ALIVE)) {
  	    if (tmp->inv) {
! 		object *next1,*tmp1;
  		for (tmp1 = tmp->inv; tmp1!=NULL; tmp1=next1) {
  		    next1 = tmp1->below;
! 		    if (tmp1->weight>0 && !QUERY_FLAG(tmp1, FLAG_NO_PICK) && !QUERY_FLAG(tmp1, FLAG_ALIVE))
  		        alchemy_object(tmp1, &small_nuggets, &large_nuggets,
  			   &weight);
  		}
--- 2172,2187 ----
  
  	for(tmp=get_map_ob(op->map,x,y);tmp!=NULL;tmp=next) {
            next=tmp->above;
! 	  if (tmp->weight>0 && !QUERY_FLAG(tmp, FLAG_NO_PICK) &&
! 	      !QUERY_FLAG(tmp, FLAG_ALIVE) &&
! 	      !QUERY_FLAG(tmp, FLAG_IS_CAULDRON)) {
  	    if (tmp->inv) {
! 		object *next1, *tmp1;
  		for (tmp1 = tmp->inv; tmp1!=NULL; tmp1=next1) {
  		    next1 = tmp1->below;
! 		    if (tmp1->weight>0 && !QUERY_FLAG(tmp1, FLAG_NO_PICK) &&
! 			!QUERY_FLAG(tmp1, FLAG_ALIVE) &&
! 			!QUERY_FLAG(tmp1, FLAG_IS_CAULDRON))
  		        alchemy_object(tmp1, &small_nuggets, &large_nuggets,
  			   &weight);
  		}