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.183 by root, Mon Aug 20 19:13:10 2007 UTC vs.
Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC

… …
305 { 305 {
306 ob1->optimise (); 306 ob1->optimise ();
307 ob2->optimise (); 307 ob2->optimise ();
308 308
309 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2)) 310 {
311 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
313
314 if (k1 != k2)
311 return 0; 315 return 0;
316 else if (k1 == 0)
317 return 1;
318 else if (!cfperl_can_merge (ob1, ob2))
319 return 0;
320 }
312 } 321 }
313 322
314 /* Everything passes, must be OK. */ 323 /* Everything passes, must be OK. */
315 return 1; 324 return 1;
316} 325}
… …
374/* 383/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 384 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 385 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 386 * If it's not a multi-object, it is returned.
378 */ 387 */
379
380object * 388object *
381get_nearest_part (object *op, const object *pl) 389get_nearest_part (object *op, const object *pl)
382{ 390{
383 object *tmp, *closest; 391 object *tmp, *closest;
384 int last_dist, i; 392 int last_dist, i;
… …
579object::copy_to (object *dst) 587object::copy_to (object *dst)
580{ 588{
581 *dst = *this; 589 *dst = *this;
582 590
583 if (speed < 0) 591 if (speed < 0)
584 dst->speed_left = speed_left - rndm (); 592 dst->speed_left -= rndm ();
585 593
586 dst->set_speed (dst->speed); 594 dst->set_speed (dst->speed);
587} 595}
588 596
589void 597void
… …
916 924
917 if (!freed_map) 925 if (!freed_map)
918 { 926 {
919 freed_map = new maptile; 927 freed_map = new maptile;
920 928
929 freed_map->path = "<freed objects map>";
921 freed_map->name = "/internal/freed_objects_map"; 930 freed_map->name = "/internal/freed_objects_map";
922 freed_map->width = 3; 931 freed_map->width = 3;
923 freed_map->height = 3; 932 freed_map->height = 3;
924 933
925 freed_map->alloc (); 934 freed_map->alloc ();
… …
1231 1240
1232 object *top, *floor = NULL; 1241 object *top, *floor = NULL;
1233 1242
1234 op->remove (); 1243 op->remove ();
1235 1244
1236 if (out_of_map (m, op->x, op->y))
1237 {
1238 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1239#ifdef MANY_CORES
1240 /* Better to catch this here, as otherwise the next use of this object
1241 * is likely to cause a crash. Better to find out where it is getting
1242 * improperly inserted.
1243 */
1244 abort ();
1245#endif
1246 return op;
1247 }
1248
1249 if (object *more = op->more)
1250 if (!insert_ob_in_map (more, m, originator, flag))
1251 return 0;
1252
1253 CLEAR_FLAG (op, FLAG_REMOVED);
1254
1255 /* Ideally, the caller figures this out. However, it complicates a lot 1245 /* Ideally, the caller figures this out. However, it complicates a lot
1256 * of areas of callers (eg, anything that uses find_free_spot would now 1246 * of areas of callers (eg, anything that uses find_free_spot would now
1257 * need extra work 1247 * need extra work
1258 */ 1248 */
1259 if (!xy_normalise (m, op->x, op->y)) 1249 if (!xy_normalise (m, op->x, op->y))
1250 {
1251 op->destroy ();
1260 return 0; 1252 return 0;
1253 }
1254
1255 if (object *more = op->more)
1256 if (!insert_ob_in_map (more, m, originator, flag))
1257 return 0;
1258
1259 CLEAR_FLAG (op, FLAG_REMOVED);
1261 1260
1262 op->map = m; 1261 op->map = m;
1263 mapspace &ms = op->ms (); 1262 mapspace &ms = op->ms ();
1264 1263
1265 /* this has to be done after we translate the coordinates. 1264 /* this has to be done after we translate the coordinates.
… …
1300 else 1299 else
1301 { 1300 {
1302 top = ms.bot; 1301 top = ms.bot;
1303 1302
1304 /* If there are other objects, then */ 1303 /* If there are other objects, then */
1305 if ((!(flag & INS_MAP_LOAD)) && top) 1304 if (top)
1306 { 1305 {
1307 object *last = 0; 1306 object *last = 0;
1308 1307
1309 /* 1308 /*
1310 * If there are multiple objects on this space, we do some trickier handling. 1309 * If there are multiple objects on this space, we do some trickier handling.
… …
1362 */ 1361 */
1363 if (last && last->below && last != floor) 1362 if (last && last->below && last != floor)
1364 top = last->below; 1363 top = last->below;
1365 } 1364 }
1366 } /* If objects on this space */ 1365 } /* If objects on this space */
1367 if (flag & INS_MAP_LOAD)
1368 top = ms.top;
1369 1366
1370 if (flag & INS_ABOVE_FLOOR_ONLY) 1367 if (flag & INS_ABOVE_FLOOR_ONLY)
1371 top = floor; 1368 top = floor;
1372 1369
1373 /* Top is the object that our object (op) is going to get inserted above. 1370 /* Top is the object that our object (op) is going to get inserted above.
… …
1406 op->map->touch (); 1403 op->map->touch ();
1407 } 1404 }
1408 1405
1409 op->map->dirty = true; 1406 op->map->dirty = true;
1410 1407
1411 if (!(flag & INS_MAP_LOAD))
1412 if (object *pl = ms.player ()) 1408 if (object *pl = ms.player ())
1413 pl->contr->ns->floorbox_update (); 1409 pl->contr->ns->floorbox_update ();
1414 1410
1415 /* If this object glows, it may affect lighting conditions that are 1411 /* If this object glows, it may affect lighting conditions that are
1416 * visible to others on this map. But update_all_los is really 1412 * visible to others on this map. But update_all_los is really
1417 * an inefficient way to do this, as it means los for all players 1413 * an inefficient way to do this, as it means los for all players
1418 * on the map will get recalculated. The players could very well 1414 * on the map will get recalculated. The players could very well
… …
2001 * customized, changed states, etc. 1997 * customized, changed states, etc.
2002 */ 1998 */
2003int 1999int
2004find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2005{ 2001{
2002 int altern[SIZEOFFREE];
2006 int index = 0, flag; 2003 int index = 0, flag;
2007 int altern[SIZEOFFREE];
2008 2004
2009 for (int i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
2010 { 2006 {
2011 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 mapxy pos (m, x, y); pos.move (i);
2012 if (!flag) 2008
2009 if (!pos.normalise ())
2010 continue;
2011
2012 mapspace &ms = *pos;
2013
2014 if (ms.flags () & P_IS_ALIVE)
2015 continue;
2016
2017 /* However, often
2018 * 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.
2020 */
2021 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022 {
2013 altern [index++] = i; 2023 altern [index++] = i;
2024 continue;
2025 }
2014 2026
2015 /* Basically, if we find a wall on a space, we cut down the search size. 2027 /* Basically, if we find a wall on a space, we cut down the search size.
2016 * In this way, we won't return spaces that are on another side of a wall. 2028 * In this way, we won't return spaces that are on another side of a wall.
2017 * This mostly work, but it cuts down the search size in all directions - 2029 * This mostly work, but it cuts down the search size in all directions -
2018 * if the space being examined only has a wall to the north and empty 2030 * if the space being examined only has a wall to the north and empty
2019 * spaces in all the other directions, this will reduce the search space 2031 * spaces in all the other directions, this will reduce the search space
2020 * to only the spaces immediately surrounding the target area, and 2032 * to only the spaces immediately surrounding the target area, and
2021 * won't look 2 spaces south of the target space. 2033 * won't look 2 spaces south of the target space.
2022 */ 2034 */
2023 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2035 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2036 {
2024 stop = maxfree[i]; 2037 stop = maxfree[i];
2038 continue;
2039 }
2040
2041 /* Note it is intentional that we check ob - the movement type of the
2042 * head of the object should correspond for the entire object.
2043 */
2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2045 continue;
2046
2047 altern [index++] = i;
2025 } 2048 }
2026 2049
2027 if (!index) 2050 if (!index)
2028 return -1; 2051 return -1;
2029 2052
… …
2038 */ 2061 */
2039int 2062int
2040find_first_free_spot (const object *ob, maptile *m, int x, int y) 2063find_first_free_spot (const object *ob, maptile *m, int x, int y)
2041{ 2064{
2042 for (int i = 0; i < SIZEOFFREE; i++) 2065 for (int i = 0; i < SIZEOFFREE; i++)
2043 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2066 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2044 return i; 2067 return i;
2045 2068
2046 return -1; 2069 return -1;
2047} 2070}
2048 2071

Diff Legend

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