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.325 by root, Wed Apr 14 21:36:31 2010 UTC vs.
Revision 1.327 by root, Fri Apr 16 02:32:25 2010 UTC

483 483
484 sum = weight_adjust_for (this, sum); 484 sum = weight_adjust_for (this, sum);
485 485
486 if (sum != carrying) 486 if (sum != carrying)
487 { 487 {
488 if (carrying != sum)//D
489 LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
490 (long long)sum, (long long)carrying, debug_desc ());
491
488 carrying = sum; 492 carrying = sum;
489 493
490 if (object *pl = visible_to ()) 494 if (object *pl = visible_to ())
491 if (pl != this) // player is handled lazily 495 if (pl != this) // player is handled lazily
492 esrv_update_item (UPD_WEIGHT, pl, this); 496 esrv_update_item (UPD_WEIGHT, pl, this);
1031} 1035}
1032 1036
1033static struct freed_map : maptile 1037static struct freed_map : maptile
1034{ 1038{
1035 freed_map () 1039 freed_map ()
1040 : maptile (3, 3)
1036 { 1041 {
1037 path = "<freed objects map>"; 1042 path = "<freed objects map>";
1038 name = "/internal/freed_objects_map"; 1043 name = "/internal/freed_objects_map";
1039 width = 3;
1040 height = 3;
1041 no_drop = 1; 1044 no_drop = 1;
1042 no_reset = 1; 1045 no_reset = 1;
1043 1046
1044 alloc ();
1045 in_memory = MAP_ACTIVE; 1047 in_memory = MAP_ACTIVE;
1046 } 1048 }
1047 1049
1048 ~freed_map () 1050 ~freed_map ()
1049 { 1051 {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines