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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.134 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.135 by root, Sun Apr 20 23:25:09 2008 UTC

245 245
246 insert_ob_in_ob (tmp, container); 246 insert_ob_in_ob (tmp, container);
247 tmp = next; 247 tmp = next;
248 } 248 }
249 249
250 /* sum_weight will go through and calculate what all the containers are 250 // go through and calculate what all the containers are carrying.
251 * carrying. 251 //TODO: remove
252 */ 252 container->update_weight ();
253 sum_weight (container);
254} 253}
255 254
256void 255void
257maptile::set_object_flag (int flag, int value) 256maptile::set_object_flag (int flag, int value)
258{ 257{
314 switch (f.kw) 313 switch (f.kw)
315 { 314 {
316 case KW_arch: 315 case KW_arch:
317 if (object *op = object::read (f, this)) 316 if (object *op = object::read (f, this))
318 { 317 {
318 // TODO: why?
319 if (op->inv) 319 if (op->inv)
320 sum_weight (op); 320 op->update_weight ();
321 321
322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height)) 322 if (IN_RANGE_EXC (op->x, 0, width) && IN_RANGE_EXC (op->y, 0, height))
323 { 323 {
324 // we insert manually because 324 // we insert manually because
325 // a) its way faster 325 // a) its way faster

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines