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

Diff Legend

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