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.44 by root, Thu Sep 14 17:29:27 2006 UTC vs.
Revision 1.136 by root, Thu Mar 15 14:23:02 2007 UTC

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

Diff Legend

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