[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.184 by root, Wed Aug 22 20:46:46 2007 UTC vs.
Revision 1.203 by root, Fri Apr 11 13:59:05 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
38	int nrofallocobjects = 0;	38	UUID UUID::cur;
39	static UUID uuid;
40	const uint64 UUID_SKIP = 1<<19;	39	static const uint64 UUID_SKIP = 1<<19;
41		40
42	objectvec objects;	41	objectvec objects;
43	activevec actives;	42	activevec actives;
44		43
45	short 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,	44	short freearr_x[SIZEOFFREE] = {
		45	0,
		46	0, 1, 1, 1, 0, -1, -1, -1,
		47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	48	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	49	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	50	short freearr_y[SIZEOFFREE] = {
		51	0,
		52	-1, -1, 0, 1, 1, 1, 0, -1,
		53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	55	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	56	int maxfree[SIZEOFFREE] = {
		57	0,
		58	9, 10, 13, 14, 17, 18, 21, 22,
		59	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	60	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	61	};
54	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	63	0,
		64	1, 2, 3, 4, 5, 6, 7, 8,
		65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	67	};
58		68
59	static void	69	static void
60	write_uuid (void)	70	write_uuid (uval64 skip, bool sync)
61	{	71	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	72	CALL_BEGIN (2);
63		73	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	74	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	75	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		76	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	77	}
79		78
80	static void	79	static void
81	read_uuid (void)	80	read_uuid (void)
82	{	81	{
…		…
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 (UUID_SKIP, true);
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);
100	_exit (1);	99	_exit (1);
101	}	100	}
102		101
103	int version;	102	UUID::BUF buf;
104	unsigned long long uid;	103	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	104	fgets (buf, sizeof (buf), fp);
		105
		106	if (!UUID::cur.parse (buf))
106	{	107	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	108	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	109	_exit (1);
109	}	110	}
110		111
111	uuid.seq = uid;	112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	113
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	114	write_uuid (UUID_SKIP, true);
114	fclose (fp);	115	fclose (fp);
115	}	116	}
116		117
117	UUID	118	UUID
118	gen_uuid ()	119	UUID::gen ()
119	{	120	{
120	UUID uid;	121	UUID uid;
121		122
122	uid.seq = ++uuid.seq;	123	uid.seq = ++cur.seq;
123		124
124	if (!(uuid.seq & (UUID_SKIP - 1)))	125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))
125	write_uuid ();	126	write_uuid (UUID_SKIP, false);
126		127
127	return uid;	128	return uid;
128	}	129	}
129		130
130	void	131	void
131	init_uuid ()	132	UUID::init ()
132	{	133	{
133	read_uuid ();	134	read_uuid ();
134	}	135	}
135		136
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	137	/* 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	255	/* This is really a spellbook check - really, we should
255	* check all objects in the inventory.	256	* check all objects in the inventory.
256	*/	257	*/
257	if (ob1->inv \|\| ob2->inv)	258	if (ob1->inv \|\| ob2->inv)
258	{	259	{
259	/* if one object has inventory but the other doesn't, not equiv */	260	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	261	return 0; /* inventories differ in length */
261	return 0;
262		262
263	/* Now check to see if the two inventory objects could merge */	263	if (ob1->inv->below \|\| ob2->inv->below)
		264	return 0; /* more than one object in inv */
		265
264	if (!object::can_merge (ob1->inv, ob2->inv))	266	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	267	return 0; /* inventory objexts differ */
266		268
267	/* inventory ok - still need to check rest of this object to see	269	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	270	* if it is valid.
269	*/	271	*/
270	}	272	}
…		…
305	{	307	{
306	ob1->optimise ();	308	ob1->optimise ();
307	ob2->optimise ();	309	ob2->optimise ();
308		310
309	if (ob1->self \|\| ob2->self)	311	if (ob1->self \|\| ob2->self)
310	if (!cfperl_can_merge (ob1, ob2))	312	{
		313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		315
		316	if (k1 != k2)
311	return 0;	317	return 0;
		318	else if (k1 == 0)
		319	return 1;
		320	else if (!cfperl_can_merge (ob1, ob2))
		321	return 0;
		322	}
312	}	323	}
313		324
314	/* Everything passes, must be OK. */	325	/* Everything passes, must be OK. */
315	return 1;	326	return 1;
316	}	327	}
…		…
419	break;	430	break;
420		431
421	return op;	432	return op;
422	}	433	}
423		434
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}
429
430	/*	435	/*
431	* Sets the owner and sets the skill and exp pointers to owner's current	436	* Sets the owner and sets the skill and exp pointers to owner's current
432	* skill and experience objects.	437	* skill and experience objects.
433	* ACTUALLY NO! investigate! TODO	438	* ACTUALLY NO! investigate! TODO
434	*/	439	*/
…		…
437	{	442	{
438	// allow objects which own objects	443	// allow objects which own objects
439	if (owner)	444	if (owner)
440	while (owner->owner)	445	while (owner->owner)
441	owner = owner->owner;	446	owner = owner->owner;
		447
		448	if (flag [FLAG_FREED])
		449	{
		450	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		451	return;
		452	}
442		453
443	this->owner = owner;	454	this->owner = owner;
444	}	455	}
445		456
446	int	457	int
…		…
578	object::copy_to (object *dst)	589	object::copy_to (object *dst)
579	{	590	{
580	dst = this;	591	dst = this;
581		592
582	if (speed < 0)	593	if (speed < 0)
583	dst->speed_left = speed_left - rndm ();	594	dst->speed_left -= rndm ();
584		595
585	dst->set_speed (dst->speed);	596	dst->set_speed (dst->speed);
586	}	597	}
587		598
588	void	599	void
589	object::instantiate ()	600	object::instantiate ()
590	{	601	{
591	if (!uuid.seq) // HACK	602	if (!uuid.seq) // HACK
592	uuid = gen_uuid ();	603	uuid = UUID::gen ();
593		604
594	speed_left = -0.1f;	605	speed_left = -0.1f;
595	/* copy the body_info to the body_used - this is only really	606	/* copy the body_info to the body_used - this is only really
596	* need for monsters, but doesn't hurt to do it for everything.	607	* need for monsters, but doesn't hurt to do it for everything.
597	* by doing so, when a monster is created, it has good starting	608	* by doing so, when a monster is created, it has good starting
…		…
756	static int object_count;	767	static int object_count;
757		768
758	void object::link ()	769	void object::link ()
759	{	770	{
760	assert (!index);//D	771	assert (!index);//D
761	uuid = gen_uuid ();	772	uuid = UUID::gen ();
762	count = ++object_count;	773	count = ++object_count;
763		774
764	refcnt_inc ();	775	refcnt_inc ();
765	objects.insert (this);	776	objects.insert (this);
766	}	777	}
…		…
915		926
916	if (!freed_map)	927	if (!freed_map)
917	{	928	{
918	freed_map = new maptile;	929	freed_map = new maptile;
919		930
		931	freed_map->path = "<freed objects map>";
920	freed_map->name = "/internal/freed_objects_map";	932	freed_map->name = "/internal/freed_objects_map";
921	freed_map->width = 3;	933	freed_map->width = 3;
922	freed_map->height = 3;	934	freed_map->height = 3;
		935	freed_map->nodrop = 1;
923		936
924	freed_map->alloc ();	937	freed_map->alloc ();
925	freed_map->in_memory = MAP_IN_MEMORY;	938	freed_map->in_memory = MAP_IN_MEMORY;
926	}	939	}
927		940
…		…
1139	merge_ob (object op, object top)	1152	merge_ob (object op, object top)
1140	{	1153	{
1141	if (!op->nrof)	1154	if (!op->nrof)
1142	return 0;	1155	return 0;
1143		1156
1144	if (top)	1157	if (!top)
1145	for (top = op; top && top->above; top = top->above)	1158	for (top = op; top && top->above; top = top->above)
1146	;	1159	;
1147		1160
1148	for (; top; top = top->below)	1161	for (; top; top = top->below)
1149	{	1162	{
…		…
1230		1243
1231	object top, floor = NULL;	1244	object top, floor = NULL;
1232		1245
1233	op->remove ();	1246	op->remove ();
1234		1247
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	1248	/* 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	1249	* of areas of callers (eg, anything that uses find_free_spot would now
1256	* need extra work	1250	* need extra work
1257	*/	1251	*/
1258	if (!xy_normalise (m, op->x, op->y))	1252	if (!xy_normalise (m, op->x, op->y))
		1253	{
		1254	op->destroy ();
1259	return 0;	1255	return 0;
		1256	}
		1257
		1258	if (object *more = op->more)
		1259	if (!insert_ob_in_map (more, m, originator, flag))
		1260	return 0;
		1261
		1262	CLEAR_FLAG (op, FLAG_REMOVED);
1260		1263
1261	op->map = m;	1264	op->map = m;
1262	mapspace &ms = op->ms ();	1265	mapspace &ms = op->ms ();
1263		1266
1264	/* this has to be done after we translate the coordinates.	1267	/* this has to be done after we translate the coordinates.
…		…
1299	else	1302	else
1300	{	1303	{
1301	top = ms.bot;	1304	top = ms.bot;
1302		1305
1303	/* If there are other objects, then */	1306	/* If there are other objects, then */
1304	if ((!(flag & INS_MAP_LOAD)) && top)	1307	if (top)
1305	{	1308	{
1306	object *last = 0;	1309	object *last = 0;
1307		1310
1308	/*	1311	/*
1309	* If there are multiple objects on this space, we do some trickier handling.	1312	* If there are multiple objects on this space, we do some trickier handling.
…		…
1361	*/	1364	*/
1362	if (last && last->below && last != floor)	1365	if (last && last->below && last != floor)
1363	top = last->below;	1366	top = last->below;
1364	}	1367	}
1365	} /* If objects on this space */	1368	} /* If objects on this space */
1366	if (flag & INS_MAP_LOAD)
1367	top = ms.top;
1368		1369
1369	if (flag & INS_ABOVE_FLOOR_ONLY)	1370	if (flag & INS_ABOVE_FLOOR_ONLY)
1370	top = floor;	1371	top = floor;
1371		1372
1372	/* Top is the object that our object (op) is going to get inserted above.	1373	/* Top is the object that our object (op) is going to get inserted above.
…		…
1405	op->map->touch ();	1406	op->map->touch ();
1406	}	1407	}
1407		1408
1408	op->map->dirty = true;	1409	op->map->dirty = true;
1409		1410
1410	if (!(flag & INS_MAP_LOAD))
1411	if (object *pl = ms.player ())	1411	if (object *pl = ms.player ())
1412	pl->contr->ns->floorbox_update ();	1412	pl->contr->ns->floorbox_update ();
1413		1413
1414	/* If this object glows, it may affect lighting conditions that are	1414	/* If this object glows, it may affect lighting conditions that are
1415	* visible to others on this map. But update_all_los is really	1415	* 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	1416	* 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	1417	* on the map will get recalculated. The players could very well
…		…
1954	* activate recursively a flag on an object inventory	1954	* activate recursively a flag on an object inventory
1955	*/	1955	*/
1956	void	1956	void
1957	flag_inv (object *op, int flag)	1957	flag_inv (object *op, int flag)
1958	{	1958	{
1959	if (op->inv)
1960	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1959	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1961	{	1960	{
1962	SET_FLAG (tmp, flag);	1961	SET_FLAG (tmp, flag);
1963	flag_inv (tmp, flag);	1962	flag_inv (tmp, flag);
1964	}	1963	}
1965	}	1964	}
1966		1965
1967	/*	1966	/*
1968	* deactivate recursively a flag on an object inventory	1967	* deactivate recursively a flag on an object inventory
1969	*/	1968	*/
1970	void	1969	void
1971	unflag_inv (object *op, int flag)	1970	unflag_inv (object *op, int flag)
1972	{	1971	{
1973	if (op->inv)
1974	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1975	{	1973	{
1976	CLEAR_FLAG (tmp, flag);	1974	CLEAR_FLAG (tmp, flag);
1977	unflag_inv (tmp, flag);	1975	unflag_inv (tmp, flag);
1978	}	1976	}
1979	}	1977	}
1980		1978
1981	/*	1979	/*
1982	* find_free_spot(object, map, x, y, start, stop) will search for	1980	* 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	1981	* a spot at the given map and coordinates which will be able to contain
…		…
1985	* to search (see the freearr_x/y[] definition).	1983	* to search (see the freearr_x/y[] definition).
1986	* It returns a random choice among the alternatives found.	1984	* 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	1985	* 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	1986	* 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)	1987	* 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	1988	* Note: This function does correctly handle tiled maps, but does not
1994	* inform the caller. However, insert_ob_in_map will update as	1989	* inform the caller. However, insert_ob_in_map will update as
1995	* necessary, so the caller shouldn't need to do any special work.	1990	* 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	1991	* 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	1992	* 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	1993	* to know if the space in question will block the object. We can't use
…		…
2000	* customized, changed states, etc.	1995	* customized, changed states, etc.
2001	*/	1996	*/
2002	int	1997	int
2003	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	1998	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2004	{	1999	{
		2000	int altern[SIZEOFFREE];
2005	int index = 0, flag;	2001	int index = 0, flag;
2006	int altern[SIZEOFFREE];
2007		2002
2008	for (int i = start; i < stop; i++)	2003	for (int i = start; i < stop; i++)
2009	{	2004	{
2010	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2005	mapxy pos (m, x, y); pos.move (i);
2011	if (!flag)	2006
		2007	if (!pos.normalise ())
		2008	continue;
		2009
		2010	mapspace &ms = *pos;
		2011
		2012	if (ms.flags () & P_IS_ALIVE)
		2013	continue;
		2014
		2015	/* However, often
		2016	* ob doesn't have any move type (when used to place exits)
		2017	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2018	*/
		2019	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2020	{
2012	altern [index++] = i;	2021	altern [index++] = i;
		2022	continue;
		2023	}
2013		2024
2014	/* Basically, if we find a wall on a space, we cut down the search size.	2025	/* 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.	2026	* 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 -	2027	* 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	2028	* 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	2029	* spaces in all the other directions, this will reduce the search space
2019	* to only the spaces immediately surrounding the target area, and	2030	* to only the spaces immediately surrounding the target area, and
2020	* won't look 2 spaces south of the target space.	2031	* won't look 2 spaces south of the target space.
2021	*/	2032	*/
2022	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2033	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2034	{
2023	stop = maxfree[i];	2035	stop = maxfree[i];
		2036	continue;
		2037	}
		2038
		2039	/* Note it is intentional that we check ob - the movement type of the
		2040	* head of the object should correspond for the entire object.
		2041	*/
		2042	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2043	continue;
		2044
		2045	if (ob->blocked (m, pos.x, pos.y))
		2046	continue;
		2047
		2048	altern [index++] = i;
2024	}	2049	}
2025		2050
2026	if (!index)	2051	if (!index)
2027	return -1;	2052	return -1;
2028		2053
…		…
2037	*/	2062	*/
2038	int	2063	int
2039	find_first_free_spot (const object ob, maptile m, int x, int y)	2064	find_first_free_spot (const object ob, maptile m, int x, int y)
2040	{	2065	{
2041	for (int i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2042	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2067	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2043	return i;	2068	return i;
2044		2069
2045	return -1;	2070	return -1;
2046	}	2071	}
2047		2072
…		…
2584	{	2609	{
2585	char flagdesc[512];	2610	char flagdesc[512];
2586	char info2[256 * 4];	2611	char info2[256 * 4];
2587	char *p = info;	2612	char *p = info;
2588		2613
2589	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2614	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2590	count, uuid.seq,	2615	count,
		2616	uuid.c_str (),
2591	&name,	2617	&name,
2592	title ? "\",title:\"" : "",	2618	title ? "\",title:\"" : "",
2593	title ? (const char *)title : "",	2619	title ? (const char *)title : "",
2594	flag_desc (flagdesc, 512), type);	2620	flag_desc (flagdesc, 512), type);
2595		2621

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.184 by root, Wed Aug 22 20:46:46 2007 UTC vs. Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.184 by root, Wed Aug 22 20:46:46 2007 UTC vs.
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC