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.185 by root, Fri Aug 24 01:23:29 2007 UTC vs.
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC

… …
915 915
916 if (!freed_map) 916 if (!freed_map)
917 { 917 {
918 freed_map = new maptile; 918 freed_map = new maptile;
919 919
920 freed_map->path = "<freed objects map>";
920 freed_map->name = "/internal/freed_objects_map"; 921 freed_map->name = "/internal/freed_objects_map";
921 freed_map->width = 3; 922 freed_map->width = 3;
922 freed_map->height = 3; 923 freed_map->height = 3;
923 924
924 freed_map->alloc (); 925 freed_map->alloc ();
… …
1230 1231
1231 object *top, *floor = NULL; 1232 object *top, *floor = NULL;
1232 1233
1233 op->remove (); 1234 op->remove ();
1234 1235
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 1236 /* 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 1237 * of areas of callers (eg, anything that uses find_free_spot would now
1256 * need extra work 1238 * need extra work
1257 */ 1239 */
1258 if (!xy_normalise (m, op->x, op->y)) 1240 if (!xy_normalise (m, op->x, op->y))
1241 {
1242 op->destroy ();
1259 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);
1260 1251
1261 op->map = m; 1252 op->map = m;
1262 mapspace &ms = op->ms (); 1253 mapspace &ms = op->ms ();
1263 1254
1264 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
… …
2000 * customized, changed states, etc. 1991 * customized, changed states, etc.
2001 */ 1992 */
2002int 1993int
2003find_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)
2004{ 1995{
1996 int altern[SIZEOFFREE];
2005 int index = 0, flag; 1997 int index = 0, flag;
2006 int altern[SIZEOFFREE];
2007 1998
2008 for (int i = start; i < stop; i++) 1999 for (int i = start; i < stop; i++)
2009 { 2000 {
2010 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2001 mapxy pos (m, x, y); pos.move (i);
2011 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 {
2012 altern [index++] = i; 2017 altern [index++] = i;
2018 continue;
2019 }
2013 2020
2014 /* 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.
2015 * 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.
2016 * 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 -
2017 * 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
2018 * 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
2019 * to only the spaces immediately surrounding the target area, and 2026 * to only the spaces immediately surrounding the target area, and
2020 * won't look 2 spaces south of the target space. 2027 * won't look 2 spaces south of the target space.
2021 */ 2028 */
2022 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2029 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2030 {
2023 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;
2024 } 2042 }
2025 2043
2026 if (!index) 2044 if (!index)
2027 return -1; 2045 return -1;
2028 2046
… …
2037 */ 2055 */
2038int 2056int
2039find_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)
2040{ 2058{
2041 for (int i = 0; i < SIZEOFFREE; i++) 2059 for (int i = 0; i < SIZEOFFREE; i++)
2042 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]))
2043 return i; 2061 return i;
2044 2062
2045 return -1; 2063 return -1;
2046} 2064}
2047 2065

Diff Legend

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