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.145 by root, Mon May 7 03:05:58 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;
446 */ 447 */
447 while (owner->owner) 448 while (owner->owner)
448 owner = owner->owner; 449 owner = owner->owner;
449 450
450 this->owner = owner; 451 this->owner = owner;
452}
453
454void
455object::set_weapon (object *ob)
456{
457 if (current_weapon == ob)
458 return;
459
460 current_weapon = ob;
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
462 update_stats ();
451} 463}
452 464
453/* Zero the key_values on op, decrementing the shared-string 465/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 466 * refcounts and freeing the links.
455 */ 467 */
537 * need for monsters, but doesn't hurt to do it for everything. 549 * need for monsters, but doesn't hurt to do it for everything.
538 * by doing so, when a monster is created, it has good starting 550 * by doing so, when a monster is created, it has good starting
539 * values for the body_used info, so when items are created 551 * values for the body_used info, so when items are created
540 * for it, they can be properly equipped. 552 * for it, they can be properly equipped.
541 */ 553 */
542 memcpy (body_used, body_info, sizeof (body_used)); 554 for (int i = NUM_BODY_LOCATIONS; i--; )
555 slot[i].used = slot[i].info;
543 556
544 attachable::instantiate (); 557 attachable::instantiate ();
545} 558}
546 559
547object * 560object *
2583} 2596}
2584 2597
2585const char * 2598const char *
2586object::debug_desc () const 2599object::debug_desc () const
2587{ 2600{
2588 static char info[256 * 4]; 2601 static char info[3][256 * 4];
2602 static int info_idx;
2603
2589 return debug_desc (info); 2604 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} 2605}
2598 2606
2599struct region * 2607struct region *
2600object::region () const 2608object::region () const
2601{ 2609{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines