Crossfire Mailing List Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CF: skill_util.c patch...




	Argh. I just realized my patch for skill_util.c was 
	not quite right. The line:

> who->contr->shoottype=shoottype;

	in check_skill_to_fire should be uncommented (I put
	something on that line saying it was extraneous, wrong!)

	Below this message, I include a diff file for how 
	the patch *should* be. (Mark please apply this one
	instead of previous one).

					-b.t.

*** skill_util.c.orig	Sun Apr 21 01:07:38 1996
--- skill_util.c	Wed Jun  5 13:50:49 1996
***************
*** 548,561 ****
         break;
      default:
         LOG(llevError,"Warning: bad call of check_skill_to_fire()\n");
         return 0;
    }
    if(who->chosen_skill!=NULL && (skillnr == who->chosen_skill->stats.sp))
      return 1;
!   else if (change_skill(who,skillnr)) { 
!     who->contr->shoottype=shoottype;
      return 1;
    } else 
      return 0;
  }
  
--- 562,581 ----
         break;
      default:
         LOG(llevError,"Warning: bad call of check_skill_to_fire()\n");
         return 0;
    }
+ /*
    if(who->chosen_skill!=NULL && (skillnr == who->chosen_skill->stats.sp))
      return 1;
!  */
!   if (change_skill(who,skillnr)) { 
!     who->contr->shoottype=shoottype;
! #ifdef SKILL_UTIL_DEBUG
! 	LOG(llevDebug,"check_skill_to_fire(): got skill:%s for %s\n"
! 	  ,skills[skillnr].name,who->name);
! #endif
      return 1;
    } else 
      return 0;
  }