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.182 by root, Mon Aug 20 18:11:02 2007 UTC vs.
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC

… …
374/* 374/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
376 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
377 * If it's not a multi-object, it is returned. 377 * If it's not a multi-object, it is returned.
378 */ 378 */
379
380object * 379object *
381get_nearest_part (object *op, const object *pl) 380get_nearest_part (object *op, const object *pl)
382{ 381{
383 object *tmp, *closest; 382 object *tmp, *closest;
384 int last_dist, i; 383 int last_dist, i;
… …
429} 428}
430 429
431/* 430/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 431 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 432 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO
434 */ 434 */
435void 435void
436object::set_owner (object *owner) 436object::set_owner (object *owner)
437{ 437{
438 // allow objects which own objects
438 if (!owner) 439 if (owner)
439 return;
440
441 /* next line added to allow objects which own objects */
442 /* Add a check for ownercounts in here, as I got into an endless loop
443 * with the fireball owning a poison cloud which then owned the
444 * fireball. I believe that was caused by one of the objects getting
445 * freed and then another object replacing it. Since the ownercounts
446 * didn't match, this check is valid and I believe that cause is valid.
447 */
448 while (owner->owner) 440 while (owner->owner)
449 owner = owner->owner; 441 owner = owner->owner;
450 442
451 this->owner = owner; 443 this->owner = owner;
452} 444}
453 445
454int 446int
… …
586object::copy_to (object *dst) 578object::copy_to (object *dst)
587{ 579{
588 *dst = *this; 580 *dst = *this;
589 581
590 if (speed < 0) 582 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 583 dst->speed_left -= rndm ();
592 584
593 dst->set_speed (dst->speed); 585 dst->set_speed (dst->speed);
594} 586}
595 587
596void 588void
… …
923 915
924 if (!freed_map) 916 if (!freed_map)
925 { 917 {
926 freed_map = new maptile; 918 freed_map = new maptile;
927 919
920 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 921 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 922 freed_map->width = 3;
930 freed_map->height = 3; 923 freed_map->height = 3;
931 924
932 freed_map->alloc (); 925 freed_map->alloc ();
… …
1238 1231
1239 object *top, *floor = NULL; 1232 object *top, *floor = NULL;
1240 1233
1241 op->remove (); 1234 op->remove ();
1242 1235
1243 if (out_of_map (m, op->x, op->y))
1244 {
1245 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1246#ifdef MANY_CORES
1247 /* Better to catch this here, as otherwise the next use of this object
1248 * is likely to cause a crash. Better to find out where it is getting
1249 * improperly inserted.
1250 */
1251 abort ();
1252#endif
1253 return op;
1254 }
1255
1256 if (object *more = op->more)
1257 if (!insert_ob_in_map (more, m, originator, flag))
1258 return 0;
1259
1260 CLEAR_FLAG (op, FLAG_REMOVED);
1261
1262 /* Ideally, the caller figures this out. However, it complicates a lot 1236 /* Ideally, the caller figures this out. However, it complicates a lot
1263 * of areas of callers (eg, anything that uses find_free_spot would now 1237 * of areas of callers (eg, anything that uses find_free_spot would now
1264 * need extra work 1238 * need extra work
1265 */ 1239 */
1266 if (!xy_normalise (m, op->x, op->y)) 1240 if (!xy_normalise (m, op->x, op->y))
1241 {
1242 op->destroy ();
1267 return 0; 1243 return 0;
1244 }
1245
1246 if (object *more = op->more)
1247 if (!insert_ob_in_map (more, m, originator, flag))
1248 return 0;
1249
1250 CLEAR_FLAG (op, FLAG_REMOVED);
1268 1251
1269 op->map = m; 1252 op->map = m;
1270 mapspace &ms = op->ms (); 1253 mapspace &ms = op->ms ();
1271 1254
1272 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
… …
2008 * customized, changed states, etc. 1991 * customized, changed states, etc.
2009 */ 1992 */
2010int 1993int
2011find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1994find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2012{ 1995{
1996 int altern[SIZEOFFREE];
2013 int index = 0, flag; 1997 int index = 0, flag;
2014 int altern[SIZEOFFREE];
2015 1998
2016 for (int i = start; i < stop; i++) 1999 for (int i = start; i < stop; i++)
2017 { 2000 {
2018 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2001 mapxy pos (m, x, y); pos.move (i);
2019 if (!flag) 2002
2003 if (!pos.normalise ())
2004 continue;
2005
2006 mapspace &ms = *pos;
2007
2008 if (ms.flags () & P_IS_ALIVE)
2009 continue;
2010
2011 /* However, often
2012 * ob doesn't have any move type (when used to place exits)
2013 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2014 */
2015 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2016 {
2020 altern [index++] = i; 2017 altern [index++] = i;
2018 continue;
2019 }
2021 2020
2022 /* Basically, if we find a wall on a space, we cut down the search size. 2021 /* Basically, if we find a wall on a space, we cut down the search size.
2023 * In this way, we won't return spaces that are on another side of a wall. 2022 * In this way, we won't return spaces that are on another side of a wall.
2024 * This mostly work, but it cuts down the search size in all directions - 2023 * This mostly work, but it cuts down the search size in all directions -
2025 * if the space being examined only has a wall to the north and empty 2024 * if the space being examined only has a wall to the north and empty
2026 * spaces in all the other directions, this will reduce the search space 2025 * spaces in all the other directions, this will reduce the search space
2027 * to only the spaces immediately surrounding the target area, and 2026 * to only the spaces immediately surrounding the target area, and
2028 * won't look 2 spaces south of the target space. 2027 * won't look 2 spaces south of the target space.
2029 */ 2028 */
2030 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2029 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2030 {
2031 stop = maxfree[i]; 2031 stop = maxfree[i];
2032 continue;
2033 }
2034
2035 /* Note it is intentional that we check ob - the movement type of the
2036 * head of the object should correspond for the entire object.
2037 */
2038 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2039 continue;
2040
2041 altern [index++] = i;
2032 } 2042 }
2033 2043
2034 if (!index) 2044 if (!index)
2035 return -1; 2045 return -1;
2036 2046
… …
2045 */ 2055 */
2046int 2056int
2047find_first_free_spot (const object *ob, maptile *m, int x, int y) 2057find_first_free_spot (const object *ob, maptile *m, int x, int y)
2048{ 2058{
2049 for (int i = 0; i < SIZEOFFREE; i++) 2059 for (int i = 0; i < SIZEOFFREE; i++)
2050 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2060 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2051 return i; 2061 return i;
2052 2062
2053 return -1; 2063 return -1;
2054} 2064}
2055 2065

Diff Legend

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