ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.36 by root, Tue Sep 12 19:20:06 2006 UTC vs.
Revision 1.95 by root, Wed Dec 27 05:42:08 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
37		40
38	object *objects; /* Pointer to the list of used objects */
39	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
40		42
41	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,	43	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,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	45	};
…		…
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	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,	53	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,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	55	};
54		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
55	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	137	{
59	key_value *wants_field;	138	key_value *wants_field;
…		…
62	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
63	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
64	*/	143	*/
65		144
66	/* For each field in wants, */	145	/* For each field in wants, */
67	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
68	{	147	{
69	key_value *has_field;	148	key_value *has_field;
70		149
71	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
72	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
106	*	185	*
107	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
110	*	189	*
111	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
112	*	191	*
113	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
114	* check weight	193	* check weight
115	*/	194	*/
116		195
117	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	197	{
119	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
120	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
121	return 0;	204	return 0;
122		205
123	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
127	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
128	* used to store nrof).	209	* used to store nrof).
129	*/	210	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		222
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		225
145		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
147	* being locked in inventory should prevent merging.
148	* 0x4 in flags3 is CLIENT_SENT
149	*/
150	if ((ob1->arch != ob2->arch) ||
151	(ob1->flags[0] != ob2->flags[0]) ||
152	(ob1->flags[1] != ob2->flags[1]) ||
153	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
175	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
176	return 0;	251	return 0;
177		252
178	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	254	* check all objects in the inventory.
180	*/	255	*/
…		…
183	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	260	return 0;
186		261
187	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	264	return 0;
190		265
191	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
192	* if it is valid.	267	* if it is valid.
193	*/	268	*/
…		…
254	{	329	{
255	if (inv->inv)	330	if (inv->inv)
256	sum_weight (inv);	331	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	333	}
		334
259	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
261	if (op->carrying != sum)	338	if (op->carrying != sum)
262	op->carrying = sum;	339	op->carrying = sum;
		340
263	return sum;	341	return sum;
264	}	342	}
265		343
266	/**	344	/**
267	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
274	op = op->env;	352	op = op->env;
275	return op;	353	return op;
276	}	354	}
277		355
278	/*	356	/*
279	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
280	* a better check. We basically keeping traversing up until we can't
281	* or find a player.
282	*/
283
284	object *
285	is_player_inv (object *op)
286	{
287	for (; op != NULL && op->type != PLAYER; op = op->env)
288	if (op->env == op)
289	op->env = NULL;
290	return op;
291	}
292
293	/*
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	358	* Some error messages.
296	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
297	*/	360	*/
298		361
299	void	362	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object *tmp;*/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	363	dump_object (object *op)
355	{	364	{
356	if (op == NULL)	365	if (!op)
357	{	366	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		367
365	void	368	object_freezer freezer;
366	dump_all_objects (void)	369	save_object (freezer, op, 1);
367	{	370	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	371	}
376		372
377	/*	373	/*
378	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
379	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
399	*/	395	*/
400		396
401	object *	397	object *
402	find_object (tag_t i)	398	find_object (tag_t i)
403	{	399	{
404	object *op;	400	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	401	if (op->count == i)
408	break;	402	return op;
		403
409	return op;	404	return 0;
410	}	405	}
411		406
412	/*	407	/*
413	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
414	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
419	find_object_name (const char *str)	414	find_object_name (const char *str)
420	{	415	{
421	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
422	object *op;	417	object *op;
423		418
424	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
425	if (op->name == str_)	420	if (op->name == str_)
426	break;	421	break;
427		422
428	return op;	423	return op;
429	}	424	}
430		425
431	void	426	void
432	free_all_object_data ()	427	free_all_object_data ()
433	{	428	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}
436
437	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447	object *
448	object::get_owner ()
449	{
450	if (!owner
451	|| QUERY_FLAG (owner, FLAG_FREED)
452	|| QUERY_FLAG (owner, FLAG_REMOVED))
453	owner = 0;
454
455	return owner;
456	}	430	}
457		431
458	/*	432	/*
459	* Sets the owner and sets the skill and exp pointers to owner's current	433	* Sets the owner and sets the skill and exp pointers to owner's current
460	* skill and experience objects.	434	* skill and experience objects.
…		…
493	}	467	}
494		468
495	op->key_values = 0;	469	op->key_values = 0;
496	}	470	}
497		471
498	void object::clear ()
499	{
500	attachable_base::clear ();
501
502	free_key_values (this);
503
504	owner = 0;
505	name = 0;
506	name_pl = 0;
507	title = 0;
508	race = 0;
509	slaying = 0;
510	skill = 0;
511	msg = 0;
512	lore = 0;
513	custom_name = 0;
514	materialname = 0;
515	contr = 0;
516	below = 0;
517	above = 0;
518	inv = 0;
519	container = 0;
520	env = 0;
521	more = 0;
522	head = 0;
523	map = 0;
524	active_next = 0;
525	active_prev = 0;
526
527	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
528
529	SET_FLAG (this, FLAG_REMOVED);
530
531	/* What is not cleared is next, prev, and count */
532
533	expmul = 1.0;
534	face = blank_face;
535	attacked_by_count = -1;
536
537	if (settings.casting_time)
538	casting_time = -1;
539	}
540
541	void object::clone (object *destination)
542	{
543	*(object_copy *)destination = *this;
544	*(object_pod *)destination = *this;
545
546	if (self || cb)
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
548	}
549
550	/*	472	/*
551	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
552	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
553	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
554	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
555	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
556	* will point at garbage.	478	* will point at garbage.
557	*/	479	*/
558	void	480	void
559	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
560	{	482	{
561	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
562	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
563		485
564	op2->clone (op);	486	*(object_copy *)dst = *this;
565		487
566	if (is_freed)	488	if (is_freed)
567	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
568	if (is_removed)	491	if (is_removed)
569	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
570		493
571	if (op2->speed < 0)	494	if (speed < 0)
572	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
573		496
574	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
575	if (op2->key_values)	498	if (key_values)
576	{	499	{
577	key_value *tail = 0;	500	key_value *tail = 0;
578	key_value *i;	501	key_value *i;
579		502
580	op->key_values = 0;	503	dst->key_values = 0;
581		504
582	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
583	{	506	{
584	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
585		508
586	new_link->next = 0;	509	new_link->next = 0;
587	new_link->key = i->key;	510	new_link->key = i->key;
588	new_link->value = i->value;	511	new_link->value = i->value;
589		512
590	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
591	if (!op->key_values)	514	if (!dst->key_values)
592	{	515	{
593	op->key_values = new_link;	516	dst->key_values = new_link;
594	tail = new_link;	517	tail = new_link;
595	}	518	}
596	else	519	else
597	{	520	{
598	tail->next = new_link;	521	tail->next = new_link;
599	tail = new_link;	522	tail = new_link;
600	}	523	}
601	}	524	}
602	}	525	}
603		526
604	update_ob_speed (op);	527	dst->set_speed (dst->speed);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
605	}	536	}
606		537
607	/*	538	/*
608	* If an object with the IS_TURNABLE() flag needs to be turned due	539	* If an object with the IS_TURNABLE() flag needs to be turned due
609	* to the closest player being on the other side, this function can	540	* to the closest player being on the other side, this function can
…		…
623	* Updates the speed of an object. If the speed changes from 0 to another	554	* Updates the speed of an object. If the speed changes from 0 to another
624	* value, or vice versa, then add/remove the object from the active list.	555	* value, or vice versa, then add/remove the object from the active list.
625	* This function needs to be called whenever the speed of an object changes.	556	* This function needs to be called whenever the speed of an object changes.
626	*/	557	*/
627	void	558	void
628	update_ob_speed (object *op)	559	object::set_speed (float speed)
629	{	560	{
630	extern int arch_init;	561	extern int arch_init;
631		562
632	/* No reason putting the archetypes objects on the speed list,	563	/* No reason putting the archetypes objects on the speed list,
633	* since they never really need to be updated.	564	* since they never really need to be updated.
634	*/	565	*/
635		566	if (flag [FLAG_FREED] && speed)
636	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
637	{	567	{
638	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	568	LOG (llevError, "Object %s is freed but has speed.\n", &name);
639	#ifdef MANY_CORES
640	abort ();
641	#else
642	op->speed = 0;	569	speed = 0;
643	#endif
644	}	570	}
		571
		572	this->speed = speed;
645		573
646	if (arch_init)	574	if (arch_init)
647	return;	575	return;
648		576
649	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	577	if (FABS (speed) > MIN_ACTIVE_SPEED)
650	{	578	{
651	/* If already on active list, don't do anything */	579	/* If already on active list, don't do anything */
652	if (op->active_next || op->active_prev || op == active_objects)	580	if (active_next || active_prev || this == active_objects)
653	return;	581	return;
654		582
655	/* process_events() expects us to insert the object at the beginning	583	/* process_events() expects us to insert the object at the beginning
656	* of the list. */	584	* of the list. */
657	op->active_next = active_objects;	585	active_next = active_objects;
658		586
659	if (op->active_next != NULL)	587	if (active_next)
660	op->active_next->active_prev = op;	588	active_next->active_prev = this;
661		589
662	active_objects = op;	590	active_objects = this;
663	}	591	}
664	else	592	else
665	{	593	{
666	/* If not on the active list, nothing needs to be done */	594	/* If not on the active list, nothing needs to be done */
667	if (!op->active_next && !op->active_prev && op != active_objects)	595	if (!active_next && !active_prev && this != active_objects)
668	return;	596	return;
669		597
670	if (op->active_prev == NULL)	598	if (!active_prev)
671	{	599	{
672	active_objects = op->active_next;	600	active_objects = active_next;
673		601
674	if (op->active_next != NULL)	602	if (active_next)
675	op->active_next->active_prev = NULL;	603	active_next->active_prev = 0;
676	}	604	}
677	else	605	else
678	{	606	{
679	op->active_prev->active_next = op->active_next;	607	active_prev->active_next = active_next;
680		608
681	if (op->active_next)	609	if (active_next)
682	op->active_next->active_prev = op->active_prev;	610	active_next->active_prev = active_prev;
683	}	611	}
684		612
685	op->active_next = NULL;	613	active_next = 0;
686	op->active_prev = NULL;	614	active_prev = 0;
687	}	615	}
688	}	616	}
689		617
690	/* This function removes object 'op' from the list of active	618	/* This function removes object 'op' from the list of active
691	* objects.	619	* objects.
…		…
717	op->active_next = NULL;	645	op->active_next = NULL;
718	op->active_prev = NULL;	646	op->active_prev = NULL;
719	}	647	}
720		648
721	/*	649	/*
722	* update_object() updates the array which represents the map.	650	* update_object() updates the the map.
723	* It takes into account invisible objects (and represent squares covered	651	* It takes into account invisible objects (and represent squares covered
724	* by invisible objects by whatever is below them (unless it's another	652	* by invisible objects by whatever is below them (unless it's another
725	* invisible object, etc...)	653	* invisible object, etc...)
726	* If the object being updated is beneath a player, the look-window	654	* If the object being updated is beneath a player, the look-window
727	* of that player is updated (this might be a suboptimal way of	655	* of that player is updated (this might be a suboptimal way of
728	* updating that window, though, since update_object() is called _often_)	656	* updating that window, though, since update_object() is called _often_)
729	*	657	*
730	* action is a hint of what the caller believes need to be done.	658	* action is a hint of what the caller believes need to be done.
731	* For example, if the only thing that has changed is the face (due to
732	* an animation), we don't need to call update_position until that actually
733	* comes into view of a player. OTOH, many other things, like addition/removal
734	* of walls or living creatures may need us to update the flags now.
735	* current action are:	659	* current action are:
736	* UP_OBJ_INSERT: op was inserted	660	* UP_OBJ_INSERT: op was inserted
737	* UP_OBJ_REMOVE: op was removed	661	* UP_OBJ_REMOVE: op was removed
738	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	662	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
739	* as that is easier than trying to look at what may have changed.	663	* as that is easier than trying to look at what may have changed.
740	* UP_OBJ_FACE: only the objects face has changed.	664	* UP_OBJ_FACE: only the objects face has changed.
741	*/	665	*/
742
743	void	666	void
744	update_object (object *op, int action)	667	update_object (object *op, int action)
745	{	668	{
746	int update_now = 0, flags;
747	MoveType move_on, move_off, move_block, move_slow;	669	MoveType move_on, move_off, move_block, move_slow;
748		670
749	if (op == NULL)	671	if (op == NULL)
750	{	672	{
751	/* this should never happen */	673	/* this should never happen */
752	LOG (llevDebug, "update_object() called for NULL object.\n");	674	LOG (llevDebug, "update_object() called for NULL object.\n");
753	return;	675	return;
754	}	676	}
755		677
756	if (op->env != NULL)	678	if (op->env)
757	{	679	{
758	/* Animation is currently handled by client, so nothing	680	/* Animation is currently handled by client, so nothing
759	* to do in this case.	681	* to do in this case.
760	*/	682	*/
761	return;	683	return;
…		…
766	*/	688	*/
767	if (!op->map || op->map->in_memory == MAP_SAVING)	689	if (!op->map || op->map->in_memory == MAP_SAVING)
768	return;	690	return;
769		691
770	/* make sure the object is within map boundaries */	692	/* make sure the object is within map boundaries */
771	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	693	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
772	{	694	{
773	LOG (llevError, "update_object() called for object out of map!\n");	695	LOG (llevError, "update_object() called for object out of map!\n");
774	#ifdef MANY_CORES	696	#ifdef MANY_CORES
775	abort ();	697	abort ();
776	#endif	698	#endif
777	return;	699	return;
778	}	700	}
779		701
780	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	702	mapspace &m = op->ms ();
781	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
782	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
783	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
784	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
785	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
786		703
		704	if (m.flags_ & P_NEED_UPDATE)
		705	/* nop */;
787	if (action == UP_OBJ_INSERT)	706	else if (action == UP_OBJ_INSERT)
788	{	707	{
		708	// this is likely overkill, TODO: revisit (schmorp)
789	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
790	update_now = 1;
791
792	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	710	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
793	update_now = 1;	711	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
794		712	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		713	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
795	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	714	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
796	update_now = 1;
797
798	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
799	update_now = 1;
800
801	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
802	update_now = 1;
803
804	if ((move_on | op->move_on) != move_on)	715	|| (m.move_on | op->move_on ) != m.move_on
805	update_now = 1;
806
807	if ((move_off | op->move_off) != move_off)	716	|| (m.move_off | op->move_off ) != m.move_off
808	update_now = 1;	717	|| (m.move_slow | op->move_slow) != m.move_slow
809
810	/* This isn't perfect, but I don't expect a lot of objects to	718	/* This isn't perfect, but I don't expect a lot of objects to
811	* to have move_allow right now.	719	* to have move_allow right now.
812	*/	720	*/
813	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
814	update_now = 1;	722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
815		723	m.flags_ = P_NEED_UPDATE;
816	if ((move_slow | op->move_slow) != move_slow)
817	update_now = 1;
818	}	724	}
819	/* if the object is being removed, we can't make intelligent	725	/* if the object is being removed, we can't make intelligent
820	* decisions, because remove_ob can't really pass the object	726	* decisions, because remove_ob can't really pass the object
821	* that is being removed.	727	* that is being removed.
822	*/	728	*/
823	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
824	update_now = 1;	730	m.flags_ = P_NEED_UPDATE;
825	else if (action == UP_OBJ_FACE)	731	else if (action == UP_OBJ_FACE)
826	/* Nothing to do for that case */ ;	732	/* Nothing to do for that case */ ;
827	else	733	else
828	LOG (llevError, "update_object called with invalid action: %d\n", action);	734	LOG (llevError, "update_object called with invalid action: %d\n", action);
829		735
830	if (update_now)
831	{
832	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
833	update_position (op->map, op->x, op->y);
834	}
835
836	if (op->more != NULL)	736	if (op->more)
837	update_object (op->more, action);	737	update_object (op->more, action);
838	}	738	}
839		739
840	static unordered_vector<object *> mortals;	740	object::vector object::objects; // not yet used
841	static std::vector<object *> freed;	741	object *object::first;
842
843	void object::free_mortals ()
844	{
845	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
846	if ((*i)->refcnt)
847	++i; // further delay freeing
848	else
849	{
850	freed.push_back (*i);//D
851	//delete *i;
852	mortals.erase (i);
853	}
854
855	if (mortals.size() && 0)//D
856	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
857	}
858		742
859	object::object ()	743	object::object ()
860	{	744	{
861	SET_FLAG (this, FLAG_REMOVED);	745	SET_FLAG (this, FLAG_REMOVED);
862		746
863	expmul = 1.0;	747	expmul = 1.0;
864	face = blank_face;	748	face = blank_face;
865	attacked_by_count = -1;
866	}	749	}
867		750
868	object::~object ()	751	object::~object ()
869	{	752	{
870	free_key_values (this);	753	free_key_values (this);
871	}	754	}
872		755
873	void object::link ()	756	void object::link ()
874	{	757	{
875	count = ++ob_count;	758	count = ++ob_count;
		759	uuid = gen_uuid ();
876		760
877	prev = 0;	761	prev = 0;
878	next = objects;	762	next = object::first;
879		763
880	if (objects)	764	if (object::first)
881	objects->prev = this;	765	object::first->prev = this;
882		766
883	objects = this;	767	object::first = this;
884	}	768	}
885		769
886	void object::unlink ()	770	void object::unlink ()
887	{	771	{
888	count = 0;	772	if (this == object::first)
		773	object::first = next;
889		774
890	/* Remove this object from the list of used objects */	775	/* Remove this object from the list of used objects */
891	if (prev)
892	{
893	prev->next = next;	776	if (prev) prev->next = next;
		777	if (next) next->prev = prev;
		778
894	prev = 0;	779	prev = 0;
895	}
896
897	if (next)
898	{
899	next->prev = prev;
900	next = 0;	780	next = 0;
		781	}
		782
		783	/*
		784	* Remove and free all objects in the inventory of the given object.
		785	* object.c ?
		786	*/
		787	void
		788	object::destroy_inv (bool drop_to_ground)
		789	{
		790	// need to check first, because the checks below might segfault
		791	// as we might be on an invalid mapspace and crossfire code
		792	// is too buggy to ensure that the inventory is empty.
		793	// corollary: if you create arrows etc. with stuff in tis inventory,
		794	// cf will crash below with off-map x and y
		795	if (!inv)
		796	return;
		797
		798	/* Only if the space blocks everything do we not process -
		799	* if some form of movement is allowed, let objects
		800	* drop on that space.
		801	*/
		802	if (!drop_to_ground
		803	|| !map
		804	|| map->in_memory != MAP_IN_MEMORY
		805	|| ms ().move_block == MOVE_ALL)
901	}	806	{
		807	while (inv)
		808	{
		809	inv->destroy_inv (drop_to_ground);
		810	inv->destroy ();
		811	}
		812	}
		813	else
		814	{ /* Put objects in inventory onto this space */
		815	while (inv)
		816	{
		817	object *op = inv;
902		818
903	if (this == objects)	819	if (op->flag [FLAG_STARTEQUIP]
904	objects = next;	820	|| op->flag [FLAG_NO_DROP]
		821	|| op->type == RUNE
		822	|| op->type == TRAP
		823	|| op->flag [FLAG_IS_A_TEMPLATE])
		824	op->destroy ();
		825	else
		826	map->insert (op, x, y);
		827	}
		828	}
905	}	829	}
906		830
907	object *object::create ()	831	object *object::create ()
908	{	832	{
909	object *op;
910
911	if (freed.empty ())
912	op = new object;	833	object *op = new object;
913	else
914	{
915	// highly annoying, but the only way to get it stable right now
916	op = freed.back ();
917	freed.pop_back ();
918	op->~object ();
919	new ((void *) op) object;
920	}
921
922	op->link ();	834	op->link ();
923	return op;	835	return op;
924	}	836	}
925		837
926	/*	838	void
927	* free_object() frees everything allocated by an object, removes	839	object::do_destroy ()
928	* it from the list of used objects, and puts it on the list of
929	* free objects. The IS_FREED() flag is set in the object.
930	* The object must have been removed by remove_ob() first for
931	* this function to succeed.
932	*
933	* If free_inventory is set, free inventory as well. Else drop items in
934	* inventory to the ground.
935	*/
936	void object::free (bool free_inventory)
937	{	840	{
938	if (QUERY_FLAG (this, FLAG_FREED))	841	if (flag [FLAG_IS_LINKED])
		842	remove_button_link (this);
		843
		844	if (flag [FLAG_FRIENDLY])
		845	remove_friendly_object (this);
		846
		847	if (!flag [FLAG_REMOVED])
		848	remove ();
		849
		850	if (flag [FLAG_FREED])
939	return;	851	return;
940		852
941	if (QUERY_FLAG (this, FLAG_FRIENDLY))	853	set_speed (0);
942	remove_friendly_object (this);
943		854
944	if (!QUERY_FLAG (this, FLAG_REMOVED))	855	flag [FLAG_FREED] = 1;
945	remove_ob (this);
946		856
947	SET_FLAG (this, FLAG_FREED);	857	attachable::do_destroy ();
		858
		859	destroy_inv (true);
		860	unlink ();
		861
		862	// hack to ensure that freed objects still have a valid map
		863	{
		864	static maptile *freed_map; // freed objects are moved here to avoid crashes
		865
		866	if (!freed_map)
		867	{
		868	freed_map = new maptile;
		869
		870	freed_map->name = "/internal/freed_objects_map";
		871	freed_map->width = 3;
		872	freed_map->height = 3;
		873
		874	freed_map->allocate ();
		875	}
		876
		877	map = freed_map;
		878	x = 1;
		879	y = 1;
		880	}
		881
		882	head = 0;
948		883
949	if (more)	884	if (more)
950	{	885	{
951	more->free (free_inventory);	886	more->destroy ();
952	more = 0;	887	more = 0;
953	}	888	}
954		889
955	if (inv)	890	// clear those pointers that likely might have circular references to us
956	{
957	/* Only if the space blocks everything do we not process -
958	* if some form of movement is allowed, let objects
959	* drop on that space.
960	*/
961	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
962	{
963	object *op = inv;
964
965	while (op)
966	{
967	object *tmp = op->below;
968	op->free (free_inventory);
969	op = tmp;
970	}
971	}
972	else
973	{ /* Put objects in inventory onto this space */
974	object *op = inv;
975
976	while (op)
977	{
978	object *tmp = op->below;
979
980	remove_ob (op);
981
982	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
983	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
984	free_object (op);
985	else
986	{
987	op->x = x;
988	op->y = y;
989	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
990	}
991
992	op = tmp;
993	}
994	}
995	}
996
997	owner = 0;	891	owner = 0;
		892	enemy = 0;
		893	attacked_by = 0;
998		894
999	/* Remove object from the active list */	895	// only relevant for players(?), but make sure of it anyways
1000	speed = 0;	896	contr = 0;
1001	update_ob_speed (this);	897	}
1002		898
1003	unlink ();	899	void
		900	object::destroy (bool destroy_inventory)
		901	{
		902	if (destroyed ())
		903	return;
1004		904
1005	mortals.push_back (this);	905	if (destroy_inventory)
		906	destroy_inv (false);
		907
		908	attachable::destroy ();
1006	}	909	}
1007		910
1008	/*	911	/*
1009	* sub_weight() recursively (outwards) subtracts a number from the	912	* sub_weight() recursively (outwards) subtracts a number from the
1010	* weight of an object (and what is carried by it's environment(s)).	913	* weight of an object (and what is carried by it's environment(s)).
1011	*/	914	*/
1012
1013	void	915	void
1014	sub_weight (object *op, signed long weight)	916	sub_weight (object *op, signed long weight)
1015	{	917	{
1016	while (op != NULL)	918	while (op != NULL)
1017	{	919	{
1018	if (op->type == CONTAINER)	920	if (op->type == CONTAINER)
1019	{
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	921	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021	}	922
1022	op->carrying -= weight;	923	op->carrying -= weight;
1023	op = op->env;	924	op = op->env;
1024	}	925	}
1025	}	926	}
1026		927
1027	/* remove_ob(op):	928	/* op->remove ():
1028	* This function removes the object op from the linked list of objects	929	* This function removes the object op from the linked list of objects
1029	* which it is currently tied to. When this function is done, the	930	* which it is currently tied to. When this function is done, the
1030	* object will have no environment. If the object previously had an	931	* object will have no environment. If the object previously had an
1031	* environment, the x and y coordinates will be updated to	932	* environment, the x and y coordinates will be updated to
1032	* the previous environment.	933	* the previous environment.
1033	* Beware: This function is called from the editor as well!	934	* Beware: This function is called from the editor as well!
1034	*/	935	*/
1035
1036	void	936	void
1037	remove_ob (object *op)	937	object::remove ()
1038	{	938	{
		939	object *tmp, *last = 0;
1039	object *	940	object *otmp;
1040	tmp, *
1041	last = NULL;
1042	object *
1043	otmp;
1044		941
1045	tag_t
1046	tag;
1047	int
1048	check_walk_off;
1049	mapstruct *
1050	m;
1051
1052	sint16
1053	x,
1054	y;
1055
1056	if (QUERY_FLAG (op, FLAG_REMOVED))	942	if (QUERY_FLAG (this, FLAG_REMOVED))
1057	return;	943	return;
1058		944
1059	SET_FLAG (op, FLAG_REMOVED);	945	SET_FLAG (this, FLAG_REMOVED);
		946	INVOKE_OBJECT (REMOVE, this);
1060		947
1061	if (op->more != NULL)	948	if (more)
1062	remove_ob (op->more);	949	more->remove ();
1063		950
1064	/*	951	/*
1065	* In this case, the object to be removed is in someones	952	* In this case, the object to be removed is in someones
1066	* inventory.	953	* inventory.
1067	*/	954	*/
1068	if (op->env != NULL)	955	if (env)
1069	{	956	{
1070	if (op->nrof)	957	if (nrof)
1071	sub_weight (op->env, op->weight * op->nrof);	958	sub_weight (env, weight * nrof);
1072	else	959	else
1073	sub_weight (op->env, op->weight + op->carrying);	960	sub_weight (env, weight + carrying);
1074		961
1075	/* NO_FIX_PLAYER is set when a great many changes are being	962	/* NO_FIX_PLAYER is set when a great many changes are being
1076	* made to players inventory. If set, avoiding the call	963	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	964	* to save cpu time.
1078	*/	965	*/
1079	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1080	fix_player (otmp);	967	otmp->update_stats ();
1081		968
1082	if (op->above != NULL)	969	if (above != NULL)
1083	op->above->below = op->below;	970	above->below = below;
1084	else	971	else
1085	op->env->inv = op->below;	972	env->inv = below;
1086		973
1087	if (op->below != NULL)	974	if (below != NULL)
1088	op->below->above = op->above;	975	below->above = above;
1089		976
1090	/* we set up values so that it could be inserted into	977	/* we set up values so that it could be inserted into
1091	* the map, but we don't actually do that - it is up	978	* the map, but we don't actually do that - it is up
1092	* to the caller to decide what we want to do.	979	* to the caller to decide what we want to do.
1093	*/	980	*/
1094	op->x = op->env->x, op->y = op->env->y;	981	x = env->x, y = env->y;
1095	op->map = op->env->map;	982	map = env->map;
1096	op->above = NULL, op->below = NULL;	983	above = 0, below = 0;
1097	op->env = NULL;	984	env = 0;
1098	}	985	}
1099	else if (op->map)	986	else if (map)
1100	{	987	{
1101	x = op->x;
1102	y = op->y;
1103	m = get_map_from_coord (op->map, &x, &y);
1104
1105	if (!m)
1106	{
1107	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1108	op->map->path, op->x, op->y);
1109	/* in old days, we used to set x and y to 0 and continue.
1110	* it seems if we get into this case, something is probablye
1111	* screwed up and should be fixed.
1112	*/
1113	abort ();
1114	}
1115
1116	if (op->map != m)
1117	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1118	op->map->path, m->path, op->x, op->y, x, y);
1119
1120	/* Re did the following section of code - it looks like it had	988	/* Re did the following section of code - it looks like it had
1121	* lots of logic for things we no longer care about	989	* lots of logic for things we no longer care about
1122	*/	990	*/
1123		991
1124	/* link the object above us */	992	/* link the object above us */
1125	if (op->above)	993	if (above)
1126	op->above->below = op->below;	994	above->below = below;
1127	else	995	else
1128	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	996	map->at (x, y).top = below; /* we were top, set new top */
1129		997
1130	/* Relink the object below us, if there is one */	998	/* Relink the object below us, if there is one */
1131	if (op->below)	999	if (below)
1132	op->below->above = op->above;	1000	below->above = above;
1133	else	1001	else
1134	{	1002	{
1135	/* Nothing below, which means we need to relink map object for this space	1003	/* Nothing below, which means we need to relink map object for this space
1136	* use translated coordinates in case some oddness with map tiling is	1004	* use translated coordinates in case some oddness with map tiling is
1137	* evident	1005	* evident
1138	*/	1006	*/
1139	if (GET_MAP_OB (m, x, y) != op)	1007	if (GET_MAP_OB (map, x, y) != this)
1140	{	1008	{
1141	dump_object (op);	1009	char *dump = dump_object (this);
1142	LOG (llevError,	1010	LOG (llevError,
1143	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1011	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1012	free (dump);
1144	dump_object (GET_MAP_OB (m, x, y));	1013	dump = dump_object (GET_MAP_OB (map, x, y));
1145	LOG (llevError, "%s\n", errmsg);	1014	LOG (llevError, "%s\n", dump);
		1015	free (dump);
1146	}	1016	}
1147		1017
1148	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1018	map->at (x, y).bot = above; /* goes on above it. */
1149	}	1019	}
1150		1020
1151	op->above = 0;	1021	above = 0;
1152	op->below = 0;	1022	below = 0;
1153		1023
1154	if (op->map->in_memory == MAP_SAVING)	1024	if (map->in_memory == MAP_SAVING)
1155	return;	1025	return;
1156		1026
1157	tag = op->count;	1027	int check_walk_off = !flag [FLAG_NO_APPLY];
1158	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1159		1028
1160	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1029	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1161	{	1030	{
1162	/* No point updating the players look faces if he is the object	1031	/* No point updating the players look faces if he is the object
1163	* being removed.	1032	* being removed.
1164	*/	1033	*/
1165		1034
1166	if (tmp->type == PLAYER && tmp != op)	1035	if (tmp->type == PLAYER && tmp != this)
1167	{	1036	{
1168	/* If a container that the player is currently using somehow gets	1037	/* If a container that the player is currently using somehow gets
1169	* removed (most likely destroyed), update the player view	1038	* removed (most likely destroyed), update the player view
1170	* appropriately.	1039	* appropriately.
1171	*/	1040	*/
1172	if (tmp->container == op)	1041	if (tmp->container == this)
1173	{	1042	{
1174	CLEAR_FLAG (op, FLAG_APPLIED);	1043	flag [FLAG_APPLIED] = 0;
1175	tmp->container = NULL;	1044	tmp->container = 0;
1176	}	1045	}
1177		1046
1178	tmp->contr->socket.update_look = 1;	1047	if (tmp->contr->ns)
		1048	tmp->contr->ns->floorbox_update ();
1179	}	1049	}
1180		1050
1181	/* See if player moving off should effect something */	1051	/* See if player moving off should effect something */
1182	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1052	if (check_walk_off
		1053	&& ((move_type & tmp->move_off)
		1054	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1183	{	1055	{
1184	move_apply (tmp, op, NULL);	1056	move_apply (tmp, this, 0);
1185		1057
1186	if (was_destroyed (op, tag))	1058	if (destroyed ())
1187	{
1188	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1059	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1189	}
1190	}	1060	}
1191		1061
1192	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1062	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1193		1063
1194	if (tmp->above == tmp)	1064	if (tmp->above == tmp)
1195	tmp->above = NULL;	1065	tmp->above = 0;
1196		1066
1197	last = tmp;	1067	last = tmp;
1198	}	1068	}
1199		1069
1200	/* last == NULL of there are no objects on this space */	1070	/* last == NULL of there are no objects on this space */
1201	if (last == NULL)	1071	if (!last)
1202	{	1072	map->at (x, y).flags_ = P_NEED_UPDATE;
1203	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1204	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1205	* those out anyways, and if there are any flags set right now, they won't
1206	* be correct anyways.
1207	*/
1208	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1209	update_position (op->map, op->x, op->y);
1210	}
1211	else	1073	else
1212	update_object (last, UP_OBJ_REMOVE);	1074	update_object (last, UP_OBJ_REMOVE);
1213		1075
1214	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1076	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1215	update_all_los (op->map, op->x, op->y);	1077	update_all_los (map, x, y);
1216	}	1078	}
1217	}	1079	}
1218		1080
1219	/*	1081	/*
1220	* merge_ob(op,top):	1082	* merge_ob(op,top):
…		…
1222	* This function goes through all objects below and including top, and	1084	* This function goes through all objects below and including top, and
1223	* merges op to the first matching object.	1085	* merges op to the first matching object.
1224	* If top is NULL, it is calculated.	1086	* If top is NULL, it is calculated.
1225	* Returns pointer to object if it succeded in the merge, otherwise NULL	1087	* Returns pointer to object if it succeded in the merge, otherwise NULL
1226	*/	1088	*/
1227
1228	object *	1089	object *
1229	merge_ob (object *op, object *top)	1090	merge_ob (object *op, object *top)
1230	{	1091	{
1231	if (!op->nrof)	1092	if (!op->nrof)
1232	return 0;	1093	return 0;
1233		1094
1234	if (top == NULL)	1095	if (top)
1235	for (top = op; top != NULL && top->above != NULL; top = top->above);	1096	for (top = op; top && top->above; top = top->above)
		1097	;
1236		1098
1237	for (; top != NULL; top = top->below)	1099	for (; top; top = top->below)
1238	{	1100	{
1239	if (top == op)	1101	if (top == op)
1240	continue;	1102	continue;
1241	if (CAN_MERGE (op, top))	1103
		1104	if (object::can_merge (op, top))
1242	{	1105	{
1243	top->nrof += op->nrof;	1106	top->nrof += op->nrof;
1244		1107
1245	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1108	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1246	op->weight = 0; /* Don't want any adjustements now */	1109	op->weight = 0; /* Don't want any adjustements now */
1247	remove_ob (op);	1110	op->destroy ();
1248	free_object (op);
1249	return top;	1111	return top;
1250	}	1112	}
1251	}	1113	}
1252		1114
1253	return NULL;	1115	return 0;
1254	}	1116	}
1255		1117
1256	/*	1118	/*
1257	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1119	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1258	* job preparing multi-part monsters	1120	* job preparing multi-part monsters
1259	*/	1121	*/
1260	object *	1122	object *
1261	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1262	{	1124	{
1263	object *tmp;
1264
1265	if (op->head)
1266	op = op->head;
1267
1268	for (tmp = op; tmp; tmp = tmp->more)	1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1269	{	1126	{
1270	tmp->x = x + tmp->arch->clone.x;	1127	tmp->x = x + tmp->arch->clone.x;
1271	tmp->y = y + tmp->arch->clone.y;	1128	tmp->y = y + tmp->arch->clone.y;
1272	}	1129	}
1273		1130
…		…
1292	* Return value:	1149	* Return value:
1293	* new object if 'op' was merged with other object	1150	* new object if 'op' was merged with other object
1294	* NULL if 'op' was destroyed	1151	* NULL if 'op' was destroyed
1295	* just 'op' otherwise	1152	* just 'op' otherwise
1296	*/	1153	*/
1297
1298	object *	1154	object *
1299	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1155	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1300	{	1156	{
1301	object *tmp, *top, *floor = NULL;	1157	object *tmp, *top, *floor = NULL;
1302	sint16 x, y;	1158	sint16 x, y;
1303		1159
1304	if (QUERY_FLAG (op, FLAG_FREED))	1160	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1307	return NULL;	1163	return NULL;
1308	}	1164	}
1309		1165
1310	if (m == NULL)	1166	if (m == NULL)
1311	{	1167	{
1312	dump_object (op);	1168	char *dump = dump_object (op);
1313	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1169	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1170	free (dump);
1314	return op;	1171	return op;
1315	}	1172	}
1316		1173
1317	if (out_of_map (m, op->x, op->y))	1174	if (out_of_map (m, op->x, op->y))
1318	{	1175	{
1319	dump_object (op);	1176	char *dump = dump_object (op);
1320	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1177	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1321	#ifdef MANY_CORES	1178	#ifdef MANY_CORES
1322	/* Better to catch this here, as otherwise the next use of this object	1179	/* Better to catch this here, as otherwise the next use of this object
1323	* is likely to cause a crash. Better to find out where it is getting	1180	* is likely to cause a crash. Better to find out where it is getting
1324	* improperly inserted.	1181	* improperly inserted.
1325	*/	1182	*/
1326	abort ();	1183	abort ();
1327	#endif	1184	#endif
		1185	free (dump);
1328	return op;	1186	return op;
1329	}	1187	}
1330		1188
1331	if (!QUERY_FLAG (op, FLAG_REMOVED))	1189	if (!QUERY_FLAG (op, FLAG_REMOVED))
1332	{	1190	{
1333	dump_object (op);	1191	char *dump = dump_object (op);
1334	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1192	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1193	free (dump);
1335	return op;	1194	return op;
1336	}	1195	}
1337		1196
1338	if (op->more != NULL)	1197	if (op->more)
1339	{	1198	{
1340	/* The part may be on a different map. */	1199	/* The part may be on a different map. */
1341		1200
1342	object *more = op->more;	1201	object *more = op->more;
1343		1202
…		…
1359	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1218	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1360	{	1219	{
1361	if (!op->head)	1220	if (!op->head)
1362	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1221	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1363		1222
1364	return NULL;	1223	return 0;
1365	}	1224	}
1366	}	1225	}
1367		1226
1368	CLEAR_FLAG (op, FLAG_REMOVED);	1227	CLEAR_FLAG (op, FLAG_REMOVED);
1369		1228
…		…
1377		1236
1378	/* this has to be done after we translate the coordinates.	1237	/* this has to be done after we translate the coordinates.
1379	*/	1238	*/
1380	if (op->nrof && !(flag & INS_NO_MERGE))	1239	if (op->nrof && !(flag & INS_NO_MERGE))
1381	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1240	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1382	if (CAN_MERGE (op, tmp))	1241	if (object::can_merge (op, tmp))
1383	{	1242	{
1384	op->nrof += tmp->nrof;	1243	op->nrof += tmp->nrof;
1385	remove_ob (tmp);	1244	tmp->destroy ();
1386	free_object (tmp);
1387	}	1245	}
1388		1246
1389	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1247	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1390	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1248	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1391		1249
…		…
1404	op->below = originator->below;	1262	op->below = originator->below;
1405		1263
1406	if (op->below)	1264	if (op->below)
1407	op->below->above = op;	1265	op->below->above = op;
1408	else	1266	else
1409	SET_MAP_OB (op->map, op->x, op->y, op);	1267	op->ms ().bot = op;
1410		1268
1411	/* since *below* originator, no need to update top */	1269	/* since *below* originator, no need to update top */
1412	originator->below = op;	1270	originator->below = op;
1413	}	1271	}
1414	else	1272	else
…		…
1460	* If INS_ON_TOP is used, don't do this processing	1318	* If INS_ON_TOP is used, don't do this processing
1461	* Need to find the object that in fact blocks view, otherwise	1319	* Need to find the object that in fact blocks view, otherwise
1462	* stacking is a bit odd.	1320	* stacking is a bit odd.
1463	*/	1321	*/
1464	if (!(flag & INS_ON_TOP) &&	1322	if (!(flag & INS_ON_TOP) &&
1465	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1323	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1466	{	1324	{
1467	for (last = top; last != floor; last = last->below)	1325	for (last = top; last != floor; last = last->below)
1468	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1326	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1469	break;	1327	break;
1470	/* Check to see if we found the object that blocks view,	1328	/* Check to see if we found the object that blocks view,
…		…
1493		1351
1494	if (op->above)	1352	if (op->above)
1495	op->above->below = op;	1353	op->above->below = op;
1496		1354
1497	op->below = NULL;	1355	op->below = NULL;
1498	SET_MAP_OB (op->map, op->x, op->y, op);	1356	op->ms ().bot = op;
1499	}	1357	}
1500	else	1358	else
1501	{ /* get inserted into the stack above top */	1359	{ /* get inserted into the stack above top */
1502	op->above = top->above;	1360	op->above = top->above;
1503		1361
…		…
1507	op->below = top;	1365	op->below = top;
1508	top->above = op;	1366	top->above = op;
1509	}	1367	}
1510		1368
1511	if (op->above == NULL)	1369	if (op->above == NULL)
1512	SET_MAP_TOP (op->map, op->x, op->y, op);	1370	op->ms ().top = op;
1513	} /* else not INS_BELOW_ORIGINATOR */	1371	} /* else not INS_BELOW_ORIGINATOR */
1514		1372
1515	if (op->type == PLAYER)	1373	if (op->type == PLAYER)
1516	op->contr->do_los = 1;	1374	op->contr->do_los = 1;
1517		1375
1518	/* If we have a floor, we know the player, if any, will be above	1376	/* If we have a floor, we know the player, if any, will be above
1519	* it, so save a few ticks and start from there.	1377	* it, so save a few ticks and start from there.
1520	*/	1378	*/
1521	if (!(flag & INS_MAP_LOAD))	1379	if (!(flag & INS_MAP_LOAD))
1522	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1380	if (object *pl = op->ms ().player ())
1523	if (tmp->type == PLAYER)	1381	if (pl->contr->ns)
1524	tmp->contr->socket.update_look = 1;	1382	pl->contr->ns->floorbox_update ();
1525		1383
1526	/* If this object glows, it may affect lighting conditions that are	1384	/* If this object glows, it may affect lighting conditions that are
1527	* visible to others on this map. But update_all_los is really	1385	* visible to others on this map. But update_all_los is really
1528	* an inefficient way to do this, as it means los for all players	1386	* an inefficient way to do this, as it means los for all players
1529	* on the map will get recalculated. The players could very well	1387	* on the map will get recalculated. The players could very well
1530	* be far away from this change and not affected in any way -	1388	* be far away from this change and not affected in any way -
1531	* this should get redone to only look for players within range,	1389	* this should get redone to only look for players within range,
1532	* or just updating the P_NEED_UPDATE for spaces within this area	1390	* or just updating the P_NEED_UPDATE for spaces within this area
1533	* of effect may be sufficient.	1391	* of effect may be sufficient.
1534	*/	1392	*/
1535	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1393	if (op->map->darkness && (op->glow_radius != 0))
1536	update_all_los (op->map, op->x, op->y);	1394	update_all_los (op->map, op->x, op->y);
1537		1395
1538	/* updates flags (blocked, alive, no magic, etc) for this map space */	1396	/* updates flags (blocked, alive, no magic, etc) for this map space */
1539	update_object (op, UP_OBJ_INSERT);	1397	update_object (op, UP_OBJ_INSERT);
1540		1398
		1399	INVOKE_OBJECT (INSERT, op);
		1400
1541	/* Don't know if moving this to the end will break anything. However,	1401	/* Don't know if moving this to the end will break anything. However,
1542	* we want to have update_look set above before calling this.	1402	* we want to have floorbox_update called before calling this.
1543	*	1403	*
1544	* check_move_on() must be after this because code called from	1404	* check_move_on() must be after this because code called from
1545	* check_move_on() depends on correct map flags (so functions like	1405	* check_move_on() depends on correct map flags (so functions like
1546	* blocked() and wall() work properly), and these flags are updated by	1406	* blocked() and wall() work properly), and these flags are updated by
1547	* update_object().	1407	* update_object().
…		…
1549		1409
1550	/* if this is not the head or flag has been passed, don't check walk on status */	1410	/* if this is not the head or flag has been passed, don't check walk on status */
1551	if (!(flag & INS_NO_WALK_ON) && !op->head)	1411	if (!(flag & INS_NO_WALK_ON) && !op->head)
1552	{	1412	{
1553	if (check_move_on (op, originator))	1413	if (check_move_on (op, originator))
1554	return NULL;	1414	return 0;
1555		1415
1556	/* If we are a multi part object, lets work our way through the check	1416	/* If we are a multi part object, lets work our way through the check
1557	* walk on's.	1417	* walk on's.
1558	*/	1418	*/
1559	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1419	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1560	if (check_move_on (tmp, originator))	1420	if (check_move_on (tmp, originator))
1561	return NULL;	1421	return 0;
1562	}	1422	}
1563		1423
1564	return op;	1424	return op;
1565	}	1425	}
1566		1426
1567	/* this function inserts an object in the map, but if it	1427	/* this function inserts an object in the map, but if it
1568	* finds an object of its own type, it'll remove that one first.	1428	* finds an object of its own type, it'll remove that one first.
1569	* op is the object to insert it under: supplies x and the map.	1429	* op is the object to insert it under: supplies x and the map.
1570	*/	1430	*/
1571	void	1431	void
1572	replace_insert_ob_in_map (const char *arch_string, object *op)	1432	replace_insert_ob_in_map (const char *arch_string, object *op)
1573	{	1433	{
1574	object *	1434	object *tmp, *tmp1;
1575	tmp;
1576	object *
1577	tmp1;
1578		1435
1579	/* first search for itself and remove any old instances */	1436	/* first search for itself and remove any old instances */
1580		1437
1581	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1438	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1582	{
1583	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1439	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1584	{	1440	tmp->destroy ();
1585	remove_ob (tmp);
1586	free_object (tmp);
1587	}
1588	}
1589		1441
1590	tmp1 = arch_to_object (find_archetype (arch_string));	1442	tmp1 = arch_to_object (archetype::find (arch_string));
1591		1443
1592	tmp1->x = op->x;	1444	tmp1->x = op->x;
1593	tmp1->y = op->y;	1445	tmp1->y = op->y;
1594	insert_ob_in_map (tmp1, op->map, op, 0);	1446	insert_ob_in_map (tmp1, op->map, op, 0);
		1447	}
		1448
		1449	object *
		1450	object::insert_at (object *where, object *originator, int flags)
		1451	{
		1452	where->map->insert (this, where->x, where->y, originator, flags);
1595	}	1453	}
1596		1454
1597	/*	1455	/*
1598	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1456	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1599	* is returned contains nr objects, and the remaining parts contains	1457	* is returned contains nr objects, and the remaining parts contains
1600	* the rest (or is removed and freed if that number is 0).	1458	* the rest (or is removed and freed if that number is 0).
1601	* On failure, NULL is returned, and the reason put into the	1459	* On failure, NULL is returned, and the reason put into the
1602	* global static errmsg array.	1460	* global static errmsg array.
1603	*/	1461	*/
1604
1605	object *	1462	object *
1606	get_split_ob (object *orig_ob, uint32 nr)	1463	get_split_ob (object *orig_ob, uint32 nr)
1607	{	1464	{
1608	object *	1465	object *newob;
1609	newob;
1610	int
1611	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1466	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1612		1467
1613	if (orig_ob->nrof < nr)	1468	if (orig_ob->nrof < nr)
1614	{	1469	{
1615	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1470	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1616	return NULL;	1471	return NULL;
1617	}	1472	}
1618		1473
1619	newob = object_create_clone (orig_ob);	1474	newob = object_create_clone (orig_ob);
1620		1475
1621	if ((orig_ob->nrof -= nr) < 1)	1476	if ((orig_ob->nrof -= nr) < 1)
1622	{	1477	orig_ob->destroy (1);
1623	if (!is_removed)
1624	remove_ob (orig_ob);
1625	free_object2 (orig_ob, 1);
1626	}
1627	else if (!is_removed)	1478	else if (!is_removed)
1628	{	1479	{
1629	if (orig_ob->env != NULL)	1480	if (orig_ob->env != NULL)
1630	sub_weight (orig_ob->env, orig_ob->weight * nr);	1481	sub_weight (orig_ob->env, orig_ob->weight * nr);
1631	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1482	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1651		1502
1652	object *	1503	object *
1653	decrease_ob_nr (object *op, uint32 i)	1504	decrease_ob_nr (object *op, uint32 i)
1654	{	1505	{
1655	object *tmp;	1506	object *tmp;
1656	player *pl;
1657		1507
1658	if (i == 0) /* objects with op->nrof require this check */	1508	if (i == 0) /* objects with op->nrof require this check */
1659	return op;	1509	return op;
1660		1510
1661	if (i > op->nrof)	1511	if (i > op->nrof)
1662	i = op->nrof;	1512	i = op->nrof;
1663		1513
1664	if (QUERY_FLAG (op, FLAG_REMOVED))	1514	if (QUERY_FLAG (op, FLAG_REMOVED))
1665	op->nrof -= i;	1515	op->nrof -= i;
1666	else if (op->env != NULL)	1516	else if (op->env)
1667	{	1517	{
1668	/* is this object in the players inventory, or sub container	1518	/* is this object in the players inventory, or sub container
1669	* therein?	1519	* therein?
1670	*/	1520	*/
1671	tmp = is_player_inv (op->env);	1521	tmp = op->in_player ();
1672	/* nope. Is this a container the player has opened?	1522	/* nope. Is this a container the player has opened?
1673	* If so, set tmp to that player.	1523	* If so, set tmp to that player.
1674	* IMO, searching through all the players will mostly	1524	* IMO, searching through all the players will mostly
1675	* likely be quicker than following op->env to the map,	1525	* likely be quicker than following op->env to the map,
1676	* and then searching the map for a player.	1526	* and then searching the map for a player.
1677	*/	1527	*/
1678	if (!tmp)	1528	if (!tmp)
1679	{	1529	for_all_players (pl)
1680	for (pl = first_player; pl; pl = pl->next)
1681	if (pl->ob->container == op->env)	1530	if (pl->ob->container == op->env)
		1531	{
		1532	tmp = pl->ob;
1682	break;	1533	break;
1683	if (pl)
1684	tmp = pl->ob;
1685	else
1686	tmp = NULL;
1687	}	1534	}
1688		1535
1689	if (i < op->nrof)	1536	if (i < op->nrof)
1690	{	1537	{
1691	sub_weight (op->env, op->weight * i);	1538	sub_weight (op->env, op->weight * i);
1692	op->nrof -= i;	1539	op->nrof -= i;
1693	if (tmp)	1540	if (tmp)
1694	{
1695	esrv_send_item (tmp, op);	1541	esrv_send_item (tmp, op);
1696	}
1697	}	1542	}
1698	else	1543	else
1699	{	1544	{
1700	remove_ob (op);	1545	op->remove ();
1701	op->nrof = 0;	1546	op->nrof = 0;
1702	if (tmp)	1547	if (tmp)
1703	{
1704	esrv_del_item (tmp->contr, op->count);	1548	esrv_del_item (tmp->contr, op->count);
1705	}
1706	}	1549	}
1707	}	1550	}
1708	else	1551	else
1709	{	1552	{
1710	object *above = op->above;	1553	object *above = op->above;
1711		1554
1712	if (i < op->nrof)	1555	if (i < op->nrof)
1713	op->nrof -= i;	1556	op->nrof -= i;
1714	else	1557	else
1715	{	1558	{
1716	remove_ob (op);	1559	op->remove ();
1717	op->nrof = 0;	1560	op->nrof = 0;
1718	}	1561	}
1719		1562
1720	/* Since we just removed op, op->above is null */	1563	/* Since we just removed op, op->above is null */
1721	for (tmp = above; tmp != NULL; tmp = tmp->above)	1564	for (tmp = above; tmp; tmp = tmp->above)
1722	if (tmp->type == PLAYER)	1565	if (tmp->type == PLAYER)
1723	{	1566	{
1724	if (op->nrof)	1567	if (op->nrof)
1725	esrv_send_item (tmp, op);	1568	esrv_send_item (tmp, op);
1726	else	1569	else
…		…
1730		1573
1731	if (op->nrof)	1574	if (op->nrof)
1732	return op;	1575	return op;
1733	else	1576	else
1734	{	1577	{
1735	free_object (op);	1578	op->destroy ();
1736	return NULL;	1579	return 0;
1737	}	1580	}
1738	}	1581	}
1739		1582
1740	/*	1583	/*
1741	* add_weight(object, weight) adds the specified weight to an object,	1584	* add_weight(object, weight) adds the specified weight to an object,
…		…
1753	op->carrying += weight;	1596	op->carrying += weight;
1754	op = op->env;	1597	op = op->env;
1755	}	1598	}
1756	}	1599	}
1757		1600
		1601	object *
		1602	insert_ob_in_ob (object *op, object *where)
		1603	{
		1604	if (!where)
		1605	{
		1606	char *dump = dump_object (op);
		1607	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1608	free (dump);
		1609	return op;
		1610	}
		1611
		1612	if (where->head)
		1613	{
		1614	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1615	where = where->head;
		1616	}
		1617
		1618	return where->insert (op);
		1619	}
		1620
1758	/*	1621	/*
1759	* insert_ob_in_ob(op,environment):	1622	* env->insert (op)
1760	* This function inserts the object op in the linked list	1623	* This function inserts the object op in the linked list
1761	* inside the object environment.	1624	* inside the object environment.
1762	*	1625	*
1763	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1764	* the inventory at the last position or next to other objects of the same
1765	* type.
1766	* Frank: Now sorted by type, archetype and magic!
1767	*
1768	* The function returns now pointer to inserted item, and return value can	1626	* The function returns now pointer to inserted item, and return value can
1769	* be != op, if items are merged. -Tero	1627	* be != op, if items are merged. -Tero
1770	*/	1628	*/
1771		1629
1772	object *	1630	object *
1773	insert_ob_in_ob (object *op, object *where)	1631	object::insert (object *op)
1774	{	1632	{
1775	object *	1633	object *tmp, *otmp;
1776	tmp, *
1777	otmp;
1778		1634
1779	if (!QUERY_FLAG (op, FLAG_REMOVED))	1635	if (!QUERY_FLAG (op, FLAG_REMOVED))
1780	{	1636	op->remove ();
1781	dump_object (op);
1782	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1783	return op;
1784	}
1785
1786	if (where == NULL)
1787	{
1788	dump_object (op);
1789	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1790	return op;
1791	}
1792
1793	if (where->head)
1794	{
1795	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1796	where = where->head;
1797	}
1798		1637
1799	if (op->more)	1638	if (op->more)
1800	{	1639	{
1801	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1640	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1802	return op;	1641	return op;
…		…
1804		1643
1805	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1644	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1806	CLEAR_FLAG (op, FLAG_REMOVED);	1645	CLEAR_FLAG (op, FLAG_REMOVED);
1807	if (op->nrof)	1646	if (op->nrof)
1808	{	1647	{
1809	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1648	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1810	if (CAN_MERGE (tmp, op))	1649	if (object::can_merge (tmp, op))
1811	{	1650	{
1812	/* return the original object and remove inserted object	1651	/* return the original object and remove inserted object
1813	(client needs the original object) */	1652	(client needs the original object) */
1814	tmp->nrof += op->nrof;	1653	tmp->nrof += op->nrof;
1815	/* Weight handling gets pretty funky. Since we are adding to	1654	/* Weight handling gets pretty funky. Since we are adding to
1816	* tmp->nrof, we need to increase the weight.	1655	* tmp->nrof, we need to increase the weight.
1817	*/	1656	*/
1818	add_weight (where, op->weight * op->nrof);	1657	add_weight (this, op->weight * op->nrof);
1819	SET_FLAG (op, FLAG_REMOVED);	1658	SET_FLAG (op, FLAG_REMOVED);
1820	free_object (op); /* free the inserted object */	1659	op->destroy (); /* free the inserted object */
1821	op = tmp;	1660	op = tmp;
1822	remove_ob (op); /* and fix old object's links */	1661	op->remove (); /* and fix old object's links */
1823	CLEAR_FLAG (op, FLAG_REMOVED);	1662	CLEAR_FLAG (op, FLAG_REMOVED);
1824	break;	1663	break;
1825	}	1664	}
1826		1665
1827	/* I assume combined objects have no inventory	1666	/* I assume combined objects have no inventory
1828	* We add the weight - this object could have just been removed	1667	* We add the weight - this object could have just been removed
1829	* (if it was possible to merge). calling remove_ob will subtract	1668	* (if it was possible to merge). calling remove_ob will subtract
1830	* the weight, so we need to add it in again, since we actually do	1669	* the weight, so we need to add it in again, since we actually do
1831	* the linking below	1670	* the linking below
1832	*/	1671	*/
1833	add_weight (where, op->weight * op->nrof);	1672	add_weight (this, op->weight * op->nrof);
1834	}	1673	}
1835	else	1674	else
1836	add_weight (where, (op->weight + op->carrying));	1675	add_weight (this, (op->weight + op->carrying));
1837		1676
1838	otmp = is_player_inv (where);	1677	otmp = this->in_player ();
1839	if (otmp && otmp->contr != NULL)	1678	if (otmp && otmp->contr)
1840	{
1841	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1679	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1842	fix_player (otmp);	1680	otmp->update_stats ();
1843	}
1844		1681
1845	op->map = NULL;	1682	op->map = 0;
1846	op->env = where;	1683	op->env = this;
1847	op->above = NULL;	1684	op->above = 0;
1848	op->below = NULL;	1685	op->below = 0;
1849	op->x = 0, op->y = 0;	1686	op->x = 0, op->y = 0;
1850		1687
1851	/* reset the light list and los of the players on the map */	1688	/* reset the light list and los of the players on the map */
1852	if ((op->glow_radius != 0) && where->map)	1689	if ((op->glow_radius != 0) && map)
1853	{	1690	{
1854	#ifdef DEBUG_LIGHTS	1691	#ifdef DEBUG_LIGHTS
1855	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1692	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1856	#endif /* DEBUG_LIGHTS */	1693	#endif /* DEBUG_LIGHTS */
1857	if (MAP_DARKNESS (where->map))	1694	if (map->darkness)
1858	update_all_los (where->map, where->x, where->y);	1695	update_all_los (map, x, y);
1859	}	1696	}
1860		1697
1861	/* Client has no idea of ordering so lets not bother ordering it here.	1698	/* Client has no idea of ordering so lets not bother ordering it here.
1862	* It sure simplifies this function...	1699	* It sure simplifies this function...
1863	*/	1700	*/
1864	if (where->inv == NULL)	1701	if (!inv)
1865	where->inv = op;	1702	inv = op;
1866	else	1703	else
1867	{	1704	{
1868	op->below = where->inv;	1705	op->below = inv;
1869	op->below->above = op;	1706	op->below->above = op;
1870	where->inv = op;	1707	inv = op;
1871	}	1708	}
		1709
		1710	INVOKE_OBJECT (INSERT, this);
		1711
1872	return op;	1712	return op;
1873	}	1713	}
1874		1714
1875	/*	1715	/*
1876	* Checks if any objects has a move_type that matches objects	1716	* Checks if any objects has a move_type that matches objects
…		…
1890	*	1730	*
1891	* MSW 2001-07-08: Check all objects on space, not just those below	1731	* MSW 2001-07-08: Check all objects on space, not just those below
1892	* object being inserted. insert_ob_in_map may not put new objects	1732	* object being inserted. insert_ob_in_map may not put new objects
1893	* on top.	1733	* on top.
1894	*/	1734	*/
1895
1896	int	1735	int
1897	check_move_on (object *op, object *originator)	1736	check_move_on (object *op, object *originator)
1898	{	1737	{
1899	object *	1738	object *tmp;
1900	tmp;	1739	maptile *m = op->map;
1901	tag_t
1902	tag;
1903	mapstruct *
1904	m = op->map;
1905	int
1906	x = op->x, y = op->y;	1740	int x = op->x, y = op->y;
1907		1741
1908	MoveType	1742	MoveType move_on, move_slow, move_block;
1909	move_on,
1910	move_slow,
1911	move_block;
1912		1743
1913	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1744	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1914	return 0;	1745	return 0;
1915
1916	tag = op->count;
1917		1746
1918	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1747	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1919	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1748	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1920	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1749	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1921		1750
…		…
1937		1766
1938	/* The objects have to be checked from top to bottom.	1767	/* The objects have to be checked from top to bottom.
1939	* Hence, we first go to the top:	1768	* Hence, we first go to the top:
1940	*/	1769	*/
1941		1770
1942	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1771	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1943	{	1772	{
1944	/* Trim the search when we find the first other spell effect	1773	/* Trim the search when we find the first other spell effect
1945	* this helps performance so that if a space has 50 spell objects,	1774	* this helps performance so that if a space has 50 spell objects,
1946	* we don't need to check all of them.	1775	* we don't need to check all of them.
1947	*/	1776	*/
…		…
1982	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1811	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1983	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1812	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1984	{	1813	{
1985	move_apply (tmp, op, originator);	1814	move_apply (tmp, op, originator);
1986		1815
1987	if (was_destroyed (op, tag))	1816	if (op->destroyed ())
1988	return 1;	1817	return 1;
1989		1818
1990	/* what the person/creature stepped onto has moved the object	1819	/* what the person/creature stepped onto has moved the object
1991	* someplace new. Don't process any further - if we did,	1820	* someplace new. Don't process any further - if we did,
1992	* have a feeling strange problems would result.	1821	* have a feeling strange problems would result.
…		…
2002	/*	1831	/*
2003	* present_arch(arch, map, x, y) searches for any objects with	1832	* present_arch(arch, map, x, y) searches for any objects with
2004	* a matching archetype at the given map and coordinates.	1833	* a matching archetype at the given map and coordinates.
2005	* The first matching object is returned, or NULL if none.	1834	* The first matching object is returned, or NULL if none.
2006	*/	1835	*/
2007
2008	object *	1836	object *
2009	present_arch (const archetype *at, mapstruct *m, int x, int y)	1837	present_arch (const archetype *at, maptile *m, int x, int y)
2010	{	1838	{
2011	object *
2012	tmp;
2013
2014	if (m == NULL || out_of_map (m, x, y))	1839	if (m == NULL || out_of_map (m, x, y))
2015	{	1840	{
2016	LOG (llevError, "Present_arch called outside map.\n");	1841	LOG (llevError, "Present_arch called outside map.\n");
2017	return NULL;	1842	return NULL;
2018	}	1843	}
		1844
2019	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1845	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2020	if (tmp->arch == at)	1846	if (tmp->arch == at)
2021	return tmp;	1847	return tmp;
		1848
2022	return NULL;	1849	return NULL;
2023	}	1850	}
2024		1851
2025	/*	1852	/*
2026	* present(type, map, x, y) searches for any objects with	1853	* present(type, map, x, y) searches for any objects with
2027	* a matching type variable at the given map and coordinates.	1854	* a matching type variable at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
2029	*/	1856	*/
2030
2031	object *	1857	object *
2032	present (unsigned char type, mapstruct *m, int x, int y)	1858	present (unsigned char type, maptile *m, int x, int y)
2033	{	1859	{
2034	object *
2035	tmp;
2036
2037	if (out_of_map (m, x, y))	1860	if (out_of_map (m, x, y))
2038	{	1861	{
2039	LOG (llevError, "Present called outside map.\n");	1862	LOG (llevError, "Present called outside map.\n");
2040	return NULL;	1863	return NULL;
2041	}	1864	}
		1865
2042	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1866	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2043	if (tmp->type == type)	1867	if (tmp->type == type)
2044	return tmp;	1868	return tmp;
		1869
2045	return NULL;	1870	return NULL;
2046	}	1871	}
2047		1872
2048	/*	1873	/*
2049	* present_in_ob(type, object) searches for any objects with	1874	* present_in_ob(type, object) searches for any objects with
2050	* a matching type variable in the inventory of the given object.	1875	* a matching type variable in the inventory of the given object.
2051	* The first matching object is returned, or NULL if none.	1876	* The first matching object is returned, or NULL if none.
2052	*/	1877	*/
2053
2054	object *	1878	object *
2055	present_in_ob (unsigned char type, const object *op)	1879	present_in_ob (unsigned char type, const object *op)
2056	{	1880	{
2057	object *
2058	tmp;
2059
2060	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1881	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2061	if (tmp->type == type)	1882	if (tmp->type == type)
2062	return tmp;	1883	return tmp;
		1884
2063	return NULL;	1885	return NULL;
2064	}	1886	}
2065		1887
2066	/*	1888	/*
2067	* present_in_ob (type, str, object) searches for any objects with	1889	* present_in_ob (type, str, object) searches for any objects with
…		…
2075	* str is the string to match against. Note that we match against	1897	* str is the string to match against. Note that we match against
2076	* the object name, not the archetype name. this is so that the	1898	* the object name, not the archetype name. this is so that the
2077	* spell code can use one object type (force), but change it's name	1899	* spell code can use one object type (force), but change it's name
2078	* to be unique.	1900	* to be unique.
2079	*/	1901	*/
2080
2081	object *	1902	object *
2082	present_in_ob_by_name (int type, const char *str, const object *op)	1903	present_in_ob_by_name (int type, const char *str, const object *op)
2083	{	1904	{
2084	object *
2085	tmp;
2086
2087	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1905	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2088	{
2089	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1906	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2090	return tmp;	1907	return tmp;
2091	}	1908
2092	return NULL;	1909	return 0;
2093	}	1910	}
2094		1911
2095	/*	1912	/*
2096	* present_arch_in_ob(archetype, object) searches for any objects with	1913	* present_arch_in_ob(archetype, object) searches for any objects with
2097	* a matching archetype in the inventory of the given object.	1914	* a matching archetype in the inventory of the given object.
2098	* The first matching object is returned, or NULL if none.	1915	* The first matching object is returned, or NULL if none.
2099	*/	1916	*/
2100
2101	object *	1917	object *
2102	present_arch_in_ob (const archetype *at, const object *op)	1918	present_arch_in_ob (const archetype *at, const object *op)
2103	{	1919	{
2104	object *
2105	tmp;
2106
2107	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2108	if (tmp->arch == at)	1921	if (tmp->arch == at)
2109	return tmp;	1922	return tmp;
		1923
2110	return NULL;	1924	return NULL;
2111	}	1925	}
2112		1926
2113	/*	1927	/*
2114	* activate recursively a flag on an object inventory	1928	* activate recursively a flag on an object inventory
2115	*/	1929	*/
2116	void	1930	void
2117	flag_inv (object *op, int flag)	1931	flag_inv (object *op, int flag)
2118	{	1932	{
2119	object *
2120	tmp;
2121
2122	if (op->inv)	1933	if (op->inv)
2123	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2124	{	1935	{
2125	SET_FLAG (tmp, flag);	1936	SET_FLAG (tmp, flag);
2126	flag_inv (tmp, flag);	1937	flag_inv (tmp, flag);
2127	}	1938	}
2128	} /*	1939	}
		1940
		1941	/*
2129	* desactivate recursively a flag on an object inventory	1942	* deactivate recursively a flag on an object inventory
2130	*/	1943	*/
2131	void	1944	void
2132	unflag_inv (object *op, int flag)	1945	unflag_inv (object *op, int flag)
2133	{	1946	{
2134	object *
2135	tmp;
2136
2137	if (op->inv)	1947	if (op->inv)
2138	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1948	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2139	{	1949	{
2140	CLEAR_FLAG (tmp, flag);	1950	CLEAR_FLAG (tmp, flag);
2141	unflag_inv (tmp, flag);	1951	unflag_inv (tmp, flag);
2142	}	1952	}
2143	}	1953	}
…		…
2146	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1956	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2147	* all it's inventory (recursively).	1957	* all it's inventory (recursively).
2148	* If checksums are used, a player will get set_cheat called for	1958	* If checksums are used, a player will get set_cheat called for
2149	* him/her-self and all object carried by a call to this function.	1959	* him/her-self and all object carried by a call to this function.
2150	*/	1960	*/
2151
2152	void	1961	void
2153	set_cheat (object *op)	1962	set_cheat (object *op)
2154	{	1963	{
2155	SET_FLAG (op, FLAG_WAS_WIZ);	1964	SET_FLAG (op, FLAG_WAS_WIZ);
2156	flag_inv (op, FLAG_WAS_WIZ);	1965	flag_inv (op, FLAG_WAS_WIZ);
…		…
2175	* because arch_blocked (now ob_blocked) needs to know the movement type	1984	* because arch_blocked (now ob_blocked) needs to know the movement type
2176	* to know if the space in question will block the object. We can't use	1985	* to know if the space in question will block the object. We can't use
2177	* the archetype because that isn't correct if the monster has been	1986	* the archetype because that isn't correct if the monster has been
2178	* customized, changed states, etc.	1987	* customized, changed states, etc.
2179	*/	1988	*/
2180
2181	int	1989	int
2182	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	1990	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2183	{	1991	{
2184	int
2185	i,
2186	index = 0, flag;	1992	int index = 0, flag;
2187	static int
2188	altern[SIZEOFFREE];	1993	int altern[SIZEOFFREE];
2189		1994
2190	for (i = start; i < stop; i++)	1995	for (int i = start; i < stop; i++)
2191	{	1996	{
2192	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1997	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2193	if (!flag)	1998	if (!flag)
2194	altern[index++] = i;	1999	altern [index++] = i;
2195		2000
2196	/* Basically, if we find a wall on a space, we cut down the search size.	2001	/* Basically, if we find a wall on a space, we cut down the search size.
2197	* In this way, we won't return spaces that are on another side of a wall.	2002	* In this way, we won't return spaces that are on another side of a wall.
2198	* This mostly work, but it cuts down the search size in all directions -	2003	* This mostly work, but it cuts down the search size in all directions -
2199	* if the space being examined only has a wall to the north and empty	2004	* if the space being examined only has a wall to the north and empty
2200	* spaces in all the other directions, this will reduce the search space	2005	* spaces in all the other directions, this will reduce the search space
2201	* to only the spaces immediately surrounding the target area, and	2006	* to only the spaces immediately surrounding the target area, and
2202	* won't look 2 spaces south of the target space.	2007	* won't look 2 spaces south of the target space.
2203	*/	2008	*/
2204	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2009	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2205	stop = maxfree[i];	2010	stop = maxfree[i];
2206	}	2011	}
		2012
2207	if (!index)	2013	if (!index)
2208	return -1;	2014	return -1;
		2015
2209	return altern[RANDOM () % index];	2016	return altern[RANDOM () % index];
2210	}	2017	}
2211		2018
2212	/*	2019	/*
2213	* find_first_free_spot(archetype, mapstruct, x, y) works like	2020	* find_first_free_spot(archetype, maptile, x, y) works like
2214	* find_free_spot(), but it will search max number of squares.	2021	* find_free_spot(), but it will search max number of squares.
2215	* But it will return the first available spot, not a random choice.	2022	* But it will return the first available spot, not a random choice.
2216	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2023	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2217	*/	2024	*/
2218
2219	int	2025	int
2220	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2026	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2221	{	2027	{
2222	int
2223	i;
2224
2225	for (i = 0; i < SIZEOFFREE; i++)	2028	for (int i = 0; i < SIZEOFFREE; i++)
2226	{
2227	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2029	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2228	return i;	2030	return i;
2229	}	2031
2230	return -1;	2032	return -1;
2231	}	2033	}
2232		2034
2233	/*	2035	/*
2234	* The function permute(arr, begin, end) randomly reorders the array	2036	* The function permute(arr, begin, end) randomly reorders the array
2235	* arr[begin..end-1].	2037	* arr[begin..end-1].
		2038	* now uses a fisher-yates shuffle, old permute was broken
2236	*/	2039	*/
2237	static void	2040	static void
2238	permute (int *arr, int begin, int end)	2041	permute (int *arr, int begin, int end)
2239	{	2042	{
2240	int	2043	arr += begin;
2241	i,
2242	j,
2243	tmp,
2244	len;
2245
2246	len = end - begin;	2044	end -= begin;
2247	for (i = begin; i < end; i++)
2248	{
2249	j = begin + RANDOM () % len;
2250		2045
2251	tmp = arr[i];	2046	while (--end)
2252	arr[i] = arr[j];	2047	swap (arr [end], arr [RANDOM () % (end + 1)]);
2253	arr[j] = tmp;
2254	}
2255	}	2048	}
2256		2049
2257	/* new function to make monster searching more efficient, and effective!	2050	/* new function to make monster searching more efficient, and effective!
2258	* This basically returns a randomized array (in the passed pointer) of	2051	* This basically returns a randomized array (in the passed pointer) of
2259	* the spaces to find monsters. In this way, it won't always look for	2052	* the spaces to find monsters. In this way, it won't always look for
…		…
2262	* the 3x3 area will be searched, just not in a predictable order.	2055	* the 3x3 area will be searched, just not in a predictable order.
2263	*/	2056	*/
2264	void	2057	void
2265	get_search_arr (int *search_arr)	2058	get_search_arr (int *search_arr)
2266	{	2059	{
2267	int	2060	int i;
2268	i;
2269		2061
2270	for (i = 0; i < SIZEOFFREE; i++)	2062	for (i = 0; i < SIZEOFFREE; i++)
2271	{
2272	search_arr[i] = i;	2063	search_arr[i] = i;
2273	}
2274		2064
2275	permute (search_arr, 1, SIZEOFFREE1 + 1);	2065	permute (search_arr, 1, SIZEOFFREE1 + 1);
2276	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2066	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2277	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2067	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2278	}	2068	}
…		…
2287	* Perhaps incorrectly, but I'm making the assumption that exclude	2077	* Perhaps incorrectly, but I'm making the assumption that exclude
2288	* is actually want is going to try and move there. We need this info	2078	* is actually want is going to try and move there. We need this info
2289	* because we have to know what movement the thing looking to move	2079	* because we have to know what movement the thing looking to move
2290	* there is capable of.	2080	* there is capable of.
2291	*/	2081	*/
2292
2293	int	2082	int
2294	find_dir (mapstruct *m, int x, int y, object *exclude)	2083	find_dir (maptile *m, int x, int y, object *exclude)
2295	{	2084	{
2296	int
2297	i,
2298	max = SIZEOFFREE, mflags;	2085	int i, max = SIZEOFFREE, mflags;
2299		2086
2300	sint16 nx, ny;	2087	sint16 nx, ny;
2301	object *	2088	object *tmp;
2302	tmp;	2089	maptile *mp;
2303	mapstruct *
2304	mp;
2305		2090
2306	MoveType blocked, move_type;	2091	MoveType blocked, move_type;
2307		2092
2308	if (exclude && exclude->head)	2093	if (exclude && exclude->head)
2309	{	2094	{
…		…
2321	mp = m;	2106	mp = m;
2322	nx = x + freearr_x[i];	2107	nx = x + freearr_x[i];
2323	ny = y + freearr_y[i];	2108	ny = y + freearr_y[i];
2324		2109
2325	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2110	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2111
2326	if (mflags & P_OUT_OF_MAP)	2112	if (mflags & P_OUT_OF_MAP)
2327	{
2328	max = maxfree[i];	2113	max = maxfree[i];
2329	}
2330	else	2114	else
2331	{	2115	{
2332	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2116	mapspace &ms = mp->at (nx, ny);
		2117
		2118	blocked = ms.move_block;
2333		2119
2334	if ((move_type & blocked) == move_type)	2120	if ((move_type & blocked) == move_type)
2335	{
2336	max = maxfree[i];	2121	max = maxfree[i];
2337	}
2338	else if (mflags & P_IS_ALIVE)	2122	else if (mflags & P_IS_ALIVE)
2339	{	2123	{
2340	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2124	for (tmp = ms.bot; tmp; tmp = tmp->above)
2341	{	2125	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2342	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2126	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2343	{
2344	break;	2127	break;
2345	}	2128
2346	}
2347	if (tmp)	2129	if (tmp)
2348	{
2349	return freedir[i];	2130	return freedir[i];
2350	}
2351	}	2131	}
2352	}	2132	}
2353	}	2133	}
		2134
2354	return 0;	2135	return 0;
2355	}	2136	}
2356		2137
2357	/*	2138	/*
2358	* distance(object 1, object 2) will return the square of the	2139	* distance(object 1, object 2) will return the square of the
2359	* distance between the two given objects.	2140	* distance between the two given objects.
2360	*/	2141	*/
2361
2362	int	2142	int
2363	distance (const object *ob1, const object *ob2)	2143	distance (const object *ob1, const object *ob2)
2364	{	2144	{
2365	int
2366	i;
2367
2368	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2145	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2369	return i;
2370	}	2146	}
2371		2147
2372	/*	2148	/*
2373	* find_dir_2(delta-x,delta-y) will return a direction in which	2149	* find_dir_2(delta-x,delta-y) will return a direction in which
2374	* an object which has subtracted the x and y coordinates of another	2150	* an object which has subtracted the x and y coordinates of another
2375	* object, needs to travel toward it.	2151	* object, needs to travel toward it.
2376	*/	2152	*/
2377
2378	int	2153	int
2379	find_dir_2 (int x, int y)	2154	find_dir_2 (int x, int y)
2380	{	2155	{
2381	int	2156	int q;
2382	q;
2383		2157
2384	if (y)	2158	if (y)
2385	q = x * 100 / y;	2159	q = x * 100 / y;
2386	else if (x)	2160	else if (x)
2387	q = -300 * x;	2161	q = -300 * x;
…		…
2422	int	2196	int
2423	absdir (int d)	2197	absdir (int d)
2424	{	2198	{
2425	while (d < 1)	2199	while (d < 1)
2426	d += 8;	2200	d += 8;
		2201
2427	while (d > 8)	2202	while (d > 8)
2428	d -= 8;	2203	d -= 8;
		2204
2429	return d;	2205	return d;
2430	}	2206	}
2431		2207
2432	/*	2208	/*
2433	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2209	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2435	*/	2211	*/
2436		2212
2437	int	2213	int
2438	dirdiff (int dir1, int dir2)	2214	dirdiff (int dir1, int dir2)
2439	{	2215	{
2440	int	2216	int d;
2441	d;
2442		2217
2443	d = abs (dir1 - dir2);	2218	d = abs (dir1 - dir2);
2444	if (d > 4)	2219	if (d > 4)
2445	d = 8 - d;	2220	d = 8 - d;
		2221
2446	return d;	2222	return d;
2447	}	2223	}
2448		2224
2449	/* peterm:	2225	/* peterm:
2450	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2226	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2453	* This basically means that if direction is 15, then it could either go	2229	* This basically means that if direction is 15, then it could either go
2454	* direction 4, 14, or 16 to get back to where we are.	2230	* direction 4, 14, or 16 to get back to where we are.
2455	* Moved from spell_util.c to object.c with the other related direction	2231	* Moved from spell_util.c to object.c with the other related direction
2456	* functions.	2232	* functions.
2457	*/	2233	*/
2458
2459	int
2460	reduction_dir[SIZEOFFREE][3] = {	2234	int reduction_dir[SIZEOFFREE][3] = {
2461	{0, 0, 0}, /* 0 */	2235	{0, 0, 0}, /* 0 */
2462	{0, 0, 0}, /* 1 */	2236	{0, 0, 0}, /* 1 */
2463	{0, 0, 0}, /* 2 */	2237	{0, 0, 0}, /* 2 */
2464	{0, 0, 0}, /* 3 */	2238	{0, 0, 0}, /* 3 */
2465	{0, 0, 0}, /* 4 */	2239	{0, 0, 0}, /* 4 */
…		…
2513	* find a path to that monster that we found. If not,	2287	* find a path to that monster that we found. If not,
2514	* we don't bother going toward it. Returns 1 if we	2288	* we don't bother going toward it. Returns 1 if we
2515	* can see a direct way to get it	2289	* can see a direct way to get it
2516	* Modified to be map tile aware -.MSW	2290	* Modified to be map tile aware -.MSW
2517	*/	2291	*/
2518
2519
2520	int	2292	int
2521	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2293	can_see_monsterP (maptile *m, int x, int y, int dir)
2522	{	2294	{
2523	sint16 dx, dy;	2295	sint16 dx, dy;
2524	int
2525	mflags;	2296	int mflags;
2526		2297
2527	if (dir < 0)	2298	if (dir < 0)
2528	return 0; /* exit condition: invalid direction */	2299	return 0; /* exit condition: invalid direction */
2529		2300
2530	dx = x + freearr_x[dir];	2301	dx = x + freearr_x[dir];
…		…
2543	return 0;	2314	return 0;
2544		2315
2545	/* yes, can see. */	2316	/* yes, can see. */
2546	if (dir < 9)	2317	if (dir < 9)
2547	return 1;	2318	return 1;
		2319
2548	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2320	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2549	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2321	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2322	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2550	}	2323	}
2551
2552
2553		2324
2554	/*	2325	/*
2555	* can_pick(picker, item): finds out if an object is possible to be	2326	* can_pick(picker, item): finds out if an object is possible to be
2556	* picked up by the picker. Returnes 1 if it can be	2327	* picked up by the picker. Returnes 1 if it can be
2557	* picked up, otherwise 0.	2328	* picked up, otherwise 0.
…		…
2568	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2339	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2569	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2340	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2570	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2341	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2571	}	2342	}
2572		2343
2573
2574	/*	2344	/*
2575	* create clone from object to another	2345	* create clone from object to another
2576	*/	2346	*/
2577	object *	2347	object *
2578	object_create_clone (object *asrc)	2348	object_create_clone (object *asrc)
2579	{	2349	{
2580	object *
2581	dst = NULL, *tmp, *src, *part, *prev, *item;	2350	object *dst = 0, *tmp, *src, *part, *prev, *item;
2582		2351
2583	if (!asrc)	2352	if (!asrc)
2584	return NULL;	2353	return 0;
		2354
2585	src = asrc;	2355	src = asrc;
2586	if (src->head)	2356	if (src->head)
2587	src = src->head;	2357	src = src->head;
2588		2358
2589	prev = NULL;	2359	prev = 0;
2590	for (part = src; part; part = part->more)	2360	for (part = src; part; part = part->more)
2591	{	2361	{
2592	tmp = get_object ();	2362	tmp = part->clone ();
2593	copy_object (part, tmp);
2594	tmp->x -= src->x;	2363	tmp->x -= src->x;
2595	tmp->y -= src->y;	2364	tmp->y -= src->y;
		2365
2596	if (!part->head)	2366	if (!part->head)
2597	{	2367	{
2598	dst = tmp;	2368	dst = tmp;
2599	tmp->head = NULL;	2369	tmp->head = 0;
2600	}	2370	}
2601	else	2371	else
2602	{
2603	tmp->head = dst;	2372	tmp->head = dst;
2604	}	2373
2605	tmp->more = NULL;	2374	tmp->more = 0;
		2375
2606	if (prev)	2376	if (prev)
2607	prev->more = tmp;	2377	prev->more = tmp;
		2378
2608	prev = tmp;	2379	prev = tmp;
2609	}	2380	}
2610		2381
2611	/*** copy inventory ***/
2612	for (item = src->inv; item; item = item->below)	2382	for (item = src->inv; item; item = item->below)
2613	{
2614	(void) insert_ob_in_ob (object_create_clone (item), dst);	2383	insert_ob_in_ob (object_create_clone (item), dst);
2615	}
2616		2384
2617	return dst;	2385	return dst;
2618	}	2386	}
2619		2387
2620	/* return true if the object was destroyed, 0 otherwise */
2621	int
2622	was_destroyed (const object *op, tag_t old_tag)
2623	{
2624	/* checking for FLAG_FREED isn't necessary, but makes this function more
2625	* robust */
2626	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2627	}
2628
2629	/* GROS - Creates an object using a string representing its content. */	2388	/* GROS - Creates an object using a string representing its content. */
2630
2631	/* Basically, we save the content of the string to a temp file, then call */	2389	/* Basically, we save the content of the string to a temp file, then call */
2632
2633	/* load_object on it. I admit it is a highly inefficient way to make things, */	2390	/* load_object on it. I admit it is a highly inefficient way to make things, */
2634
2635	/* but it was simple to make and allows reusing the load_object function. */	2391	/* but it was simple to make and allows reusing the load_object function. */
2636
2637	/* Remember not to use load_object_str in a time-critical situation. */	2392	/* Remember not to use load_object_str in a time-critical situation. */
2638
2639	/* Also remember that multiparts objects are not supported for now. */	2393	/* Also remember that multiparts objects are not supported for now. */
2640
2641	object *	2394	object *
2642	load_object_str (const char *obstr)	2395	load_object_str (const char *obstr)
2643	{	2396	{
2644	object *	2397	object *op;
2645	op;
2646	char
2647	filename[MAX_BUF];	2398	char filename[MAX_BUF];
2648		2399
2649	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2400	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2650		2401
2651	FILE *
2652	tempfile = fopen (filename, "w");	2402	FILE *tempfile = fopen (filename, "w");
2653		2403
2654	if (tempfile == NULL)	2404	if (tempfile == NULL)
2655	{	2405	{
2656	LOG (llevError, "Error - Unable to access load object temp file\n");	2406	LOG (llevError, "Error - Unable to access load object temp file\n");
2657	return NULL;	2407	return NULL;
2658	};	2408	}
		2409
2659	fprintf (tempfile, obstr);	2410	fprintf (tempfile, obstr);
2660	fclose (tempfile);	2411	fclose (tempfile);
2661		2412
2662	op = get_object ();	2413	op = object::create ();
2663		2414
2664	object_thawer thawer (filename);	2415	object_thawer thawer (filename);
2665		2416
2666	if (thawer)	2417	if (thawer)
2667	load_object (thawer, op, 0);	2418	load_object (thawer, op, 0);
…		…
2677	* returns NULL if no match.	2428	* returns NULL if no match.
2678	*/	2429	*/
2679	object *	2430	object *
2680	find_obj_by_type_subtype (const object *who, int type, int subtype)	2431	find_obj_by_type_subtype (const object *who, int type, int subtype)
2681	{	2432	{
2682	object *
2683	tmp;
2684
2685	for (tmp = who->inv; tmp; tmp = tmp->below)	2433	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2686	if (tmp->type == type && tmp->subtype == subtype)	2434	if (tmp->type == type && tmp->subtype == subtype)
2687	return tmp;	2435	return tmp;
2688		2436
2689	return NULL;	2437	return 0;
2690	}	2438	}
2691		2439
2692	/* If ob has a field named key, return the link from the list,	2440	/* If ob has a field named key, return the link from the list,
2693	* otherwise return NULL.	2441	* otherwise return NULL.
2694	*	2442	*
…		…
2696	* do the desired thing.	2444	* do the desired thing.
2697	*/	2445	*/
2698	key_value *	2446	key_value *
2699	get_ob_key_link (const object *ob, const char *key)	2447	get_ob_key_link (const object *ob, const char *key)
2700	{	2448	{
2701	key_value *
2702	link;
2703
2704	for (link = ob->key_values; link != NULL; link = link->next)	2449	for (key_value *link = ob->key_values; link; link = link->next)
2705	{
2706	if (link->key == key)	2450	if (link->key == key)
2707	{
2708	return link;	2451	return link;
2709	}
2710	}
2711		2452
2712	return NULL;	2453	return 0;
2713	}	2454	}
2714		2455
2715	/*	2456	/*
2716	* Returns the value of op has an extra_field for key, or NULL.	2457	* Returns the value of op has an extra_field for key, or NULL.
2717	*	2458	*
…		…
2757	* Returns TRUE on success.	2498	* Returns TRUE on success.
2758	*/	2499	*/
2759	int	2500	int
2760	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2501	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2761	{	2502	{
2762	key_value *
2763	field = NULL, *last = NULL;	2503	key_value *field = NULL, *last = NULL;
2764		2504
2765	for (field = op->key_values; field != NULL; field = field->next)	2505	for (field = op->key_values; field != NULL; field = field->next)
2766	{	2506	{
2767	if (field->key != canonical_key)	2507	if (field->key != canonical_key)
2768	{	2508	{
…		…
2796	/* IF we get here, key doesn't exist */	2536	/* IF we get here, key doesn't exist */
2797		2537
2798	/* No field, we'll have to add it. */	2538	/* No field, we'll have to add it. */
2799		2539
2800	if (!add_key)	2540	if (!add_key)
2801	{
2802	return FALSE;	2541	return FALSE;
2803	}	2542
2804	/* There isn't any good reason to store a null	2543	/* There isn't any good reason to store a null
2805	* value in the key/value list. If the archetype has	2544	* value in the key/value list. If the archetype has
2806	* this key, then we should also have it, so shouldn't	2545	* this key, then we should also have it, so shouldn't
2807	* be here. If user wants to store empty strings,	2546	* be here. If user wants to store empty strings,
2808	* should pass in ""	2547	* should pass in ""

Diff Legend

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