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.354 by root, Mon Oct 29 23:55:52 2012 UTC vs.
Revision 1.362 by root, Thu Jan 19 21:51:43 2017 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
72 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48, 72 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
73 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49 73 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
74}; 74};
75 75
76const char *wall_suffix[16] = { 76const char *wall_suffix[16] = {
77 "0", 77 "0",
78 "1_3", 78 "1_3",
79 "1_4", 79 "1_4",
80 "2_1_2", 80 "2_1_2",
81 "1_2", 81 "1_2",
82 "2_2_4", 82 "2_2_4",
83 "2_2_1", 83 "2_2_1",
84 "3_1", 84 "3_1",
85 "1_1", 85 "1_1",
86 "2_2_3", 86 "2_2_3",
87 "2_2_2", 87 "2_2_2",
88 "3_3", 88 "3_3",
89 "2_1_1", 89 "2_1_1",
90 "3_4", 90 "3_4",
91 "3_2", 91 "3_2",
92 "4" 92 "4"
93}; 93};
94 94
95static void 95static void
96write_uuid (uval64 skip, bool sync) 96write_uuid (uval64 skip, bool sync)
97{ 97{
351 /* inventory ok - still need to check rest of this object to see 351 /* inventory ok - still need to check rest of this object to see
352 * if it is valid. 352 * if it is valid.
353 */ 353 */
354 } 354 }
355 355
356 /* Don't merge objects that are applied. With the new 'body' code, 356 /* Don't merge objects that are applied. With the new 'body' code,
357 * it is possible for most any character to have more than one of 357 * it is possible for most any character to have more than one of
358 * some items equipped, and we don't want those to merge. 358 * some items equipped, and we don't want those to merge.
359 */ 359 */
360 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) 360 if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
361 return 0; 361 return 0;
362 362
363 /* Note sure why the following is the case - either the object has to 363 /* Not sure why the following is the case - either the object has to
364 * be animated or have a very low speed. Is this an attempted monster 364 * be animated or have a very low speed. Is this an attempted monster
365 * check? 365 * check?
366 */ 366 */
367 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) 367 if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
368 return 0; 368 return 0;
369 369
446 446
447 return 0; 447 return 0;
448} 448}
449 449
450// adjust weight per container type ("of holding") 450// adjust weight per container type ("of holding")
451static uint32 451static weight_t
452weight_adjust_for (object *op, uint32 weight) 452weight_adjust_for (object *op, weight_t weight)
453{ 453{
454 return op->type == CONTAINER 454 if (op->type == CONTAINER)
455 ? weight - weight * op->stats.Str / 100 455 weight -= weight * op->stats.Str / 100;
456 : weight; 456
457 return weight;
457} 458}
458 459
459/* 460/*
460 * subtracts, then adds, the specified weight to an object, 461 * subtracts, then adds, the specified weight to an object,
461 * and also updates how much the environment(s) is/are carrying. 462 * and also updates how much the environment(s) is/are carrying.
462 */ 463 */
463static void 464static void
464adjust_weight (object *op, sint32 sub, sint32 add) 465adjust_weight (object *op, weight_t sub, weight_t add)
465{ 466{
466 while (op) 467 while (op)
467 { 468 {
468 sint32 ocarrying = op->carrying; 469 weight_t carrying = (weight_t)op->carrying
470 - weight_adjust_for (op, sub)
471 + weight_adjust_for (op, add);
469 472
470 op->carrying -= weight_adjust_for (op, sub); 473 sub = op->carrying;
471 op->carrying += weight_adjust_for (op, add); 474 op->carrying = carrying;
475 add = op->carrying;
472 476
473 if (object *pl = op->visible_to ()) 477 if (object *pl = op->visible_to ())
474 if (pl != op) // player is handled lazily 478 if (pl != op) // player is handled lazily
475 esrv_update_item (UPD_WEIGHT, pl, op); 479 esrv_update_item (UPD_WEIGHT, pl, op);
476 480
477 sub = ocarrying;
478 add = op->carrying;
479
480 op = op->env; 481 op = op->env;
481 } 482 }
482} 483}
483 484
484/* 485/*
487 * containers are carrying, and sums it up. 488 * containers are carrying, and sums it up.
488 */ 489 */
489void 490void
490object::update_weight () 491object::update_weight ()
491{ 492{
492 sint32 sum = 0; 493 weight_t sum = 0;
493 494
494 for (object *op = inv; op; op = op->below) 495 for (object *op = inv; op; op = op->below)
495 { 496 {
496 op->update_weight (); 497 op->update_weight ();
497 498
635 speed_left = -1.; 636 speed_left = -1.;
636 637
637 /* copy the body_info to the body_used - this is only really 638 /* copy the body_info to the body_used - this is only really
638 * need for monsters, but doesn't hurt to do it for everything. 639 * need for monsters, but doesn't hurt to do it for everything.
639 * by doing so, when a monster is created, it has good starting 640 * by doing so, when a monster is created, it has good starting
640 * values for the body_used info, so when items are created 641 * values for the body_used info, so when items are created
641 * for it, they can be properly equipped. 642 * for it, they can be properly equipped.
642 */ 643 */
643 for (int i = NUM_BODY_LOCATIONS; i--; ) 644 for (int i = NUM_BODY_LOCATIONS; i--; )
644 slot[i].used = slot[i].info; 645 slot[i].used = slot[i].info;
645 646
1580 if (!items // testing !items ensures we can drop at least one item 1581 if (!items // testing !items ensures we can drop at least one item
1581 || (items < m->max_items 1582 || (items < m->max_items
1582 && ms.volume () < m->max_volume)) 1583 && ms.volume () < m->max_volume))
1583 return true; 1584 return true;
1584 1585
1585 if (originator && originator->is_player ()) 1586 if (originator)
1586 originator->contr->failmsgf ( 1587 originator->failmsgf (
1587 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>", 1588 "No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
1588 query_name () 1589 query_name ()
1589 ); 1590 );
1590 1591
1591 return false; 1592 return false;
1592} 1593}
1606 1607
1607 nr = min (nr, nrof); 1608 nr = min (nr, nrof);
1608 1609
1609 if (nrof > nr) 1610 if (nrof > nr)
1610 { 1611 {
1611 sint64 oweight = total_weight (); 1612 weight_t oweight = total_weight ();
1612 1613
1613 nrof -= nr; 1614 nrof -= nr;
1614 1615
1615 if (object *pl = visible_to ()) 1616 if (object *pl = visible_to ())
1616 esrv_update_item (UPD_NROF, pl, this); 1617 esrv_update_item (UPD_NROF, pl, this);
1677/* 1678/*
1678 * env->insert (op) 1679 * env->insert (op)
1679 * This function inserts the object op in the linked list 1680 * This function inserts the object op in the linked list
1680 * inside the object environment. 1681 * inside the object environment.
1681 * 1682 *
1682 * The function returns now pointer to inserted item, and return value can 1683 * The function returns now pointer to inserted item, and return value can
1683 * be != op, if items are merged. -Tero 1684 * be != op, if items are merged. -Tero
1684 */ 1685 */
1685object * 1686object *
1686object::insert (object *op) 1687object::insert (object *op)
1687{ 1688{
1700 if (object::can_merge (tmp, op)) 1701 if (object::can_merge (tmp, op))
1701 { 1702 {
1702 /* return the original object and remove inserted object 1703 /* return the original object and remove inserted object
1703 (client prefers the original object) */ 1704 (client prefers the original object) */
1704 1705
1705 // carring must be 0 for mergable objects 1706 // carrying must be 0 for mergable objects
1706 sint64 oweight = tmp->weight * tmp->nrof; 1707 weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
1707 1708
1708 tmp->nrof += op->nrof; 1709 tmp->nrof += op->nrof;
1709 1710
1710 if (object *pl = tmp->visible_to ()) 1711 if (object *pl = tmp->visible_to ())
1711 esrv_update_item (UPD_NROF, pl, tmp); 1712 esrv_update_item (UPD_NROF, pl, tmp);
1712 1713
1713 adjust_weight (this, oweight, tmp->weight * tmp->nrof); 1714 adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1714 1715
1715 op->destroy (); 1716 op->destroy ();
1716 op = tmp; 1717 op = tmp;
1717 goto inserted; 1718 goto inserted;
1718 } 1719 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines