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.338 by root, Fri Jul 2 16:24:24 2010 UTC vs.
Revision 1.339 by root, Fri Jul 2 17:39:23 2010 UTC

… …
1182 1182
1183 if (pl && pl->is_player ()) 1183 if (pl && pl->is_player ())
1184 { 1184 {
1185 if (expect_false (pl->contr->combat_ob == this)) 1185 if (expect_false (pl->contr->combat_ob == this))
1186 { 1186 {
1187 pl->apply (pl->contr->combat_ob, AP_UNAPPLY); 1187 pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1188 pl->contr->combat_ob = 0; 1188 pl->contr->combat_ob = 0;
1189 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob); 1189 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1190 } 1190 }
1191 1191
1192 if (expect_false (pl->contr->ranged_ob == this)) 1192 if (expect_false (pl->contr->ranged_ob == this))
1193 { 1193 {
1194 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY); 1194 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1195 pl->contr->ranged_ob = 0; 1195 pl->contr->ranged_ob = 0;
1196 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob); 1196 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1197 } 1197 }
1198 1198
1199 pl->contr->queue_stats_update (); 1199 pl->contr->queue_stats_update ();

Diff Legend

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