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.181 by elmex, Sun Aug 19 19:34:05 2007 UTC vs.
Revision 1.202 by root, Thu Apr 10 15:35:15 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. */
… …
33#include <sproto.h> 33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38UUID UUID::cur;
39static UUID uuid;
40const uint64 UUID_SKIP = 1<<19; 39static const uint64 UUID_SKIP = 1<<19;
41 40
42objectvec objects; 41objectvec objects;
43activevec actives; 42activevec actives;
44 43
45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 44short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
70 { 69 {
71 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2); 70 LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72 return; 71 return;
73 } 72 }
74 73
75 fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2); 74 fprintf (fp, "<1,%llx>\n", (unsigned long long)UUID::cur.seq + UUID_SKIP * 2);
76 fclose (fp); 75 fclose (fp);
77 rename (filename2, filename1); 76 rename (filename2, filename1);
78} 77}
79 78
80static void 79static void
… …
89 if (!(fp = fopen (filename, "r"))) 88 if (!(fp = fopen (filename, "r")))
90 { 89 {
91 if (errno == ENOENT) 90 if (errno == ENOENT)
92 { 91 {
93 LOG (llevInfo, "RESET uid to 1\n"); 92 LOG (llevInfo, "RESET uid to 1\n");
94 uuid.seq = 0; 93 UUID::cur.seq = 0;
95 write_uuid (); 94 write_uuid ();
96 return; 95 return;
97 } 96 }
98 97
99 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
… …
106 { 105 {
107 LOG (llevError, "FATAL: error reading uid from %s!\n", filename); 106 LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
108 _exit (1); 107 _exit (1);
109 } 108 }
110 109
111 uuid.seq = uid; 110 UUID::cur.seq = uid;
112 write_uuid (); 111 write_uuid ();
113 LOG (llevDebug, "read UID: %" PRId64 "\n", uid); 112 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
114 fclose (fp); 113 fclose (fp);
115} 114}
116 115
117UUID 116UUID
118gen_uuid () 117UUID::gen ()
119{ 118{
120 UUID uid; 119 UUID uid;
121 120
122 uid.seq = ++uuid.seq; 121 uid.seq = ++cur.seq;
123 122
124 if (!(uuid.seq & (UUID_SKIP - 1))) 123 if (!(cur.seq & (UUID_SKIP - 1)))
125 write_uuid (); 124 write_uuid ();
126 125
127 return uid; 126 return uid;
128} 127}
129 128
130void 129void
131init_uuid () 130UUID::init ()
132{ 131{
133 read_uuid (); 132 read_uuid ();
134} 133}
135 134
136/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 135/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
… …
254 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
255 * check all objects in the inventory. 254 * check all objects in the inventory.
256 */ 255 */
257 if (ob1->inv || ob2->inv) 256 if (ob1->inv || ob2->inv)
258 { 257 {
259 /* if one object has inventory but the other doesn't, not equiv */ 258 if (!(ob1->inv && ob2->inv))
260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 return 0; /* inventories differ in length */
261 return 0;
262 260
263 /* Now check to see if the two inventory objects could merge */ 261 if (ob1->inv->below || ob2->inv->below)
262 return 0; /* more than one object in inv */
263
264 if (!object::can_merge (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
265 return 0; 265 return 0; /* inventory objexts differ */
266 266
267 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
268 * if it is valid. 268 * if it is valid.
269 */ 269 */
270 } 270 }
… …
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 (ob1->self) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (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;
… …
420 break; 428 break;
421 429
422 return op; 430 return op;
423} 431}
424 432
425void
426free_all_object_data ()
427{
428 LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429}
430
431/* 433/*
432 * Sets the owner and sets the skill and exp pointers to owner's current 434 * Sets the owner and sets the skill and exp pointers to owner's current
433 * skill and experience objects. 435 * skill and experience objects.
436 * ACTUALLY NO! investigate! TODO
434 */ 437 */
435void 438void
436object::set_owner (object *owner) 439object::set_owner (object *owner)
437{ 440{
441 // allow objects which own objects
438 if (!owner) 442 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) 443 while (owner->owner)
449 owner = owner->owner; 444 owner = owner->owner;
445
446 if (flag [FLAG_FREED])
447 {
448 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
449 return;
450 }
450 451
451 this->owner = owner; 452 this->owner = owner;
452} 453}
453 454
454int 455int
… …
586object::copy_to (object *dst) 587object::copy_to (object *dst)
587{ 588{
588 *dst = *this; 589 *dst = *this;
589 590
590 if (speed < 0) 591 if (speed < 0)
591 dst->speed_left = speed_left - rndm (); 592 dst->speed_left -= rndm ();
592 593
593 dst->set_speed (dst->speed); 594 dst->set_speed (dst->speed);
594} 595}
595 596
596void 597void
597object::instantiate () 598object::instantiate ()
598{ 599{
599 if (!uuid.seq) // HACK 600 if (!uuid.seq) // HACK
600 uuid = gen_uuid (); 601 uuid = UUID::gen ();
601 602
602 speed_left = -0.1f; 603 speed_left = -0.1f;
603 /* copy the body_info to the body_used - this is only really 604 /* copy the body_info to the body_used - this is only really
604 * need for monsters, but doesn't hurt to do it for everything. 605 * need for monsters, but doesn't hurt to do it for everything.
605 * by doing so, when a monster is created, it has good starting 606 * by doing so, when a monster is created, it has good starting
… …
764static int object_count; 765static int object_count;
765 766
766void object::link () 767void object::link ()
767{ 768{
768 assert (!index);//D 769 assert (!index);//D
769 uuid = gen_uuid (); 770 uuid = UUID::gen ();
770 count = ++object_count; 771 count = ++object_count;
771 772
772 refcnt_inc (); 773 refcnt_inc ();
773 objects.insert (this); 774 objects.insert (this);
774} 775}
… …
923 924
924 if (!freed_map) 925 if (!freed_map)
925 { 926 {
926 freed_map = new maptile; 927 freed_map = new maptile;
927 928
929 freed_map->path = "<freed objects map>";
928 freed_map->name = "/internal/freed_objects_map"; 930 freed_map->name = "/internal/freed_objects_map";
929 freed_map->width = 3; 931 freed_map->width = 3;
930 freed_map->height = 3; 932 freed_map->height = 3;
933 freed_map->nodrop = 1;
931 934
932 freed_map->alloc (); 935 freed_map->alloc ();
933 freed_map->in_memory = MAP_IN_MEMORY; 936 freed_map->in_memory = MAP_IN_MEMORY;
934 } 937 }
935 938
… …
1147merge_ob (object *op, object *top) 1150merge_ob (object *op, object *top)
1148{ 1151{
1149 if (!op->nrof) 1152 if (!op->nrof)
1150 return 0; 1153 return 0;
1151 1154
1152 if (top) 1155 if (!top)
1153 for (top = op; top && top->above; top = top->above) 1156 for (top = op; top && top->above; top = top->above)
1154 ; 1157 ;
1155 1158
1156 for (; top; top = top->below) 1159 for (; top; top = top->below)
1157 { 1160 {
… …
1238 1241
1239 object *top, *floor = NULL; 1242 object *top, *floor = NULL;
1240 1243
1241 op->remove (); 1244 op->remove ();
1242 1245
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 1246 /* 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 1247 * of areas of callers (eg, anything that uses find_free_spot would now
1264 * need extra work 1248 * need extra work
1265 */ 1249 */
1266 if (!xy_normalise (m, op->x, op->y)) 1250 if (!xy_normalise (m, op->x, op->y))
1251 {
1252 op->destroy ();
1267 return 0; 1253 return 0;
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);
1268 1261
1269 op->map = m; 1262 op->map = m;
1270 mapspace &ms = op->ms (); 1263 mapspace &ms = op->ms ();
1271 1264
1272 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
… …
1307 else 1300 else
1308 { 1301 {
1309 top = ms.bot; 1302 top = ms.bot;
1310 1303
1311 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1312 if ((!(flag & INS_MAP_LOAD)) && top) 1305 if (top)
1313 { 1306 {
1314 object *last = 0; 1307 object *last = 0;
1315 1308
1316 /* 1309 /*
1317 * If there are multiple objects on this space, we do some trickier handling. 1310 * If there are multiple objects on this space, we do some trickier handling.
… …
1369 */ 1362 */
1370 if (last && last->below && last != floor) 1363 if (last && last->below && last != floor)
1371 top = last->below; 1364 top = last->below;
1372 } 1365 }
1373 } /* If objects on this space */ 1366 } /* If objects on this space */
1374 if (flag & INS_MAP_LOAD)
1375 top = ms.top;
1376 1367
1377 if (flag & INS_ABOVE_FLOOR_ONLY) 1368 if (flag & INS_ABOVE_FLOOR_ONLY)
1378 top = floor; 1369 top = floor;
1379 1370
1380 /* Top is the object that our object (op) is going to get inserted above. 1371 /* Top is the object that our object (op) is going to get inserted above.
… …
1413 op->map->touch (); 1404 op->map->touch ();
1414 } 1405 }
1415 1406
1416 op->map->dirty = true; 1407 op->map->dirty = true;
1417 1408
1418 if (!(flag & INS_MAP_LOAD))
1419 if (object *pl = ms.player ()) 1409 if (object *pl = ms.player ())
1420 pl->contr->ns->floorbox_update (); 1410 pl->contr->ns->floorbox_update ();
1421 1411
1422 /* If this object glows, it may affect lighting conditions that are 1412 /* If this object glows, it may affect lighting conditions that are
1423 * visible to others on this map. But update_all_los is really 1413 * visible to others on this map. But update_all_los is really
1424 * an inefficient way to do this, as it means los for all players 1414 * an inefficient way to do this, as it means los for all players
1425 * on the map will get recalculated. The players could very well 1415 * on the map will get recalculated. The players could very well
… …
1663 * be != op, if items are merged. -Tero 1653 * be != op, if items are merged. -Tero
1664 */ 1654 */
1665object * 1655object *
1666object::insert (object *op) 1656object::insert (object *op)
1667{ 1657{
1668 object *tmp, *otmp;
1669
1670 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1658 if (!QUERY_FLAG (op, FLAG_REMOVED))
1671 op->remove (); 1659 op->remove ();
1672 1660
1673 if (op->more) 1661 if (op->more)
1674 { 1662 {
… …
1676 return op; 1664 return op;
1677 } 1665 }
1678 1666
1679 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1667 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1680 CLEAR_FLAG (op, FLAG_REMOVED); 1668 CLEAR_FLAG (op, FLAG_REMOVED);
1669
1681 if (op->nrof) 1670 if (op->nrof)
1682 { 1671 {
1683 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1672 for (object *tmp = inv; tmp; tmp = tmp->below)
1684 if (object::can_merge (tmp, op)) 1673 if (object::can_merge (tmp, op))
1685 { 1674 {
1686 /* return the original object and remove inserted object 1675 /* return the original object and remove inserted object
1687 (client needs the original object) */ 1676 (client needs the original object) */
1688 tmp->nrof += op->nrof; 1677 tmp->nrof += op->nrof;
… …
1707 add_weight (this, op->weight * op->nrof); 1696 add_weight (this, op->weight * op->nrof);
1708 } 1697 }
1709 else 1698 else
1710 add_weight (this, (op->weight + op->carrying)); 1699 add_weight (this, (op->weight + op->carrying));
1711 1700
1712 otmp = this->in_player (); 1701 if (object *otmp = this->in_player ())
1713 if (otmp && otmp->contr)
1714 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1702 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1715 otmp->update_stats (); 1703 otmp->update_stats ();
1716 1704
1705 op->owner = 0; // its his/hers now. period.
1717 op->map = 0; 1706 op->map = 0;
1718 op->env = this; 1707 op->env = this;
1719 op->above = 0; 1708 op->above = 0;
1720 op->below = 0; 1709 op->below = 0;
1721 op->x = 0, op->y = 0; 1710 op->x = op->y = 0;
1722 1711
1723 /* reset the light list and los of the players on the map */ 1712 /* reset the light list and los of the players on the map */
1724 if ((op->glow_radius != 0) && map) 1713 if (op->glow_radius && map)
1725 { 1714 {
1726#ifdef DEBUG_LIGHTS 1715#ifdef DEBUG_LIGHTS
1727 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1716 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1728#endif /* DEBUG_LIGHTS */ 1717#endif /* DEBUG_LIGHTS */
1729 if (map->darkness) 1718 if (map->darkness)
… …
1963 * activate recursively a flag on an object inventory 1952 * activate recursively a flag on an object inventory
1964 */ 1953 */
1965void 1954void
1966flag_inv (object *op, int flag) 1955flag_inv (object *op, int flag)
1967{ 1956{
1968 if (op->inv)
1969 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1957 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1970 { 1958 {
1971 SET_FLAG (tmp, flag); 1959 SET_FLAG (tmp, flag);
1972 flag_inv (tmp, flag); 1960 flag_inv (tmp, flag);
1973 } 1961 }
1974} 1962}
1975 1963
1976/* 1964/*
1977 * deactivate recursively a flag on an object inventory 1965 * deactivate recursively a flag on an object inventory
1978 */ 1966 */
1979void 1967void
1980unflag_inv (object *op, int flag) 1968unflag_inv (object *op, int flag)
1981{ 1969{
1982 if (op->inv)
1983 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1970 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1984 { 1971 {
1985 CLEAR_FLAG (tmp, flag); 1972 CLEAR_FLAG (tmp, flag);
1986 unflag_inv (tmp, flag); 1973 unflag_inv (tmp, flag);
1987 } 1974 }
1988} 1975}
1989 1976
1990/* 1977/*
1991 * find_free_spot(object, map, x, y, start, stop) will search for 1978 * find_free_spot(object, map, x, y, start, stop) will search for
1992 * a spot at the given map and coordinates which will be able to contain 1979 * a spot at the given map and coordinates which will be able to contain
… …
1994 * to search (see the freearr_x/y[] definition). 1981 * to search (see the freearr_x/y[] definition).
1995 * It returns a random choice among the alternatives found. 1982 * It returns a random choice among the alternatives found.
1996 * start and stop are where to start relative to the free_arr array (1,9 1983 * start and stop are where to start relative to the free_arr array (1,9
1997 * does all 4 immediate directions). This returns the index into the 1984 * does all 4 immediate directions). This returns the index into the
1998 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1985 * array of the free spot, -1 if no spot available (dir 0 = x,y)
1999 * Note - this only checks to see if there is space for the head of the
2000 * object - if it is a multispace object, this should be called for all
2001 * pieces.
2002 * Note2: This function does correctly handle tiled maps, but does not 1986 * Note: This function does correctly handle tiled maps, but does not
2003 * inform the caller. However, insert_ob_in_map will update as 1987 * inform the caller. However, insert_ob_in_map will update as
2004 * necessary, so the caller shouldn't need to do any special work. 1988 * necessary, so the caller shouldn't need to do any special work.
2005 * Note - updated to take an object instead of archetype - this is necessary 1989 * Note - updated to take an object instead of archetype - this is necessary
2006 * because arch_blocked (now ob_blocked) needs to know the movement type 1990 * because arch_blocked (now ob_blocked) needs to know the movement type
2007 * to know if the space in question will block the object. We can't use 1991 * to know if the space in question will block the object. We can't use
… …
2009 * customized, changed states, etc. 1993 * customized, changed states, etc.
2010 */ 1994 */
2011int 1995int
2012find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1996find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2013{ 1997{
1998 int altern[SIZEOFFREE];
2014 int index = 0, flag; 1999 int index = 0, flag;
2015 int altern[SIZEOFFREE];
2016 2000
2017 for (int i = start; i < stop; i++) 2001 for (int i = start; i < stop; i++)
2018 { 2002 {
2019 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2003 mapxy pos (m, x, y); pos.move (i);
2020 if (!flag) 2004
2005 if (!pos.normalise ())
2006 continue;
2007
2008 mapspace &ms = *pos;
2009
2010 if (ms.flags () & P_IS_ALIVE)
2011 continue;
2012
2013 /* However, often
2014 * ob doesn't have any move type (when used to place exits)
2015 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2016 */
2017 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2018 {
2021 altern [index++] = i; 2019 altern [index++] = i;
2020 continue;
2021 }
2022 2022
2023 /* Basically, if we find a wall on a space, we cut down the search size. 2023 /* Basically, if we find a wall on a space, we cut down the search size.
2024 * In this way, we won't return spaces that are on another side of a wall. 2024 * In this way, we won't return spaces that are on another side of a wall.
2025 * This mostly work, but it cuts down the search size in all directions - 2025 * This mostly work, but it cuts down the search size in all directions -
2026 * if the space being examined only has a wall to the north and empty 2026 * if the space being examined only has a wall to the north and empty
2027 * spaces in all the other directions, this will reduce the search space 2027 * spaces in all the other directions, this will reduce the search space
2028 * to only the spaces immediately surrounding the target area, and 2028 * to only the spaces immediately surrounding the target area, and
2029 * won't look 2 spaces south of the target space. 2029 * won't look 2 spaces south of the target space.
2030 */ 2030 */
2031 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2031 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2032 {
2032 stop = maxfree[i]; 2033 stop = maxfree[i];
2034 continue;
2035 }
2036
2037 /* Note it is intentional that we check ob - the movement type of the
2038 * head of the object should correspond for the entire object.
2039 */
2040 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2041 continue;
2042
2043 if (ob->blocked (m, pos.x, pos.y))
2044 continue;
2045
2046 altern [index++] = i;
2033 } 2047 }
2034 2048
2035 if (!index) 2049 if (!index)
2036 return -1; 2050 return -1;
2037 2051
… …
2046 */ 2060 */
2047int 2061int
2048find_first_free_spot (const object *ob, maptile *m, int x, int y) 2062find_first_free_spot (const object *ob, maptile *m, int x, int y)
2049{ 2063{
2050 for (int i = 0; i < SIZEOFFREE; i++) 2064 for (int i = 0; i < SIZEOFFREE; i++)
2051 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2065 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2052 return i; 2066 return i;
2053 2067
2054 return -1; 2068 return -1;
2055} 2069}
2056 2070

Diff Legend

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