ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.148 by root, Mon May 14 19:08:25 2007 UTC vs.
Revision 1.149 by root, Mon May 14 19:56:45 2007 UTC

… …
473object::change_weapon (object *ob) 473object::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
481 current_weapon = ob; 478 current_weapon = ob;
482 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); 479 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 480
487 update_stats (); 481 update_stats ();
488 482
489 if (ob) 483 if (ob)
490 { 484 {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines