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.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.143 by root, Tue May 1 05:48:20 2007 UTC

324sum_weight (object *op) 324sum_weight (object *op)
325{ 325{
326 long sum; 326 long sum;
327 object *inv; 327 object *inv;
328 328
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 329 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 330 {
331 if (inv->inv) 331 if (inv->inv)
332 sum_weight (inv); 332 sum_weight (inv);
333
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 334 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 335 }
335 336
336 if (op->type == CONTAINER && op->stats.Str) 337 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 338 sum = (sum * (100 - op->stats.Str)) / 100;
2583} 2584}
2584 2585
2585const char * 2586const char *
2586object::debug_desc () const 2587object::debug_desc () const
2587{ 2588{
2588 static char info[256 * 4]; 2589 static char info[3][256 * 4];
2590 static int info_idx;
2591
2589 return debug_desc (info); 2592 return debug_desc (info [++info_idx % 3]);
2590}
2591
2592const char *
2593object::debug_desc2 () const
2594{
2595 static char info[256 * 4];
2596 return debug_desc (info);
2597} 2593}
2598 2594
2599struct region * 2595struct region *
2600object::region () const 2596object::region () const
2601{ 2597{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines