1 | /* |
1 | /* |
2 | * static char *rcsid_skill_util_c = |
2 | * static char *rcsid_skill_util_c = |
3 | * "$Id: skill_util.C,v 1.3 2006/08/26 08:44:07 root Exp $"; |
3 | * "$Id: skill_util.C,v 1.4 2006/08/29 05:03:55 root Exp $"; |
4 | */ |
4 | */ |
5 | /* |
5 | /* |
6 | CrossFire, A Multiplayer game for X-windows |
6 | CrossFire, A Multiplayer game for X-windows |
7 | |
7 | |
8 | Copryight (C) 2002 Mark Wedel & Crossfire Development Team |
8 | Copryight (C) 2002 Mark Wedel & Crossfire Development Team |
… | |
… | |
905 | LOG(llevError,"Player %s does not have current weapon set but flag_ready_weapon is set\n", |
905 | LOG(llevError,"Player %s does not have current weapon set but flag_ready_weapon is set\n", |
906 | op->name); |
906 | op->name); |
907 | for (tmp=op->inv; tmp; tmp=tmp->below) |
907 | for (tmp=op->inv; tmp; tmp=tmp->below) |
908 | if (tmp->type == WEAPON && QUERY_FLAG(tmp, FLAG_APPLIED)) break; |
908 | if (tmp->type == WEAPON && QUERY_FLAG(tmp, FLAG_APPLIED)) break; |
909 | |
909 | |
910 | if (op->current_weapon_script) |
|
|
911 | FREE_AND_CLEAR_STR(op->current_weapon_script); |
|
|
912 | if (!tmp) { |
910 | if (!tmp) { |
913 | LOG(llevError,"Could not find applied weapon on %s\n", |
911 | LOG(llevError,"Could not find applied weapon on %s\n", |
914 | op->name); |
912 | op->name); |
915 | op->current_weapon=NULL; |
913 | op->current_weapon=NULL; |
916 | return 0; |
914 | return 0; |
917 | } else { |
915 | } else { |
918 | op->current_weapon = tmp; |
916 | op->current_weapon = tmp; |
919 | op->current_weapon_script=add_string(query_name(tmp)); |
|
|
920 | } |
917 | } |
921 | } |
918 | } |
922 | |
919 | |
923 | /* Has ready weapon - make sure chosen_skill is set up properly */ |
920 | /* Has ready weapon - make sure chosen_skill is set up properly */ |
924 | if (!op->chosen_skill || op->current_weapon->skill != op->chosen_skill->skill) { |
921 | if (!op->chosen_skill || op->current_weapon->skill != op->chosen_skill->skill) { |