| … | |
… | |
| 473 | object::change_weapon (object *ob) |
473 | object::change_weapon (object *ob) |
| 474 | { |
474 | { |
| 475 | if (current_weapon == ob) |
475 | if (current_weapon == ob) |
| 476 | return true; |
476 | return true; |
| 477 | |
477 | |
|
|
478 | if (chosen_skill) |
|
|
479 | chosen_skill->flag [FLAG_APPLIED] = false; |
|
|
480 | |
| 478 | current_weapon = ob; |
481 | current_weapon = ob; |
| 479 | chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); |
482 | chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); |
|
|
483 | |
|
|
484 | if (chosen_skill) |
|
|
485 | chosen_skill->flag [FLAG_APPLIED] = true; |
|
|
486 | |
|
|
487 | if (ob && !ob->flag [FLAG_APPLIED]) |
|
|
488 | { |
|
|
489 | LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s", |
|
|
490 | &name, ob->debug_desc ()); |
|
|
491 | return false; |
|
|
492 | } |
| 480 | |
493 | |
| 481 | update_stats (); |
494 | update_stats (); |
| 482 | |
495 | |
| 483 | if (ob) |
496 | if (ob) |
| 484 | { |
497 | { |
