Difference for server/gods.c from version 1.28 to 1.29


version 1.28 version 1.29
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_gods_c =   * static char *rcsid_gods_c =
  *   "$Id: gods.c,v 1.28 2001/10/30 02:30:20 michtoen Exp $";   *   "$Id: gods.c,v 1.29 2002/04/24 06:31:49 mwedel Exp $";
  */   */
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
Line 370
 
Line 370
     check_special_prayers (op, new_god);      check_special_prayers (op, new_god);
 }  }
   
   /* op is the player.
    * exp_obj is the widsom experience.
    * flag is the flag to check against.
    * string is the string to print out.
    */
   
 int worship_forbids_use (object *op, object *exp_obj, uint32 flag, char *string) {  int worship_forbids_use (object *op, object *exp_obj, uint32 flag, char *string) {
   
   if(QUERY_FLAG(&op->arch->clone,flag))    if(QUERY_FLAG(&op->arch->clone,flag))
Line 402
 
Line 408
  */   */
   
 void update_priest_flag (object *god, object *exp_ob, uint32 flag) {  void update_priest_flag (object *god, object *exp_ob, uint32 flag) {
 /* GROS - Corrected here the 'god flowers' bug. */  
       if(QUERY_FLAG(god,flag)&&!QUERY_FLAG(exp_ob,flag))        if(QUERY_FLAG(god,flag)&&!QUERY_FLAG(exp_ob,flag))
           SET_FLAG(exp_ob,flag);            SET_FLAG(exp_ob,flag);
       else if(QUERY_FLAG(exp_ob,flag)&&!QUERY_FLAG(god,flag))        else if(QUERY_FLAG(exp_ob,flag)&&!QUERY_FLAG(god,flag))
       {        {
         if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))   /*  When this is called with the exp_ob set to the player,
    * this check is broken, because most all players arch
    * allow use of weapons.  I'm not actually sure why this
    * check is here - I guess if you had a case where the
    * value in the archetype (wisdom) should over ride the restrictions
    * the god places on it, this may make sense.  But I don't think
    * there is any case like that.
    */
   
   /*        if (!(QUERY_FLAG(&(exp_ob->arch->clone),flag)))*/
                 CLEAR_FLAG(exp_ob,flag);                  CLEAR_FLAG(exp_ob,flag);
       };        };
 }  }


Legend:
line(s) removed in v.1.28 
line(s) changed
 line(s) added in v.1.29

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