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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.182 by root, Mon Aug 20 18:11:02 2007 UTC vs.
Revision 1.206 by root, Tue Apr 15 14:21:04 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;	39	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	40	static const uint64 UUID_GAP = 1<<19;
41		41
42	objectvec objects;	42	objectvec objects;
43	activevec actives;	43	activevec actives;
44		44
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,	45	short freearr_x[SIZEOFFREE] = {
		46	0,
		47	0, 1, 1, 1, 0, -1, -1, -1,
		48	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	49	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	};	50	};
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,	51	short freearr_y[SIZEOFFREE] = {
		52	0,
		53	-1, -1, 0, 1, 1, 1, 0, -1,
		54	-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	55	-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	};	56	};
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,	57	int maxfree[SIZEOFFREE] = {
		58	0,
		59	9, 10, 13, 14, 17, 18, 21, 22,
		60	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	61	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	};	62	};
54	int freedir[SIZEOFFREE] = {	63	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,	64	0,
		65	1, 2, 3, 4, 5, 6, 7, 8,
		66	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	67	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	};	68	};
58		69
59	static void	70	static void
60	write_uuid (void)	71	write_uuid (uval64 skip, bool sync)
61	{	72	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	73	CALL_BEGIN (2);
63		74	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	75	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		77	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	}	78	}
79		79
80	static void	80	static void
81	read_uuid (void)	81	read_uuid (void)
82	{	82	{
83	char filename[MAX_BUF];	83	char filename[MAX_BUF];
84		84
85	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
86		86
		87	seq_next_save = 0;
		88
87	FILE *fp;	89	FILE *fp;
88		90
89	if (!(fp = fopen (filename, "r")))	91	if (!(fp = fopen (filename, "r")))
90	{	92	{
91	if (errno == ENOENT)	93	if (errno == ENOENT)
92	{	94	{
93	LOG (llevInfo, "RESET uid to 1\n");	95	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	96	UUID::cur.seq = 0;
95	write_uuid ();	97	write_uuid (UUID_GAP, true);
96	return;	98	return;
97	}	99	}
98		100
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	102	_exit (1);
101	}	103	}
102		104
103	int version;	105	UUID::BUF buf;
104	unsigned long long uid;	106	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	107	fgets (buf, sizeof (buf), fp);
		108
		109	if (!UUID::cur.parse (buf))
106	{	110	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	111	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	112	_exit (1);
109	}	113	}
110		114
111	uuid.seq = uid;	115	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	116
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	117	write_uuid (UUID_GAP, true);
114	fclose (fp);	118	fclose (fp);
115	}	119	}
116		120
117	UUID	121	UUID
118	gen_uuid ()	122	UUID::gen ()
119	{	123	{
120	UUID uid;	124	UUID uid;
121		125
122	uid.seq = ++uuid.seq;	126	uid.seq = ++cur.seq;
123		127
124	if (!(uuid.seq & (UUID_SKIP - 1)))	128	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	129	{
		130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		131	write_uuid (UUID_GAP, false);
		132	}
		133
126		134
127	return uid;	135	return uid;
128	}	136	}
129		137
130	void	138	void
131	init_uuid ()	139	UUID::init ()
132	{	140	{
133	read_uuid ();	141	read_uuid ();
134	}	142	}
135		143
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	145	static bool
138	compare_ob_value_lists_one (const object wants, const object has)	146	compare_ob_value_lists_one (const object wants, const object has)
139	{	147	{
140	key_value *wants_field;	148	key_value *wants_field;
141		149
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	150	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	158	key_value *has_field;
151		159
152	/* Look for a field in has with the same key. */	160	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	161	has_field = get_ob_key_link (has, wants_field->key);
154		162
155	if (has_field == NULL)	163	if (!has_field)
156	{
157	/* No field with that name. */	164	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		165
161	/* Found the matching field. */	166	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	167	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	168	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		169
168	/* If we get here, we found a match. Now for the next field in wants. */	170	/* If we get here, we found a match. Now for the next field in wants. */
169	}	171	}
170		172
171	/* If we get here, every field in wants has a matching field in has. */	173	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	174	return 1;
173	}	175	}
174		176
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	177	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	178	static bool
177	compare_ob_value_lists (const object ob1, const object ob2)	179	compare_ob_value_lists (const object ob1, const object ob2)
178	{	180	{
179	/* However, there may be fields in has which aren't partnered in wants,	181	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison twice. :(	182	* so we need to run the comparison twice. :(
181	*/	183	*/
…		…
202	\|\| ob1->speed != ob2->speed	204	\|\| ob1->speed != ob2->speed
203	\|\| ob1->value != ob2->value	205	\|\| ob1->value != ob2->value
204	\|\| ob1->name != ob2->name)	206	\|\| ob1->name != ob2->name)
205	return 0;	207	return 0;
206		208
207	//TODO: this ain't working well, use nicer and correct overflow check	209	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	210	* for unsigned overflow (2c), second part checks wether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	211	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	212	* nrof values.
211	*/	213	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	214	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	215	return 0;
214		216
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	217	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	218	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	219	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	220	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	221	* flags lose any meaning.
220	*/	222	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
…		…
249	\|\| ob1->move_off != ob2->move_off	251	\|\| ob1->move_off != ob2->move_off
250	\|\| ob1->move_slow != ob2->move_slow	252	\|\| ob1->move_slow != ob2->move_slow
251	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	253	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)
252	return 0;	254	return 0;
253		255
254	/* This is really a spellbook check - really, we should	256	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	257	* not merge objects with real inventories, as splitting them
		258	* is hard.
256	*/	259	*/
257	if (ob1->inv \|\| ob2->inv)	260	if (ob1->inv \|\| ob2->inv)
258	{	261	{
259	/* if one object has inventory but the other doesn't, not equiv */	262	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	263	return 0; /* inventories differ in length */
261	return 0;
262		264
263	/* Now check to see if the two inventory objects could merge */	265	if (ob1->inv->below \|\| ob2->inv->below)
		266	return 0; /* more than one object in inv */
		267
264	if (!object::can_merge (ob1->inv, ob2->inv))	268	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	269	return 0; /* inventory objects differ */
266		270
267	/* inventory ok - still need to check rest of this object to see	271	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	272	* if it is valid.
269	*/	273	*/
270	}	274	}
…		…
289	if (ob1->level != ob2->level)	293	if (ob1->level != ob2->level)
290	return 0;	294	return 0;
291	break;	295	break;
292	}	296	}
293		297
294	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	298	if (ob1->key_values \|\| ob2->key_values)
295	{	299	{
296	/* At least one of these has key_values. */	300	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	301	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	302	/* One has fields, but the other one doesn't. */
299	return 0;	303	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	304	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	305	return 0;
302	}	306	}
…		…
305	{	309	{
306	ob1->optimise ();	310	ob1->optimise ();
307	ob2->optimise ();	311	ob2->optimise ();
308		312
309	if (ob1->self \|\| ob2->self)	313	if (ob1->self \|\| ob2->self)
310	if (!cfperl_can_merge (ob1, ob2))	314	{
		315	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		316	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		317
		318	if (k1 != k2)
311	return 0;	319	return 0;
		320	else if (k1 == 0)
		321	return 1;
		322	else if (!cfperl_can_merge (ob1, ob2))
		323	return 0;
		324	}
312	}	325	}
313		326
314	/* Everything passes, must be OK. */	327	/* Everything passes, must be OK. */
315	return 1;	328	return 1;
316	}	329	}
…		…
374	/*	387	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	388	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	389	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	390	* If it's not a multi-object, it is returned.
378	*/	391	*/
379
380	object *	392	object *
381	get_nearest_part (object op, const object pl)	393	get_nearest_part (object op, const object pl)
382	{	394	{
383	object tmp, closest;	395	object tmp, closest;
384	int last_dist, i;	396	int last_dist, i;
…		…
420	break;	432	break;
421		433
422	return op;	434	return op;
423	}	435	}
424		436
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	437	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	438	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	439	* skill and experience objects.
		440	* ACTUALLY NO! investigate! TODO
