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.193 by root, Mon Oct 15 17:50:27 2007 UTC vs.
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 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. */
… …
307 ob1->optimise (); 307 ob1->optimise ();
308 ob2->optimise (); 308 ob2->optimise ();
309 309
310 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 { 311 {
312 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0; 312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0; 313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314 314
315 if (k1 != k2) 315 if (k1 != k2)
316 return 0; 316 return 0;
317 else if (k1 == 0) 317 else if (k1 == 0)
318 return 1; 318 return 1;
… …
447{ 447{
448 // allow objects which own objects 448 // allow objects which own objects
449 if (owner) 449 if (owner)
450 while (owner->owner) 450 while (owner->owner)
451 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 }
452 458
453 this->owner = owner; 459 this->owner = owner;
454} 460}
455 461
456int 462int
… …
1150merge_ob (object *op, object *top) 1156merge_ob (object *op, object *top)
1151{ 1157{
1152 if (!op->nrof) 1158 if (!op->nrof)
1153 return 0; 1159 return 0;
1154 1160
1155 if (top) 1161 if (!top)
1156 for (top = op; top && top->above; top = top->above) 1162 for (top = op; top && top->above; top = top->above)
1157 ; 1163 ;
1158 1164
1159 for (; top; top = top->below) 1165 for (; top; top = top->below)
1160 { 1166 {
… …
1952 * activate recursively a flag on an object inventory 1958 * activate recursively a flag on an object inventory
1953 */ 1959 */
1954void 1960void
1955flag_inv (object *op, int flag) 1961flag_inv (object *op, int flag)
1956{ 1962{
1957 if (op->inv)
1958 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1963 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959 { 1964 {
1960 SET_FLAG (tmp, flag); 1965 SET_FLAG (tmp, flag);
1961 flag_inv (tmp, flag); 1966 flag_inv (tmp, flag);
1962 } 1967 }
1963} 1968}
1964 1969
1965/* 1970/*
1966 * deactivate recursively a flag on an object inventory 1971 * deactivate recursively a flag on an object inventory
1967 */ 1972 */
1968void 1973void
1969unflag_inv (object *op, int flag) 1974unflag_inv (object *op, int flag)
1970{ 1975{
1971 if (op->inv)
1972 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1976 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1973 { 1977 {
1974 CLEAR_FLAG (tmp, flag); 1978 CLEAR_FLAG (tmp, flag);
1975 unflag_inv (tmp, flag); 1979 unflag_inv (tmp, flag);
1976 } 1980 }
1977} 1981}
1978 1982
1979/* 1983/*
1980 * find_free_spot(object, map, x, y, start, stop) will search for 1984 * find_free_spot(object, map, x, y, start, stop) will search for
1981 * a spot at the given map and coordinates which will be able to contain 1985 * a spot at the given map and coordinates which will be able to contain
… …
1983 * to search (see the freearr_x/y[] definition). 1987 * to search (see the freearr_x/y[] definition).
1984 * It returns a random choice among the alternatives found. 1988 * It returns a random choice among the alternatives found.
1985 * start and stop are where to start relative to the free_arr array (1,9 1989 * start and stop are where to start relative to the free_arr array (1,9
1986 * does all 4 immediate directions). This returns the index into the 1990 * does all 4 immediate directions). This returns the index into the
1987 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1991 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1988 * Note - this only checks to see if there is space for the head of the
1989 * object - if it is a multispace object, this should be called for all
1990 * pieces.
1991 * Note2: This function does correctly handle tiled maps, but does not 1992 * Note: This function does correctly handle tiled maps, but does not
1992 * inform the caller. However, insert_ob_in_map will update as 1993 * inform the caller. However, insert_ob_in_map will update as
1993 * necessary, so the caller shouldn't need to do any special work. 1994 * necessary, so the caller shouldn't need to do any special work.
1994 * Note - updated to take an object instead of archetype - this is necessary 1995 * Note - updated to take an object instead of archetype - this is necessary
1995 * because arch_blocked (now ob_blocked) needs to know the movement type 1996 * because arch_blocked (now ob_blocked) needs to know the movement type
1996 * to know if the space in question will block the object. We can't use 1997 * to know if the space in question will block the object. We can't use
… …
2041 2042
2042 /* Note it is intentional that we check ob - the movement type of the 2043 /* Note it is intentional that we check ob - the movement type of the
2043 * head of the object should correspond for the entire object. 2044 * head of the object should correspond for the entire object.
2044 */ 2045 */
2045 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2046 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2047 continue;
2048
2049 if (ob->blocked (m, pos.x, pos.y))
2046 continue; 2050 continue;
2047 2051
2048 altern [index++] = i; 2052 altern [index++] = i;
2049 } 2053 }
2050 2054

Diff Legend

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