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.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.216 by root, Tue Apr 22 23:50:23 2008 UTC

391 return; 391 return;
392 392
393 op->carrying += weight; 393 op->carrying += weight;
394 394
395 if (object *pl = op->visible_to ()) 395 if (object *pl = op->visible_to ())
396 if (pl != op) // player is handled lazily
396 esrv_update_item (UPD_WEIGHT, pl, op); 397 esrv_update_item (UPD_WEIGHT, pl, op);
397 398
398 op = op->env; 399 op = op->env;
399 } 400 }
400} 401}
401 402
422 if (sum != carrying) 423 if (sum != carrying)
423 { 424 {
424 carrying = sum; 425 carrying = sum;
425 426
426 if (object *pl = visible_to ()) 427 if (object *pl = visible_to ())
428 if (pl != this) // player is handled lazily
427 esrv_update_item (UPD_WEIGHT, pl, this); 429 esrv_update_item (UPD_WEIGHT, pl, this);
428 } 430 }
429} 431}
430 432
431/* 433/*
432 * Used by: Server DM commands: dumpbelow, dump. Some error messages. 434 * Used by: Server DM commands: dumpbelow, dump. Some error messages.
2617 if (object *closer = old_container->inv) 2619 if (object *closer = old_container->inv)
2618 if (closer->type == CLOSE_CON) 2620 if (closer->type == CLOSE_CON)
2619 closer->destroy (); 2621 closer->destroy ();
2620#endif 2622#endif
2621 2623
2622 old_container->flag [FLAG_APPLIED] = 0; 2624 old_container->flag [FLAG_APPLIED] = false;
2623 container = 0; 2625 container = 0;
2624 2626
2625 esrv_update_item (UPD_FLAGS, this, old_container); 2627 esrv_update_item (UPD_FLAGS, this, old_container);
2626 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2628 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627 play_sound (sound_find ("chest_close")); 2629 play_sound (sound_find ("chest_close"));
2643 } 2645 }
2644#endif 2646#endif
2645 2647
2646 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2647 2649
2648 new_container->flag [FLAG_APPLIED] = 1; 2650 new_container->flag [FLAG_APPLIED] = true;
2649 container = new_container; 2651 container = new_container;
2650 2652
2651 esrv_update_item (UPD_FLAGS, this, new_container); 2653 esrv_update_item (UPD_FLAGS, this, new_container);
2652 esrv_send_inventory (this, new_container); 2654 esrv_send_inventory (this, new_container);
2653 play_sound (sound_find ("chest_open")); 2655 play_sound (sound_find ("chest_open"));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines