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.57 by root, Sun Dec 3 02:46:33 2006 UTC vs.
Revision 1.136 by root, Thu Mar 15 14:23:02 2007 UTC

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