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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.185 by root, Mon Jan 12 19:12:16 2009 UTC vs.
Revision 1.186 by elmex, Tue Jan 13 12:07:42 2009 UTC

2495 } 2495 }
2496 2496
2497 apply_lamp (op, switch_on); 2497 apply_lamp (op, switch_on);
2498} 2498}
2499 2499
2500void lamp_get_animation_from_arch (object *op, arch_ptr a) 2500void get_animation_from_arch (object *op, arch_ptr a)
2501{ 2501{
2502 op->animation_id = a->animation_id; 2502 op->animation_id = a->animation_id;
2503 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE]; 2503 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2504 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE]; 2504 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2505 op->anim_speed = a->anim_speed; 2505 op->anim_speed = a->anim_speed;
2545 op->value = 0; 2545 op->value = 0;
2546 2546
2547 // FIXME: This is a hack to make the more sane torches and lamps 2547 // FIXME: This is a hack to make the more sane torches and lamps
2548 // still animated ;-/ 2548 // still animated ;-/
2549 if (op->other_arch) 2549 if (op->other_arch)
2550 lamp_get_animation_from_arch (op, switch_on ? op->other_arch : op->arch); 2550 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2551 2551
2552 if (object *pl = op->visible_to ()) 2552 if (object *pl = op->visible_to ())
2553 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op); 2553 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2554} 2554}
2555 2555

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines