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.139 by root, Sat Apr 21 17:34:22 2007 UTC vs.
Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
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 */
… …
835 847
836 if (flag [FLAG_IS_LINKED]) 848 if (flag [FLAG_IS_LINKED])
837 remove_button_link (this); 849 remove_button_link (this);
838 850
839 if (flag [FLAG_FRIENDLY]) 851 if (flag [FLAG_FRIENDLY])
840 {
841 remove_friendly_object (this); 852 remove_friendly_object (this);
842
843 if (type == GOLEM
844 && owner
845 && owner->type == PLAYER
846 && owner->contr->ranges[range_golem] == this)
847 owner->contr->ranges[range_golem] = 0;
848 }
849 853
850 if (!flag [FLAG_REMOVED]) 854 if (!flag [FLAG_REMOVED])
851 remove (); 855 remove ();
852 856
853 destroy_inv (true); 857 destroy_inv (true);
… …
2591} 2595}
2592 2596
2593const char * 2597const char *
2594object::debug_desc () const 2598object::debug_desc () const
2595{ 2599{
2596 static char info[256 * 4]; 2600 static char info[3][256 * 4];
2601 static int info_idx;
2602
2597 return debug_desc (info); 2603 return debug_desc (info [++info_idx % 3]);
2598}
2599
2600const char *
2601object::debug_desc2 () const
2602{
2603 static char info[256 * 4];
2604 return debug_desc (info);
2605} 2604}
2606 2605
2607struct region * 2606struct region *
2608object::region () const 2607object::region () const
2609{ 2608{

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines