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.350 by root, Sun May 8 12:40:41 2011 UTC vs.
Revision 1.355 by root, Mon Nov 12 03:14:32 2012 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <stdio.h> 26#include <stdio.h>
… …
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 = 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
… …
1005 1006
1006 freelist = li; 1007 freelist = li;
1007 ++free_count; 1008 ++free_count;
1008} 1009}
1009 1010
1010// special "grave" map used to store all removed objects
1011// till they can be destroyed - saves a lot of checks in the rest
1012// of the code
1013static struct freed_map
1014: maptile
1015{
1016 freed_map ()
1017 : maptile (3, 3)
1018 {
1019 path = "<freed objects map>";
1020 name = "/internal/freed_objects_map";
1021 no_drop = 1;
1022 no_reset = 1;
1023
1024 state = MAP_ACTIVE;
1025 }
1026
1027 ~freed_map ()
1028 {
1029 destroy ();
1030 }
1031} freed_map; // freed objects are moved here to avoid crashes
1032
1033void 1011void
1034object::do_destroy () 1012object::do_destroy ()
1035{ 1013{
1036 if (flag [FLAG_IS_LINKED]) 1014 if (flag [FLAG_IS_LINKED])
1037 remove_link (); 1015 remove_link ();
… …
1629 1607
1630 nr = min (nr, nrof); 1608 nr = min (nr, nrof);
1631 1609
1632 if (nrof > nr) 1610 if (nrof > nr)
1633 { 1611 {
1634 sint64 oweight = total_weight (); 1612 weight_t oweight = total_weight ();
1635 1613
1636 nrof -= nr; 1614 nrof -= nr;
1637 1615
1638 if (object *pl = visible_to ()) 1616 if (object *pl = visible_to ())
1639 esrv_update_item (UPD_NROF, pl, this); 1617 esrv_update_item (UPD_NROF, pl, this);
… …
1723 if (object::can_merge (tmp, op)) 1701 if (object::can_merge (tmp, op))
1724 { 1702 {
1725 /* return the original object and remove inserted object 1703 /* return the original object and remove inserted object
1726 (client prefers the original object) */ 1704 (client prefers the original object) */
1727 1705
1728 // carring must be 0 for mergable objects 1706 // carrying must be 0 for mergable objects
1729 sint64 oweight = tmp->weight * tmp->nrof; 1707 weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
1730 1708
1731 tmp->nrof += op->nrof; 1709 tmp->nrof += op->nrof;
1732 1710
1733 if (object *pl = tmp->visible_to ()) 1711 if (object *pl = tmp->visible_to ())
1734 esrv_update_item (UPD_NROF, pl, tmp); 1712 esrv_update_item (UPD_NROF, pl, tmp);
1735 1713
1736 adjust_weight (this, oweight, tmp->weight * tmp->nrof); 1714 adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1737 1715
1738 op->destroy (); 1716 op->destroy ();
1739 op = tmp; 1717 op = tmp;
1740 goto inserted; 1718 goto inserted;
1741 } 1719 }
… …
2031 */ 2009 */
2032int 2010int
2033find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2011find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2034{ 2012{
2035 int altern[SIZEOFFREE]; 2013 int altern[SIZEOFFREE];
2036 int index = 0, flag; 2014 int index = 0;
2037 2015
2038 for (int i = start; i < stop; i++) 2016 for (int i = start; i < stop; i++)
2039 { 2017 {
2040 mapxy pos (m, x, y); pos.move (i); 2018 mapxy pos (m, x, y); pos.move (i);
2041 2019
… …
2153 * there is capable of. 2131 * there is capable of.
2154 */ 2132 */
2155int 2133int
2156find_dir (maptile *m, int x, int y, object *exclude) 2134find_dir (maptile *m, int x, int y, object *exclude)
2157{ 2135{
2158 int max = SIZEOFFREE, mflags; 2136 int max = SIZEOFFREE;
2159 MoveType move_type; 2137 MoveType move_type;
2160 2138
2161 if (exclude && exclude->head_ () != exclude) 2139 if (exclude && exclude->head_ () != exclude)
2162 { 2140 {
2163 exclude = exclude->head; 2141 exclude = exclude->head;

Diff Legend

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