| version 1.63 | | version 1.64 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_skills_c = | | * static char *rcsid_skills_c = |
| * "$Id: skills.c,v 1.63 2005/08/12 13:46:34 ryo_saeba Exp $"; | | * "$Id: skills.c,v 1.64 2005/09/13 06:46:35 mwedel Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| } | | } |
| | | |
| /* it's already allied! */ | | /* it's already allied! */ |
| if(QUERY_FLAG(tmp,FLAG_FRIENDLY)&&(tmp->move_type==PETMOVE)){ | | if(QUERY_FLAG(tmp,FLAG_FRIENDLY)&&(tmp->attack_movement==PETMOVE)){ |
| if(get_owner(tmp)==pl) { | | if(get_owner(tmp)==pl) { |
| new_draw_info(NDI_UNIQUE, 0,pl, | | new_draw_info(NDI_UNIQUE, 0,pl, |
| "Your follower loves your speech.\n"); | | "Your follower loves your speech.\n"); |
| | |
| tmp->stats.exp = 0; | | tmp->stats.exp = 0; |
| add_friendly_object(tmp); | | add_friendly_object(tmp); |
| SET_FLAG(tmp,FLAG_FRIENDLY); | | SET_FLAG(tmp,FLAG_FRIENDLY); |
| tmp->move_type = PETMOVE; | | tmp->attack_movement = PETMOVE; |
| return calc_skill_exp(pl,tmp, skill); | | return calc_skill_exp(pl,tmp, skill); |
| } | | } |
| /* Charm failed. Creature may be angry now */ | | /* Charm failed. Creature may be angry now */ |
| | |
| if(QUERY_FLAG(tmp,FLAG_FRIENDLY)) { | | if(QUERY_FLAG(tmp,FLAG_FRIENDLY)) { |
| CLEAR_FLAG(tmp,FLAG_FRIENDLY); | | CLEAR_FLAG(tmp,FLAG_FRIENDLY); |
| remove_friendly_object(tmp); | | remove_friendly_object(tmp); |
| tmp->move_type = 0; /* needed? */ | | tmp->attack_movement = 0; /* needed? */ |
| } | | } |
| CLEAR_FLAG(tmp,FLAG_UNAGGRESSIVE); | | CLEAR_FLAG(tmp,FLAG_UNAGGRESSIVE); |
| } | | } |