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.188 by root, Wed Sep 12 11:10:09 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 }
305 { 306 {
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 if (!cfperl_can_merge (ob1, ob2)) 311 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314
315 if (k1 != k2)
311 return 0; 316 return 0;
317 else if (k1 == 0)
318 return 1;
319 else if (!cfperl_can_merge (ob1, ob2))
320 return 0;
321 }
312 } 322 }
313 323
314 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
315 return 1; 325 return 1;
316} 326}
437{ 447{
438 // allow objects which own objects 448 // allow objects which own objects
439 if (owner) 449 if (owner)
440 while (owner->owner) 450 while (owner->owner)
441 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 }
442 458
443 this->owner = owner; 459 this->owner = owner;
444} 460}
445 461
446int 462int
919 935
920 freed_map->path = "<freed objects map>"; 936 freed_map->path = "<freed objects map>";
921 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
922 freed_map->width = 3; 938 freed_map->width = 3;
923 freed_map->height = 3; 939 freed_map->height = 3;
940 freed_map->nodrop = 1;
924 941
925 freed_map->alloc (); 942 freed_map->alloc ();
926 freed_map->in_memory = MAP_IN_MEMORY; 943 freed_map->in_memory = MAP_IN_MEMORY;
927 } 944 }
928 945
1140merge_ob (object *op, object *top) 1157merge_ob (object *op, object *top)
1141{ 1158{
1142 if (!op->nrof) 1159 if (!op->nrof)
1143 return 0; 1160 return 0;
1144 1161
1145 if (top) 1162 if (!top)
1146 for (top = op; top && top->above; top = top->above) 1163 for (top = op; top && top->above; top = top->above)
1147 ; 1164 ;
1148 1165
1149 for (; top; top = top->below) 1166 for (; top; top = top->below)
1150 { 1167 {
1290 else 1307 else
1291 { 1308 {
1292 top = ms.bot; 1309 top = ms.bot;
1293 1310
1294 /* If there are other objects, then */ 1311 /* If there are other objects, then */
1295 if ((!(flag & INS_MAP_LOAD)) && top) 1312 if (top)
1296 { 1313 {
1297 object *last = 0; 1314 object *last = 0;
1298 1315
1299 /* 1316 /*
1300 * If there are multiple objects on this space, we do some trickier handling. 1317 * If there are multiple objects on this space, we do some trickier handling.
1352 */ 1369 */
1353 if (last && last->below && last != floor) 1370 if (last && last->below && last != floor)
1354 top = last->below; 1371 top = last->below;
1355 } 1372 }
1356 } /* If objects on this space */ 1373 } /* If objects on this space */
1357 if (flag & INS_MAP_LOAD)
1358 top = ms.top;
1359 1374
1360 if (flag & INS_ABOVE_FLOOR_ONLY) 1375 if (flag & INS_ABOVE_FLOOR_ONLY)
1361 top = floor; 1376 top = floor;
1362 1377
1363 /* Top is the object that our object (op) is going to get inserted above. 1378 /* Top is the object that our object (op) is going to get inserted above.
1396 op->map->touch (); 1411 op->map->touch ();
1397 } 1412 }
1398 1413
1399 op->map->dirty = true; 1414 op->map->dirty = true;
1400 1415
1401 if (!(flag & INS_MAP_LOAD))
1402 if (object *pl = ms.player ()) 1416 if (object *pl = ms.player ())
1403 pl->contr->ns->floorbox_update (); 1417 pl->contr->ns->floorbox_update ();
1404 1418
1405 /* If this object glows, it may affect lighting conditions that are 1419 /* If this object glows, it may affect lighting conditions that are
1406 * visible to others on this map. But update_all_los is really 1420 * visible to others on this map. But update_all_los is really
1407 * an inefficient way to do this, as it means los for all players 1421 * an inefficient way to do this, as it means los for all players
1408 * on the map will get recalculated. The players could very well 1422 * on the map will get recalculated. The players could very well
1945 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1946 */ 1960 */
1947void 1961void
1948flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1949{ 1963{
1950 if (op->inv)
1951 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952 { 1965 {
1953 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1954 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1955 } 1968 }
1956} 1969}
1957 1970
1958/* 1971/*
1959 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1960 */ 1973 */
1961void 1974void
1962unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1963{ 1976{
1964 if (op->inv)
1965 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1966 { 1978 {
1967 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
1968 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
1969 } 1981 }
1970} 1982}
1971 1983
1972/* 1984/*
1973 * 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
1974 * 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
1976 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
1977 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
1978 * 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
1979 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
1980 * 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)
1981 * Note - this only checks to see if there is space for the head of the
1982 * object - if it is a multispace object, this should be called for all
1983 * pieces.
1984 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
1985 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
1986 * 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.
1987 * 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
1988 * 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
1989 * 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
1991 * customized, changed states, etc. 2000 * customized, changed states, etc.
1992 */ 2001 */
1993int 2002int
1994find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2003find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1995{ 2004{
2005 int altern[SIZEOFFREE];
1996 int index = 0, flag; 2006 int index = 0, flag;
1997 int altern[SIZEOFFREE];
1998 2007
1999 for (int i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
2000 { 2009 {
2001 mapxy pos (m, x, y); pos.move (i); 2010 mapxy pos (m, x, y); pos.move (i);
2002 2011
2003 if (!pos.normalise ()) 2012 if (!pos.normalise ())
2004 continue; 2013 continue;
2005 2014
2006 mapspace &ms = *pos; 2015 mapspace &ms = *pos;
2007 ms.update (); 2016
2017 if (ms.flags () & P_IS_ALIVE)
2018 continue;
2008 2019
2009 /* However, often 2020 /* However, often
2010 * 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)
2011 * 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.
2012 */ 2023 */
2013 if (ob->move_type == 0 && ms.move_block != MOVE_ALL) 2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2025 {
2026 altern [index++] = i;
2014 continue; 2027 continue;
2028 }
2015 2029
2016 /* Basically, if we find a wall on a space, we cut down the search size. 2030 /* Basically, if we find a wall on a space, we cut down the search size.
2017 * In this way, we won't return spaces that are on another side of a wall. 2031 * In this way, we won't return spaces that are on another side of a wall.
2018 * This mostly work, but it cuts down the search size in all directions - 2032 * This mostly work, but it cuts down the search size in all directions -
2019 * if the space being examined only has a wall to the north and empty 2033 * if the space being examined only has a wall to the north and empty
2029 2043
2030 /* 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
2031 * head of the object should correspond for the entire object. 2045 * head of the object should correspond for the entire object.
2032 */ 2046 */
2033 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))
2034 continue; 2051 continue;
2035 2052
2036 altern [index++] = i; 2053 altern [index++] = i;
2037 } 2054 }
2038 2055

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines