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.192 by root, Fri Oct 12 19:13:25 2007 UTC vs.
Revision 1.201 by root, Tue Jan 22 16:22:45 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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,
… …
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 GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 26 variable. */
… …
254 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 255 * check all objects in the inventory.
256 */ 256 */
257 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
258 { 258 {
259 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
261 return 0;
262 261
263 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
264 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 266 return 0; /* inventory objexts differ */
266 267
267 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 269 * if it is valid.
269 */ 270 */
270 } 271 }
… …
306 ob1->optimise (); 307 ob1->optimise ();
307 ob2->optimise (); 308 ob2->optimise ();
308 309
309 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
310 { 311 {
311 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0; 312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0; 313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
313 314
314 if (k1 != k2) 315 if (k1 != k2)
315 return 0; 316 return 0;
316 else if (k1 == 0) 317 else if (k1 == 0)
317 return 1; 318 return 1;
… …
446{ 447{
447 // allow objects which own objects 448 // allow objects which own objects
448 if (owner) 449 if (owner)
449 while (owner->owner) 450 while (owner->owner)
450 owner = owner->owner; 451 owner = owner->owner;
452
453 if (flag [FLAG_FREED])
454 {
455 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
456 return;
457 }
451 458
452 this->owner = owner; 459 this->owner = owner;
453} 460}
454 461
455int 462int
… …
928 935
929 freed_map->path = "<freed objects map>"; 936 freed_map->path = "<freed objects map>";
930 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
931 freed_map->width = 3; 938 freed_map->width = 3;
932 freed_map->height = 3; 939 freed_map->height = 3;
940 freed_map->nodrop = 1;
933 941
934 freed_map->alloc (); 942 freed_map->alloc ();
935 freed_map->in_memory = MAP_IN_MEMORY; 943 freed_map->in_memory = MAP_IN_MEMORY;
936 } 944 }
937 945
… …
1149merge_ob (object *op, object *top) 1157merge_ob (object *op, object *top)
1150{ 1158{
1151 if (!op->nrof) 1159 if (!op->nrof)
1152 return 0; 1160 return 0;
1153 1161
1154 if (top) 1162 if (!top)
1155 for (top = op; top && top->above; top = top->above) 1163 for (top = op; top && top->above; top = top->above)
1156 ; 1164 ;
1157 1165
1158 for (; top; top = top->below) 1166 for (; top; top = top->below)
1159 { 1167 {
… …
1951 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1952 */ 1960 */
1953void 1961void
1954flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1955{ 1963{
1956 if (op->inv)
1957 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1958 { 1965 {
1959 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1960 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1961 } 1968 }
1962} 1969}
1963 1970
1964/* 1971/*
1965 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1966 */ 1973 */
1967void 1974void
1968unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1969{ 1976{
1970 if (op->inv)
1971 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1972 { 1978 {
1973 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
1974 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
1975 } 1981 }
1976} 1982}
1977 1983
1978/* 1984/*
1979 * find_free_spot(object, map, x, y, start, stop) will search for 1985 * find_free_spot(object, map, x, y, start, stop) will search for
1980 * a spot at the given map and coordinates which will be able to contain 1986 * a spot at the given map and coordinates which will be able to contain
… …
1982 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
1983 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
1984 * start and stop are where to start relative to the free_arr array (1,9 1990 * start and stop are where to start relative to the free_arr array (1,9
1985 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
1986 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1992 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1987 * Note - this only checks to see if there is space for the head of the
1988 * object - if it is a multispace object, this should be called for all
1989 * pieces.
1990 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
1991 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
1992 * necessary, so the caller shouldn't need to do any special work. 1995 * necessary, so the caller shouldn't need to do any special work.
1993 * Note - updated to take an object instead of archetype - this is necessary 1996 * Note - updated to take an object instead of archetype - this is necessary
1994 * because arch_blocked (now ob_blocked) needs to know the movement type 1997 * because arch_blocked (now ob_blocked) needs to know the movement type
1995 * to know if the space in question will block the object. We can't use 1998 * to know if the space in question will block the object. We can't use
… …
2016 2019
2017 /* However, often 2020 /* However, often
2018 * ob doesn't have any move type (when used to place exits) 2021 * ob doesn't have any move type (when used to place exits)
2019 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work. 2022 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2020 */ 2023 */
2021 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022 { 2025 {
2023 altern [index++] = i; 2026 altern [index++] = i;
2024 continue; 2027 continue;
2025 } 2028 }
2026 2029
… …
2040 2043
2041 /* Note it is intentional that we check ob - the movement type of the 2044 /* Note it is intentional that we check ob - the movement type of the
2042 * head of the object should correspond for the entire object. 2045 * head of the object should correspond for the entire object.
2043 */ 2046 */
2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2047 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2048 continue;
2049
2050 if (ob->blocked (m, pos.x, pos.y))
2045 continue; 2051 continue;
2046 2052
2047 altern [index++] = i; 2053 altern [index++] = i;
2048 } 2054 }
2049 2055

Diff Legend

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