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.184 by root, Wed Aug 22 20:46:46 2007 UTC vs.
Revision 1.200 by root, Sun Jan 13 08:55:41 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
… …
578object::copy_to (object *dst) 594object::copy_to (object *dst)
579{ 595{
580 *dst = *this; 596 *dst = *this;
581 597
582 if (speed < 0) 598 if (speed < 0)
583 dst->speed_left = speed_left - rndm (); 599 dst->speed_left -= rndm ();
584 600
585 dst->set_speed (dst->speed); 601 dst->set_speed (dst->speed);
586} 602}
587 603
588void 604void
… …
915 931
916 if (!freed_map) 932 if (!freed_map)
917 { 933 {
918 freed_map = new maptile; 934 freed_map = new maptile;
919 935
936 freed_map->path = "<freed objects map>";
920 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
921 freed_map->width = 3; 938 freed_map->width = 3;
922 freed_map->height = 3; 939 freed_map->height = 3;
923 940
924 freed_map->alloc (); 941 freed_map->alloc ();
… …
1139merge_ob (object *op, object *top) 1156merge_ob (object *op, object *top)
1140{ 1157{
1141 if (!op->nrof) 1158 if (!op->nrof)
1142 return 0; 1159 return 0;
1143 1160
1144 if (top) 1161 if (!top)
1145 for (top = op; top && top->above; top = top->above) 1162 for (top = op; top && top->above; top = top->above)
1146 ; 1163 ;
1147 1164
1148 for (; top; top = top->below) 1165 for (; top; top = top->below)
1149 { 1166 {
… …
1230 1247
1231 object *top, *floor = NULL; 1248 object *top, *floor = NULL;
1232 1249
1233 op->remove (); 1250 op->remove ();
1234 1251
1235 if (out_of_map (m, op->x, op->y))
1236 {
1237 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1238#ifdef MANY_CORES
1239 /* Better to catch this here, as otherwise the next use of this object
1240 * is likely to cause a crash. Better to find out where it is getting
1241 * improperly inserted.
1242 */
1243 abort ();
1244#endif
1245 return op;
1246 }
1247
1248 if (object *more = op->more)
1249 if (!insert_ob_in_map (more, m, originator, flag))
1250 return 0;
1251
1252 CLEAR_FLAG (op, FLAG_REMOVED);
1253
1254 /* Ideally, the caller figures this out. However, it complicates a lot 1252 /* Ideally, the caller figures this out. However, it complicates a lot
1255 * of areas of callers (eg, anything that uses find_free_spot would now 1253 * of areas of callers (eg, anything that uses find_free_spot would now
1256 * need extra work 1254 * need extra work
1257 */ 1255 */
1258 if (!xy_normalise (m, op->x, op->y)) 1256 if (!xy_normalise (m, op->x, op->y))
1257 {
1258 op->destroy ();
1259 return 0; 1259 return 0;
1260 }
1261
1262 if (object *more = op->more)
1263 if (!insert_ob_in_map (more, m, originator, flag))
1264 return 0;
1265
1266 CLEAR_FLAG (op, FLAG_REMOVED);
1260 1267
1261 op->map = m; 1268 op->map = m;
1262 mapspace &ms = op->ms (); 1269 mapspace &ms = op->ms ();
1263 1270
1264 /* this has to be done after we translate the coordinates. 1271 /* this has to be done after we translate the coordinates.
… …
1299 else 1306 else
1300 { 1307 {
1301 top = ms.bot; 1308 top = ms.bot;
1302 1309
1303 /* If there are other objects, then */ 1310 /* If there are other objects, then */
1304 if ((!(flag & INS_MAP_LOAD)) && top) 1311 if (top)
1305 { 1312 {
1306 object *last = 0; 1313 object *last = 0;
1307 1314
1308 /* 1315 /*
1309 * If there are multiple objects on this space, we do some trickier handling. 1316 * If there are multiple objects on this space, we do some trickier handling.
… …
1361 */ 1368 */
1362 if (last && last->below && last != floor) 1369 if (last && last->below && last != floor)
1363 top = last->below; 1370 top = last->below;
1364 } 1371 }
1365 } /* If objects on this space */ 1372 } /* If objects on this space */
1366 if (flag & INS_MAP_LOAD)
1367 top = ms.top;
1368 1373
1369 if (flag & INS_ABOVE_FLOOR_ONLY) 1374 if (flag & INS_ABOVE_FLOOR_ONLY)
1370 top = floor; 1375 top = floor;
1371 1376
1372 /* Top is the object that our object (op) is going to get inserted above. 1377 /* Top is the object that our object (op) is going to get inserted above.
… …
1405 op->map->touch (); 1410 op->map->touch ();
1406 } 1411 }
1407 1412
1408 op->map->dirty = true; 1413 op->map->dirty = true;
1409 1414
1410 if (!(flag & INS_MAP_LOAD))
1411 if (object *pl = ms.player ()) 1415 if (object *pl = ms.player ())
1412 pl->contr->ns->floorbox_update (); 1416 pl->contr->ns->floorbox_update ();
1413 1417
1414 /* If this object glows, it may affect lighting conditions that are 1418 /* If this object glows, it may affect lighting conditions that are
1415 * visible to others on this map. But update_all_los is really 1419 * visible to others on this map. But update_all_los is really
1416 * an inefficient way to do this, as it means los for all players 1420 * an inefficient way to do this, as it means los for all players
1417 * on the map will get recalculated. The players could very well 1421 * on the map will get recalculated. The players could very well
… …
1954 * activate recursively a flag on an object inventory 1958 * activate recursively a flag on an object inventory
1955 */ 1959 */
1956void 1960void
1957flag_inv (object *op, int flag) 1961flag_inv (object *op, int flag)
1958{ 1962{
1959 if (op->inv)
1960 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1963 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1961 { 1964 {
1962 SET_FLAG (tmp, flag); 1965 SET_FLAG (tmp, flag);
1963 flag_inv (tmp, flag); 1966 flag_inv (tmp, flag);
1964 } 1967 }
1965} 1968}
1966 1969
1967/* 1970/*
1968 * deactivate recursively a flag on an object inventory 1971 * deactivate recursively a flag on an object inventory
1969 */ 1972 */
1970void 1973void
1971unflag_inv (object *op, int flag) 1974unflag_inv (object *op, int flag)
1972{ 1975{
1973 if (op->inv)
1974 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1976 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1975 { 1977 {
1976 CLEAR_FLAG (tmp, flag); 1978 CLEAR_FLAG (tmp, flag);
1977 unflag_inv (tmp, flag); 1979 unflag_inv (tmp, flag);
1978 } 1980 }
1979} 1981}
1980 1982
1981/* 1983/*
1982 * 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
1983 * 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
… …
1985 * to search (see the freearr_x/y[] definition). 1987 * to search (see the freearr_x/y[] definition).
1986 * It returns a random choice among the alternatives found. 1988 * It returns a random choice among the alternatives found.
1987 * 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
1988 * does all 4 immediate directions). This returns the index into the 1990 * does all 4 immediate directions). This returns the index into the
1989 * 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)
1990 * Note - this only checks to see if there is space for the head of the
1991 * object - if it is a multispace object, this should be called for all
1992 * pieces.
1993 * Note2: This function does correctly handle tiled maps, but does not 1992 * Note: This function does correctly handle tiled maps, but does not
1994 * inform the caller. However, insert_ob_in_map will update as 1993 * inform the caller. However, insert_ob_in_map will update as
1995 * 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.
1996 * 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
1997 * 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
1998 * 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
… …
2000 * customized, changed states, etc. 1999 * customized, changed states, etc.
2001 */ 2000 */
2002int 2001int
2003find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2002find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2004{ 2003{
2004 int altern[SIZEOFFREE];
2005 int index = 0, flag; 2005 int index = 0, flag;
2006 int altern[SIZEOFFREE];
2007 2006
2008 for (int i = start; i < stop; i++) 2007 for (int i = start; i < stop; i++)
2009 { 2008 {
2010 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2009 mapxy pos (m, x, y); pos.move (i);
2011 if (!flag) 2010
2011 if (!pos.normalise ())
2012 continue;
2013
2014 mapspace &ms = *pos;
2015
2016 if (ms.flags () & P_IS_ALIVE)
2017 continue;
2018
2019 /* However, often
2020 * ob doesn't have any move type (when used to place exits)
2021 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2022 */
2023 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2024 {
2012 altern [index++] = i; 2025 altern [index++] = i;
2026 continue;
2027 }
2013 2028
2014 /* Basically, if we find a wall on a space, we cut down the search size. 2029 /* Basically, if we find a wall on a space, we cut down the search size.
2015 * In this way, we won't return spaces that are on another side of a wall. 2030 * In this way, we won't return spaces that are on another side of a wall.
2016 * This mostly work, but it cuts down the search size in all directions - 2031 * This mostly work, but it cuts down the search size in all directions -
2017 * if the space being examined only has a wall to the north and empty 2032 * if the space being examined only has a wall to the north and empty
2018 * spaces in all the other directions, this will reduce the search space 2033 * spaces in all the other directions, this will reduce the search space
2019 * to only the spaces immediately surrounding the target area, and 2034 * to only the spaces immediately surrounding the target area, and
2020 * won't look 2 spaces south of the target space. 2035 * won't look 2 spaces south of the target space.
2021 */ 2036 */
2022 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2037 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2038 {
2023 stop = maxfree[i]; 2039 stop = maxfree[i];
2040 continue;
2041 }
2042
2043 /* Note it is intentional that we check ob - the movement type of the
2044 * head of the object should correspond for the entire object.
2045 */
2046 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2047 continue;
2048
2049 if (ob->blocked (m, pos.x, pos.y))
2050 continue;
2051
2052 altern [index++] = i;
2024 } 2053 }
2025 2054
2026 if (!index) 2055 if (!index)
2027 return -1; 2056 return -1;
2028 2057
… …
2037 */ 2066 */
2038int 2067int
2039find_first_free_spot (const object *ob, maptile *m, int x, int y) 2068find_first_free_spot (const object *ob, maptile *m, int x, int y)
2040{ 2069{
2041 for (int i = 0; i < SIZEOFFREE; i++) 2070 for (int i = 0; i < SIZEOFFREE; i++)
2042 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2071 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2043 return i; 2072 return i;
2044 2073
2045 return -1; 2074 return -1;
2046} 2075}
2047 2076

Diff Legend

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