434	*/	441	*/
435	void	442	void
436	object::set_owner (object *owner)	443	object::set_owner (object *owner)
437	{	444	{
		445	// allow objects which own objects
438	if (!owner)	446	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)	447	while (owner->owner)
449	owner = owner->owner;	448	owner = owner->owner;
		449
		450	if (flag [FLAG_FREED])
		451	{
		452	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		453	return;
		454	}
450		455
451	this->owner = owner;	456	this->owner = owner;
452	}	457	}
453		458
454	int	459	int
…		…
586	object::copy_to (object *dst)	591	object::copy_to (object *dst)
587	{	592	{
588	dst = this;	593	dst = this;
589		594
590	if (speed < 0)	595	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	596	dst->speed_left -= rndm ();
592		597
593	dst->set_speed (dst->speed);	598	dst->set_speed (dst->speed);
594	}	599	}
595		600
596	void	601	void
597	object::instantiate ()	602	object::instantiate ()
598	{	603	{
599	if (!uuid.seq) // HACK	604	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	605	uuid = UUID::gen ();
601		606
602	speed_left = -0.1f;	607	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	608	/* 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.	609	* 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	610	* by doing so, when a monster is created, it has good starting
…		…
764	static int object_count;	769	static int object_count;
765		770
766	void object::link ()	771	void object::link ()
767	{	772	{
768	assert (!index);//D	773	assert (!index);//D
769	uuid = gen_uuid ();	774	uuid = UUID::gen ();
770	count = ++object_count;	775	count = ++object_count;
771		776
772	refcnt_inc ();	777	refcnt_inc ();
773	objects.insert (this);	778	objects.insert (this);
774	}	779	}
…		…
858	* if some form of movement is allowed, let objects	863	* if some form of movement is allowed, let objects
859	* drop on that space.	864	* drop on that space.
860	*/	865	*/
861	if (!drop_to_ground	866	if (!drop_to_ground
862	\|\| !map	867	\|\| !map
863	\|\| map->in_memory != MAP_IN_MEMORY	868	\|\| map->in_memory != MAP_ACTIVE
864	\|\| map->nodrop	869	\|\| map->nodrop
865	\|\| ms ().move_block == MOVE_ALL)	870	\|\| ms ().move_block == MOVE_ALL)
866	{	871	{
867	while (inv)	872	while (inv)
868	{	873	{
…		…
923		928
924	if (!freed_map)	929	if (!freed_map)
925	{	930	{
926	freed_map = new maptile;	931	freed_map = new maptile;
927		932
		933	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	934	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	935	freed_map->width = 3;
930	freed_map->height = 3;	936	freed_map->height = 3;
		937	freed_map->nodrop = 1;
931		938
932	freed_map->alloc ();	939	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;	940	freed_map->in_memory = MAP_ACTIVE;
934	}	941	}
935		942
936	map = freed_map;	943	map = freed_map;
937	x = 1;	944	x = 1;
938	y = 1;	945	y = 1;
…		…
1147	merge_ob (object op, object top)	1154	merge_ob (object op, object top)
1148	{	1155	{
1149	if (!op->nrof)	1156	if (!op->nrof)
1150	return 0;	1157	return 0;
1151		1158
1152	if (top)	1159	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1160	for (top = op; top && top->above; top = top->above)
1154	;	1161	;
1155		1162
1156	for (; top; top = top->below)	1163	for (; top; top = top->below)
1157	{	1164	{
…		…
1238		1245
1239	object top, floor = NULL;	1246	object top, floor = NULL;
1240		1247
1241	op->remove ();	1248	op->remove ();
1242		1249
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	1250	/* 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	1251	* of areas of callers (eg, anything that uses find_free_spot would now
1264	* need extra work	1252	* need extra work
1265	*/	1253	*/
1266	if (!xy_normalise (m, op->x, op->y))	1254	if (!xy_normalise (m, op->x, op->y))
		1255	{
		1256	op->destroy ();
1267	return 0;	1257	return 0;
		1258	}
		1259
		1260	if (object *more = op->more)
		1261	if (!insert_ob_in_map (more, m, originator, flag))
		1262	return 0;
		1263
		1264	CLEAR_FLAG (op, FLAG_REMOVED);
1268		1265
1269	op->map = m;	1266	op->map = m;
1270	mapspace &ms = op->ms ();	1267	mapspace &ms = op->ms ();
1271		1268
1272	/* this has to be done after we translate the coordinates.	1269	/* this has to be done after we translate the coordinates.
…		…
1307	else	1304	else
1308	{	1305	{
1309	top = ms.bot;	1306	top = ms.bot;
1310		1307
1311	/* If there are other objects, then */	1308	/* If there are other objects, then */
1312	if ((!(flag & INS_MAP_LOAD)) && top)	1309	if (top)
1313	{	1310	{
1314	object *last = 0;	1311	object *last = 0;
1315		1312
1316	/*	1313	/*
1317	* If there are multiple objects on this space, we do some trickier handling.	1314	* If there are multiple objects on this space, we do some trickier handling.
…		…
1369	*/	1366	*/
1370	if (last && last->below && last != floor)	1367	if (last && last->below && last != floor)
1371	top = last->below;	1368	top = last->below;
1372	}	1369	}
1373	} /* If objects on this space */	1370	} /* If objects on this space */
1374	if (flag & INS_MAP_LOAD)
1375	top = ms.top;
1376		1371
1377	if (flag & INS_ABOVE_FLOOR_ONLY)	1372	if (flag & INS_ABOVE_FLOOR_ONLY)
1378	top = floor;	1373	top = floor;
1379		1374
1380	/* Top is the object that our object (op) is going to get inserted above.	1375	/* Top is the object that our object (op) is going to get inserted above.
…		…
1413	op->map->touch ();	1408	op->map->touch ();
1414	}	1409	}
1415		1410
1416	op->map->dirty = true;	1411	op->map->dirty = true;
1417		1412
1418	if (!(flag & INS_MAP_LOAD))
1419	if (object *pl = ms.player ())	1413	if (object *pl = ms.player ())
1420	pl->contr->ns->floorbox_update ();	1414	pl->contr->ns->floorbox_update ();
1421		1415
1422	/* If this object glows, it may affect lighting conditions that are	1416	/* If this object glows, it may affect lighting conditions that are
1423	* visible to others on this map. But update_all_los is really	1417	* 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	1418	* 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	1419	* on the map will get recalculated. The players could very well
…		…
1485	}	1479	}
1486		1480
1487	object *	1481	object *
1488	object::insert_at (object where, object originator, int flags)	1482	object::insert_at (object where, object originator, int flags)
1489	{	1483	{
		1484	if (where->env)
		1485	return where->env->insert (this);
		1486	else
1490	return where->map->insert (this, where->x, where->y, originator, flags);	1487	return where->map->insert (this, where->x, where->y, originator, flags);
1491	}	1488	}
1492		1489
1493	/*	1490	/*
1494	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1495	* is returned contains nr objects, and the remaining parts contains	1492	* is returned contains nr objects, and the remaining parts contains
…		…
1515	orig_ob->destroy (1);	1512	orig_ob->destroy (1);
1516	else if (!is_removed)	1513	else if (!is_removed)
1517	{	1514	{
1518	if (orig_ob->env != NULL)	1515	if (orig_ob->env != NULL)
1519	sub_weight (orig_ob->env, orig_ob->weight * nr);	1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1520	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1517	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1521	{	1518	{
1522	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1519	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1523	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1520	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1524	return NULL;	1521	return NULL;
1525	}	1522	}
…		…
1962	* activate recursively a flag on an object inventory	1959	* activate recursively a flag on an object inventory
1963	*/	1960	*/
1964	void	1961	void
1965	flag_inv (object *op, int flag)	1962	flag_inv (object *op, int flag)
1966	{	1963	{
1967	if (op->inv)
1968	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1964	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1969	{	1965	{
1970	SET_FLAG (tmp, flag);	1966	SET_FLAG (tmp, flag);
1971	flag_inv (tmp, flag);	1967	flag_inv (tmp, flag);
1972	}	1968	}
1973	}	1969	}
1974		1970
1975	/*	1971	/*
1976	* deactivate recursively a flag on an object inventory	1972	* deactivate recursively a flag on an object inventory
1977	*/	1973	*/
1978	void	1974	void
1979	unflag_inv (object *op, int flag)	1975	unflag_inv (object *op, int flag)
1980	{	1976	{
1981	if (op->inv)
1982	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1977	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1983	{	1978	{
1984	CLEAR_FLAG (tmp, flag);	1979	CLEAR_FLAG (tmp, flag);
1985	unflag_inv (tmp, flag);	1980	unflag_inv (tmp, flag);
1986	}	1981	}
1987	}	1982	}
1988		1983
1989	/*	1984	/*
1990	* find_free_spot(object, map, x, y, start, stop) will search for	1985	* find_free_spot(object, map, x, y, start, stop) will search for
1991	* a spot at the given map and coordinates which will be able to contain	1986	* a spot at the given map and coordinates which will be able to contain
…		…
1993	* to search (see the freearr_x/y[] definition).	1988	* to search (see the freearr_x/y[] definition).
1994	* It returns a random choice among the alternatives found.	1989	* It returns a random choice among the alternatives found.
1995	* start and stop are where to start relative to the free_arr array (1,9	1990	* start and stop are where to start relative to the free_arr array (1,9
1996	* does all 4 immediate directions). This returns the index into the	1991	* does all 4 immediate directions). This returns the index into the
1997	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1992	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1998	* Note - this only checks to see if there is space for the head of the
1999	* object - if it is a multispace object, this should be called for all
2000	* pieces.
2001	* Note2: This function does correctly handle tiled maps, but does not	1993	* Note: This function does correctly handle tiled maps, but does not
2002	* inform the caller. However, insert_ob_in_map will update as	1994	* inform the caller. However, insert_ob_in_map will update as
2003	* necessary, so the caller shouldn't need to do any special work.	1995	* necessary, so the caller shouldn't need to do any special work.
2004	* Note - updated to take an object instead of archetype - this is necessary	1996	* Note - updated to take an object instead of archetype - this is necessary
2005	* because arch_blocked (now ob_blocked) needs to know the movement type	1997	* because arch_blocked (now ob_blocked) needs to know the movement type
2006	* to know if the space in question will block the object. We can't use	1998	* to know if the space in question will block the object. We can't use
…		…
2008	* customized, changed states, etc.	2000	* customized, changed states, etc.
2009	*/	2001	*/
2010	int	2002	int
2011	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2003	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2012	{	2004	{
		2005	int altern[SIZEOFFREE];
2013	int index = 0, flag;	2006	int index = 0, flag;
2014	int altern[SIZEOFFREE];
2015		2007
2016	for (int i = start; i < stop; i++)	2008	for (int i = start; i < stop; i++)
2017	{	2009	{
2018	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2010	mapxy pos (m, x, y); pos.move (i);
2019	if (!flag)	2011
		2012	if (!pos.normalise ())
		2013	continue;
		2014
		2015	mapspace &ms = *pos;
		2016
		2017	if (ms.flags () & P_IS_ALIVE)
		2018	continue;
		2019
		2020	/* However, often
		2021	* ob doesn't have any move type (when used to place exits)
		2022	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2023	*/
		2024	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2025	{
2020	altern [index++] = i;	2026	altern [index++] = i;
		2027	continue;
		2028	}
2021		2029
2022	/* Basically, if we find a wall on a space, we cut down the search size.	2030	/* 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.	2031	* 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 -	2032	* 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	2033	* 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	2034	* spaces in all the other directions, this will reduce the search space
2027	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2028	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2029	*/	2037	*/
2030	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2038	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2039	{
2031	stop = maxfree[i];	2040	stop = maxfree[i];
		2041	continue;
		2042	}
		2043
		2044	/* Note it is intentional that we check ob - the movement type of the
		2045	* head of the object should correspond for the entire object.
		2046	*/
		2047	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2048	continue;
		2049
		2050	if (ob->blocked (m, pos.x, pos.y))
		2051	continue;
		2052
		2053	altern [index++] = i;
2032	}	2054	}
2033		2055
2034	if (!index)	2056	if (!index)
2035	return -1;	2057	return -1;
2036		2058
…		…
2045	*/	2067	*/
2046	int	2068	int
2047	find_first_free_spot (const object ob, maptile m, int x, int y)	2069	find_first_free_spot (const object ob, maptile m, int x, int y)
2048	{	2070	{
2049	for (int i = 0; i < SIZEOFFREE; i++)	2071	for (int i = 0; i < SIZEOFFREE; i++)
2050	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2072	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2051	return i;	2073	return i;
2052		2074
2053	return -1;	2075	return -1;
2054	}	2076	}
2055		2077
…		…
2592	{	2614	{
2593	char flagdesc[512];	2615	char flagdesc[512];
2594	char info2[256 * 4];	2616	char info2[256 * 4];
2595	char *p = info;	2617	char *p = info;
2596		2618
2597	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2619	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2598	count, uuid.seq,	2620	count,
		2621	uuid.c_str (),
2599	&name,	2622	&name,
2600	title ? "\",title:\"" : "",	2623	title ? "\",title:\"" : "",
2601	title ? (const char *)title : "",	2624	title ? (const char *)title : "",
2602	flag_desc (flagdesc, 512), type);	2625	flag_desc (flagdesc, 512), type);
2603		2626

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.182 by root, Mon Aug 20 18:11:02 2007 UTC vs. Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.182 by root, Mon Aug 20 18:11:02 2007 UTC vs.
Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC