| version 1.58 | | version 1.59 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_skills_c = | | * static char *rcsid_skills_c = |
| * "$Id: skills.c,v 1.58 2005/07/16 14:20:39 akirschbaum Exp $"; | | * "$Id: skills.c,v 1.59 2005/07/16 21:10:40 akirschbaum Exp $"; |
| */ | | */ |
| /* | | /* |
| CrossFire, A Multiplayer game for X-windows | | CrossFire, A Multiplayer game for X-windows |
| | |
| if(QUERY_FLAG(tmp,FLAG_FRIENDLY)&&(tmp->move_type==PETMOVE)){ | | if(QUERY_FLAG(tmp,FLAG_FRIENDLY)&&(tmp->move_type==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 speach.\n"); | | "Your follower loves your speech.\n"); |
| return 0; | | return 0; |
| } else if (skill->level > tmp->level) { | | } else if (skill->level > tmp->level) { |
| /* you steal the follower. Perhaps we should really look at the | | /* you steal the follower. Perhaps we should really look at the |
| | |
| /* Charm failed. Creature may be angry now */ | | /* Charm failed. Creature may be angry now */ |
| else if((skill->level+((pl->stats.Cha-10)/2)) < random_roll(1, 2*tmp->level, pl, PREFER_LOW)) { | | else if((skill->level+((pl->stats.Cha-10)/2)) < random_roll(1, 2*tmp->level, pl, PREFER_LOW)) { |
| new_draw_info_format(NDI_UNIQUE, 0,pl, | | new_draw_info_format(NDI_UNIQUE, 0,pl, |
| "Your speach angers the %s!\n",query_name(tmp)); | | "Your speech angers the %s!\n",query_name(tmp)); |
| 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); |