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.65 by root, Wed Dec 13 00:42:03 2006 UTC vs.
Revision 1.108 by root, Sun Jan 7 02:39:13 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
…		…
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,
…		…
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		362
…		…
381	{	365	{
382	if (!op)	366	if (!op)
383	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
384		368
385	object_freezer freezer;	369	object_freezer freezer;
386	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
387	return freezer.as_string ();	371	return freezer.as_string ();
388	}	372	}
389		373
390	/*	374	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
408	}	392	}
409		393
410	/*	394	/*
411	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
412	*/	396	*/
413
414	object *	397	object *
415	find_object (tag_t i)	398	find_object (tag_t i)
416	{	399	{
417	for (object *op = object::first; op; op = op->next)	400	return ((unsigned int)i) < objects.size ()
418	if (op->count == i)	401	? objects [i]
419	return op;	402	: 0;
420
421	return 0;
422	}	403	}
423		404
424	/*	405	/*
425	* Returns the first object which has a name equal to the argument.	406	* Returns the first object which has a name equal to the argument.
426	* Used only by the patch command, but not all that useful.	407	* Used only by the patch command, but not all that useful.
427	* Enables features like "patch <name-of-other-player> food 999"	408	* Enables features like "patch <name-of-other-player> food 999"
428	*/	409	*/
429
430	object *	410	object *
431	find_object_name (const char *str)	411	find_object_name (const char *str)
432	{	412	{
433	shstr_cmp str_ (str);	413	shstr_cmp str_ (str);
434	object *op;	414	object *op;
435		415
436	for (op = object::first; op != NULL; op = op->next)	416	for_all_objects (op)
437	if (op->name == str_)	417	if (op->name == str_)
438	break;	418	break;
439		419
440	return op;	420	return op;
441	}	421	}
…		…
484	}	464	}
485		465
486	op->key_values = 0;	466	op->key_values = 0;
487	}	467	}
488		468
489	void object::clear ()
490	{
491	attachable_base::clear ();
492
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	/*	469	/*
532	* copy_to first frees everything allocated by the dst object,	470	* copy_to first frees everything allocated by the dst object,
533	* and then copies the contents of itself into the second	471	* and then copies the contents of itself into the second
534	* object, allocating what needs to be allocated. Basically, any	472	* object, allocating what needs to be allocated. Basically, any
535	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	473	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
…		…
541	{	479	{
542	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	480	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
543	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	481	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
544		482
545	*(object_copy *)dst = *this;	483	*(object_copy *)dst = *this;
546	*(object_pod *)dst = *this;
547
548	if (self || cb)
549	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
550		484
551	if (is_freed)	485	if (is_freed)
552	SET_FLAG (dst, FLAG_FREED);	486	SET_FLAG (dst, FLAG_FREED);
553		487
554	if (is_removed)	488	if (is_removed)
…		…
585	tail = new_link;	519	tail = new_link;
586	}	520	}
587	}	521	}
588	}	522	}
589		523
590	update_ob_speed (dst);	524	dst->set_speed (dst->speed);
591	}	525	}
592		526
593	object *	527	object *
594	object::clone ()	528	object::clone ()
595	{	529	{
…		…
601	/*	535	/*
602	* If an object with the IS_TURNABLE() flag needs to be turned due	536	* If an object with the IS_TURNABLE() flag needs to be turned due
603	* to the closest player being on the other side, this function can	537	* to the closest player being on the other side, this function can
604	* be called to update the face variable, _and_ how it looks on the map.	538	* be called to update the face variable, _and_ how it looks on the map.
605	*/	539	*/
606
607	void	540	void
608	update_turn_face (object *op)	541	update_turn_face (object *op)
609	{	542	{
610	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	543	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
611	return;	544	return;
		545
612	SET_ANIMATION (op, op->direction);	546	SET_ANIMATION (op, op->direction);
613	update_object (op, UP_OBJ_FACE);	547	update_object (op, UP_OBJ_FACE);
614	}	548	}
615		549
616	/*	550	/*
617	* Updates the speed of an object. If the speed changes from 0 to another	551	* Updates the speed of an object. If the speed changes from 0 to another
618	* value, or vice versa, then add/remove the object from the active list.	552	* value, or vice versa, then add/remove the object from the active list.
619	* This function needs to be called whenever the speed of an object changes.	553	* This function needs to be called whenever the speed of an object changes.
620	*/	554	*/
621	void	555	void
622	update_ob_speed (object *op)	556	object::set_speed (float speed)
623	{	557	{
624	extern int arch_init;	558	if (flag [FLAG_FREED] && speed)
625
626	/* No reason putting the archetypes objects on the speed list,
627	* since they never really need to be updated.
628	*/
629
630	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
631	{	559	{
632	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	560	LOG (llevError, "Object %s is freed but has speed.\n", &name);
633	#ifdef MANY_CORES
634	abort ();
635	#else
636	op->speed = 0;	561	speed = 0;
637	#endif
638	}
639
640	if (arch_init)
641	return;
642
643	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
644	{	562	}
645	/* If already on active list, don't do anything */
646	if (op->active_next || op->active_prev || op == active_objects)
647	return;
648		563
649	/* process_events() expects us to insert the object at the beginning	564	this->speed = speed;
650	* of the list. */
651	op->active_next = active_objects;
652		565
653	if (op->active_next != NULL)	566	if (has_active_speed ())
654	op->active_next->active_prev = op;	567	activate ();
655
656	active_objects = op;
657	}
658	else	568	else
659	{	569	deactivate ();
660	/* If not on the active list, nothing needs to be done */
661	if (!op->active_next && !op->active_prev && op != active_objects)
662	return;
663
664	if (op->active_prev == NULL)
665	{
666	active_objects = op->active_next;
667
668	if (op->active_next != NULL)
669	op->active_next->active_prev = NULL;
670	}
671	else
672	{
673	op->active_prev->active_next = op->active_next;
674
675	if (op->active_next)
676	op->active_next->active_prev = op->active_prev;
677	}
678
679	op->active_next = NULL;
680	op->active_prev = NULL;
681	}
682	}	570	}
683		571
684	/* This function removes object 'op' from the list of active
685	* objects.
686	* This should only be used for style maps or other such
687	* reference maps where you don't want an object that isn't
688	* in play chewing up cpu time getting processed.
689	* The reverse of this is to call update_ob_speed, which
690	* will do the right thing based on the speed of the object.
691	*/
692	void
693	remove_from_active_list (object *op)
694	{
695	/* If not on the active list, nothing needs to be done */
696	if (!op->active_next && !op->active_prev && op != active_objects)
697	return;
698
699	if (op->active_prev == NULL)
700	{
701	active_objects = op->active_next;
702	if (op->active_next != NULL)
703	op->active_next->active_prev = NULL;
704	}
705	else
706	{
707	op->active_prev->active_next = op->active_next;
708	if (op->active_next)
709	op->active_next->active_prev = op->active_prev;
710	}
711	op->active_next = NULL;
712	op->active_prev = NULL;
713	}
714
715	/*	572	/*
716	* update_object() updates the array which represents the map.	573	* update_object() updates the the map.
717	* It takes into account invisible objects (and represent squares covered	574	* It takes into account invisible objects (and represent squares covered
718	* by invisible objects by whatever is below them (unless it's another	575	* by invisible objects by whatever is below them (unless it's another
719	* invisible object, etc...)	576	* invisible object, etc...)
720	* If the object being updated is beneath a player, the look-window	577	* If the object being updated is beneath a player, the look-window
721	* of that player is updated (this might be a suboptimal way of	578	* of that player is updated (this might be a suboptimal way of
722	* updating that window, though, since update_object() is called _often_)	579	* updating that window, though, since update_object() is called _often_)
723	*	580	*
724	* action is a hint of what the caller believes need to be done.	581	* action is a hint of what the caller believes need to be done.
725	* For example, if the only thing that has changed is the face (due to
726	* an animation), we don't need to call update_position until that actually
727	* comes into view of a player. OTOH, many other things, like addition/removal
728	* of walls or living creatures may need us to update the flags now.
729	* current action are:	582	* current action are:
730	* UP_OBJ_INSERT: op was inserted	583	* UP_OBJ_INSERT: op was inserted
731	* UP_OBJ_REMOVE: op was removed	584	* UP_OBJ_REMOVE: op was removed
732	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	585	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
733	* as that is easier than trying to look at what may have changed.	586	* as that is easier than trying to look at what may have changed.
734	* UP_OBJ_FACE: only the objects face has changed.	587	* UP_OBJ_FACE: only the objects face has changed.
735	*/	588	*/
736
737	void	589	void
738	update_object (object *op, int action)	590	update_object (object *op, int action)
739	{	591	{
740	int update_now = 0, flags;
741	MoveType move_on, move_off, move_block, move_slow;	592	MoveType move_on, move_off, move_block, move_slow;
742		593
743	if (op == NULL)	594	if (op == NULL)
744	{	595	{
745	/* this should never happen */	596	/* this should never happen */
746	LOG (llevDebug, "update_object() called for NULL object.\n");	597	LOG (llevDebug, "update_object() called for NULL object.\n");
747	return;	598	return;
748	}	599	}
749		600
750	if (op->env != NULL)	601	if (op->env)
751	{	602	{
752	/* Animation is currently handled by client, so nothing	603	/* Animation is currently handled by client, so nothing
753	* to do in this case.	604	* to do in this case.
754	*/	605	*/
755	return;	606	return;
…		…
760	*/	611	*/
761	if (!op->map || op->map->in_memory == MAP_SAVING)	612	if (!op->map || op->map->in_memory == MAP_SAVING)
762	return;	613	return;
763		614
764	/* make sure the object is within map boundaries */	615	/* make sure the object is within map boundaries */
765	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	616	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
766	{	617	{
767	LOG (llevError, "update_object() called for object out of map!\n");	618	LOG (llevError, "update_object() called for object out of map!\n");
768	#ifdef MANY_CORES	619	#ifdef MANY_CORES
769	abort ();	620	abort ();
770	#endif	621	#endif
771	return;	622	return;
772	}	623	}
773		624
774	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	625	mapspace &m = op->ms ();
775	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
776	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
777	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
778	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
779	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
780		626
		627	if (!(m.flags_ & P_UPTODATE))
		628	/* nop */;
781	if (action == UP_OBJ_INSERT)	629	else if (action == UP_OBJ_INSERT)
782	{	630	{
		631	// this is likely overkill, TODO: revisit (schmorp)
783	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	632	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
784	update_now = 1;
785
786	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	633	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
787	update_now = 1;	634	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
788		635	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		636	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
789	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	637	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
790	update_now = 1;
791
792	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
793	update_now = 1;
794
795	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
796	update_now = 1;
797
798	if ((move_on | op->move_on) != move_on)	638	|| (m.move_on | op->move_on ) != m.move_on
799	update_now = 1;
800
801	if ((move_off | op->move_off) != move_off)	639	|| (m.move_off | op->move_off ) != m.move_off
802	update_now = 1;	640	|| (m.move_slow | op->move_slow) != m.move_slow
803
804	/* This isn't perfect, but I don't expect a lot of objects to	641	/* This isn't perfect, but I don't expect a lot of objects to
805	* to have move_allow right now.	642	* to have move_allow right now.
806	*/	643	*/
807	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	644	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
808	update_now = 1;	645	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
809		646	m.flags_ = 0;
810	if ((move_slow | op->move_slow) != move_slow)
811	update_now = 1;
812	}	647	}
813
814	/* if the object is being removed, we can't make intelligent	648	/* if the object is being removed, we can't make intelligent
815	* decisions, because remove_ob can't really pass the object	649	* decisions, because remove_ob can't really pass the object
816	* that is being removed.	650	* that is being removed.
817	*/	651	*/
818	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	652	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
819	update_now = 1;	653	m.flags_ = 0;
820	else if (action == UP_OBJ_FACE)	654	else if (action == UP_OBJ_FACE)
821	/* Nothing to do for that case */ ;	655	/* Nothing to do for that case */ ;
822	else	656	else
823	LOG (llevError, "update_object called with invalid action: %d\n", action);	657	LOG (llevError, "update_object called with invalid action: %d\n", action);
824		658
825	if (update_now)
826	{
827	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
828	update_position (op->map, op->x, op->y);
829	}
830
831	if (op->more != NULL)	659	if (op->more)
832	update_object (op->more, action);	660	update_object (op->more, action);
833	}	661	}
834		662
835	object::vector object::mortals;
836	object::vector object::objects; // not yet used
837	object *object::first;	663	object *object::first;
838
839	void object::free_mortals ()
840	{
841	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
842	if ((*i)->refcnt)
843	++i; // further delay freeing
844	else
845	{
846	delete *i;
847	mortals.erase (i);
848	}
849	}
850		664
851	object::object ()	665	object::object ()
852	{	666	{
853	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
854		668
…		…
861	free_key_values (this);	675	free_key_values (this);
862	}	676	}
863		677
864	void object::link ()	678	void object::link ()
865	{	679	{
866	count = ++ob_count;
867	uuid = gen_uuid ();	680	uuid = gen_uuid ();
868		681
869	prev = 0;	682	objects.insert (this);
870	next = object::first;
871
872	if (object::first)
873	object::first->prev = this;
874
875	object::first = this;
876	}	683	}
877		684
878	void object::unlink ()	685	void object::unlink ()
879	{	686	{
880	if (this == object::first)	687	objects.erase (this);
881	object::first = next;	688	}
882		689
883	/* Remove this object from the list of used objects */	690	void
884	if (prev) prev->next = next;	691	object::activate ()
885	if (next) next->prev = prev;	692	{
		693	/* If already on active list, don't do anything */
		694	if (active)
		695	return;
886		696
887	prev = 0;	697	if (has_active_speed ())
888	next = 0;	698	actives.insert (this);
		699	}
		700
		701	void
		702	object::activate_recursive ()
		703	{
		704	activate ();
		705
		706	for (object *op = inv; op; op = op->below)
		707	op->activate_recursive ();
		708	}
		709
		710	/* This function removes object 'op' from the list of active
		711	* objects.
		712	* This should only be used for style maps or other such
		713	* reference maps where you don't want an object that isn't
		714	* in play chewing up cpu time getting processed.
		715	* The reverse of this is to call update_ob_speed, which
		716	* will do the right thing based on the speed of the object.
		717	*/
		718	void
		719	object::deactivate ()
		720	{
		721	/* If not on the active list, nothing needs to be done */
		722	if (!active)
		723	return;
		724
		725	actives.erase (this);
		726	}
		727
		728	void
		729	object::deactivate_recursive ()
		730	{
		731	for (object *op = inv; op; op = op->below)
		732	op->deactivate_recursive ();
		733
		734	deactivate ();
		735	}
		736
		737	void
		738	object::set_flag_inv (int flag, int value)
		739	{
		740	for (object *op = inv; op; op = op->below)
		741	{
		742	op->flag [flag] = value;
		743	op->set_flag_inv (flag, value);
		744	}
		745	}
		746
		747	/*
		748	* Remove and free all objects in the inventory of the given object.
		749	* object.c ?
		750	*/
		751	void
		752	object::destroy_inv (bool drop_to_ground)
		753	{
		754	// need to check first, because the checks below might segfault
		755	// as we might be on an invalid mapspace and crossfire code
		756	// is too buggy to ensure that the inventory is empty.
		757	// corollary: if you create arrows etc. with stuff in tis inventory,
		758	// cf will crash below with off-map x and y
		759	if (!inv)
		760	return;
		761
		762	/* Only if the space blocks everything do we not process -
		763	* if some form of movement is allowed, let objects
		764	* drop on that space.
		765	*/
		766	if (!drop_to_ground
		767	|| !map
		768	|| map->in_memory != MAP_IN_MEMORY
		769	|| ms ().move_block == MOVE_ALL)
		770	{
		771	while (inv)
		772	{
		773	inv->destroy_inv (drop_to_ground);
		774	inv->destroy ();
		775	}
		776	}
		777	else
		778	{ /* Put objects in inventory onto this space */
		779	while (inv)
		780	{
		781	object *op = inv;
		782
		783	if (op->flag [FLAG_STARTEQUIP]
		784	|| op->flag [FLAG_NO_DROP]
		785	|| op->type == RUNE
		786	|| op->type == TRAP
		787	|| op->flag [FLAG_IS_A_TEMPLATE])
		788	op->destroy ();
		789	else
		790	map->insert (op, x, y);
		791	}
		792	}
889	}	793	}
890		794
891	object *object::create ()	795	object *object::create ()
892	{	796	{
893	object *op = new object;	797	object *op = new object;
894	op->link ();	798	op->link ();
895	return op;	799	return op;
896	}	800	}
897		801
898	/*	802	void
899	* free_object() frees everything allocated by an object, removes	803	object::do_destroy ()
900	* it from the list of used objects, and puts it on the list of
901	* free objects. The IS_FREED() flag is set in the object.
902	* The object must have been removed by remove_ob() first for
903	* this function to succeed.
904	*
905	* If destroy_inventory is set, free inventory as well. Else drop items in
906	* inventory to the ground.
907	*/
908	void object::destroy (bool destroy_inventory)
909	{	804	{
910	if (QUERY_FLAG (this, FLAG_FREED))	805	if (flag [FLAG_IS_LINKED])
		806	remove_button_link (this);
		807
		808	if (flag [FLAG_FRIENDLY])
		809	remove_friendly_object (this);
		810
		811	if (!flag [FLAG_REMOVED])
		812	remove ();
		813
		814	if (flag [FLAG_FREED])
911	return;	815	return;
912		816
913	if (QUERY_FLAG (this, FLAG_FRIENDLY))	817	set_speed (0);
914	remove_friendly_object (this);
915		818
916	if (!QUERY_FLAG (this, FLAG_REMOVED))	819	flag [FLAG_FREED] = 1;
917	remove ();
918		820
919	SET_FLAG (this, FLAG_FREED);	821	attachable::do_destroy ();
920		822
921	if (more)	823	destroy_inv (true);
922	{	824	unlink ();
923	more->destroy (destroy_inventory);
924	more = 0;
925	}
926
927	if (inv)
928	{
929	/* Only if the space blocks everything do we not process -
930	* if some form of movement is allowed, let objects
931	* drop on that space.
932	*/
933	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
934	{
935	object *op = inv;
936
937	while (op)
938	{
939	object *tmp = op->below;
940	op->destroy (destroy_inventory);
941	op = tmp;
942	}
943	}
944	else
945	{ /* Put objects in inventory onto this space */
946	object *op = inv;
947
948	while (op)
949	{
950	object *tmp = op->below;
951
952	op->remove ();
953
954	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
955	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
956	op->destroy ();
957	else
958	{
959	op->x = x;
960	op->y = y;
961	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
962	}
963
964	op = tmp;
965	}
966	}
967	}
968		825
969	// hack to ensure that freed objects still have a valid map	826	// hack to ensure that freed objects still have a valid map
970	{	827	{
971	static maptile *freed_map; // freed objects are moved here to avoid crashes	828	static maptile *freed_map; // freed objects are moved here to avoid crashes
972		829
…		…
976		833
977	freed_map->name = "/internal/freed_objects_map";	834	freed_map->name = "/internal/freed_objects_map";
978	freed_map->width = 3;	835	freed_map->width = 3;
979	freed_map->height = 3;	836	freed_map->height = 3;
980		837
981	freed_map->allocate ();	838	freed_map->alloc ();
		839	freed_map->in_memory = MAP_IN_MEMORY;
982	}	840	}
983		841
984	map = freed_map;	842	map = freed_map;
985	x = 1;	843	x = 1;
986	y = 1;	844	y = 1;
987	}	845	}
988		846
		847	head = 0;
		848
		849	if (more)
		850	{
		851	more->destroy ();
		852	more = 0;
		853	}
		854
989	// clear those pointers that likely might have circular references to us	855	// clear those pointers that likely might have circular references to us
990	owner = 0;	856	owner = 0;
991	enemy = 0;	857	enemy = 0;
992	attacked_by = 0;	858	attacked_by = 0;
		859	}
993		860
994	// only relevant for players(?), but make sure of it anyways	861	void
995	contr = 0;	862	object::destroy (bool destroy_inventory)
		863	{
		864	if (destroyed ())
		865	return;
996		866
997	/* Remove object from the active list */	867	if (destroy_inventory)
998	speed = 0;	868	destroy_inv (false);
999	update_ob_speed (this);
1000		869
1001	unlink ();	870	attachable::destroy ();
1002
1003	mortals.push_back (this);
1004	}	871	}
1005		872
1006	/*	873	/*
1007	* sub_weight() recursively (outwards) subtracts a number from the	874	* sub_weight() recursively (outwards) subtracts a number from the
1008	* weight of an object (and what is carried by it's environment(s)).	875	* weight of an object (and what is carried by it's environment(s)).
…		…
1032	object::remove ()	899	object::remove ()
1033	{	900	{
1034	object *tmp, *last = 0;	901	object *tmp, *last = 0;
1035	object *otmp;	902	object *otmp;
1036		903
1037	int check_walk_off;
1038
1039	if (QUERY_FLAG (this, FLAG_REMOVED))	904	if (QUERY_FLAG (this, FLAG_REMOVED))
1040	return;	905	return;
1041		906
1042	SET_FLAG (this, FLAG_REMOVED);	907	SET_FLAG (this, FLAG_REMOVED);
		908	INVOKE_OBJECT (REMOVE, this);
1043		909
1044	if (more)	910	if (more)
1045	more->remove ();	911	more->remove ();
1046		912
1047	/*	913	/*
…		…
1057		923
1058	/* NO_FIX_PLAYER is set when a great many changes are being	924	/* NO_FIX_PLAYER is set when a great many changes are being
1059	* made to players inventory. If set, avoiding the call	925	* made to players inventory. If set, avoiding the call
1060	* to save cpu time.	926	* to save cpu time.
1061	*/	927	*/
1062	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	928	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063	fix_player (otmp);	929	otmp->update_stats ();
1064		930
1065	if (above != NULL)	931	if (above)
1066	above->below = below;	932	above->below = below;
1067	else	933	else
1068	env->inv = below;	934	env->inv = below;
1069		935
1070	if (below != NULL)	936	if (below)
1071	below->above = above;	937	below->above = above;
1072		938
1073	/* we set up values so that it could be inserted into	939	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up	940	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.	941	* to the caller to decide what we want to do.
…		…
1079	above = 0, below = 0;	945	above = 0, below = 0;
1080	env = 0;	946	env = 0;
1081	}	947	}
1082	else if (map)	948	else if (map)
1083	{	949	{
1084	/* Re did the following section of code - it looks like it had	950	if (type == PLAYER)
1085	* lots of logic for things we no longer care about
1086	*/	951	{
		952	--map->players;
		953	map->touch ();
		954	}
		955
		956	map->dirty = true;
1087		957
1088	/* link the object above us */	958	/* link the object above us */
1089	if (above)	959	if (above)
1090	above->below = below;	960	above->below = below;
1091	else	961	else
1092	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	962	map->at (x, y).top = below; /* we were top, set new top */
1093		963
1094	/* Relink the object below us, if there is one */	964	/* Relink the object below us, if there is one */
1095	if (below)	965	if (below)
1096	below->above = above;	966	below->above = above;
1097	else	967	else
…		…
1109	dump = dump_object (GET_MAP_OB (map, x, y));	979	dump = dump_object (GET_MAP_OB (map, x, y));
1110	LOG (llevError, "%s\n", dump);	980	LOG (llevError, "%s\n", dump);
1111	free (dump);	981	free (dump);
1112	}	982	}
1113		983
1114	SET_MAP_OB (map, x, y, above); /* goes on above it. */	984	map->at (x, y).bot = above; /* goes on above it. */
1115	}	985	}
1116		986
1117	above = 0;	987	above = 0;
1118	below = 0;	988	below = 0;
1119		989
1120	if (map->in_memory == MAP_SAVING)	990	if (map->in_memory == MAP_SAVING)
1121	return;	991	return;
1122		992
1123	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	993	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		994
1125	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	995	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1126	{	996	{
1127	/* No point updating the players look faces if he is the object	997	/* No point updating the players look faces if he is the object
1128	* being removed.	998	* being removed.
1129	*/	999	*/
1130		1000
…		…
1134	* removed (most likely destroyed), update the player view	1004	* removed (most likely destroyed), update the player view
1135	* appropriately.	1005	* appropriately.
1136	*/	1006	*/
1137	if (tmp->container == this)	1007	if (tmp->container == this)
1138	{	1008	{
1139	CLEAR_FLAG (this, FLAG_APPLIED);	1009	flag [FLAG_APPLIED] = 0;
1140	tmp->container = 0;	1010	tmp->container = 0;
1141	}	1011	}
1142		1012
1143	tmp->contr->socket.update_look = 1;	1013	if (tmp->contr->ns)
		1014	tmp->contr->ns->floorbox_update ();
1144	}	1015	}
1145		1016
1146	/* See if player moving off should effect something */	1017	/* See if object moving off should effect something */
1147	if (check_walk_off	1018	if (check_walk_off
1148	&& ((move_type & tmp->move_off)	1019	&& ((move_type & tmp->move_off)
1149	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1020	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1150	{	1021	{
1151	move_apply (tmp, this, 0);	1022	move_apply (tmp, this, 0);
…		…
1153	if (destroyed ())	1024	if (destroyed ())
1154	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1025	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1155	}	1026	}
1156		1027
1157	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1028	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1158		1029	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1159	if (tmp->above == tmp)	1030	if (tmp->above == tmp)
1160	tmp->above = 0;	1031	tmp->above = 0;
1161		1032
1162	last = tmp;	1033	last = tmp;
1163	}	1034	}
1164		1035
1165	/* last == NULL of there are no objects on this space */	1036	/* last == NULL if there are no objects on this space */
		1037	//TODO: this makes little sense, why only update the topmost object?
1166	if (!last)	1038	if (!last)
1167	{	1039	map->at (x, y).flags_ = 0;
1168	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1169	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1170	* those out anyways, and if there are any flags set right now, they won't
1171	* be correct anyways.
1172	*/
1173	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1174	update_position (map, x, y);
1175	}
1176	else	1040	else
1177	update_object (last, UP_OBJ_REMOVE);	1041	update_object (last, UP_OBJ_REMOVE);
1178		1042
1179	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1043	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1180	update_all_los (map, x, y);	1044	update_all_los (map, x, y);
1181	}	1045	}
1182	}	1046	}
1183		1047
1184	/*	1048	/*
…		…
1193	merge_ob (object *op, object *top)	1057	merge_ob (object *op, object *top)
1194	{	1058	{
1195	if (!op->nrof)	1059	if (!op->nrof)
1196	return 0;	1060	return 0;
1197		1061
1198	if (top == NULL)	1062	if (top)
1199	for (top = op; top != NULL && top->above != NULL; top = top->above);	1063	for (top = op; top && top->above; top = top->above)
		1064	;
1200		1065
1201	for (; top != NULL; top = top->below)	1066	for (; top; top = top->below)
1202	{	1067	{
1203	if (top == op)	1068	if (top == op)
1204	continue;	1069	continue;
1205	if (CAN_MERGE (op, top))	1070
		1071	if (object::can_merge (op, top))
1206	{	1072	{
1207	top->nrof += op->nrof;	1073	top->nrof += op->nrof;
1208		1074
1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1075	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1210	op->weight = 0; /* Don't want any adjustements now */	1076	op->weight = 0; /* Don't want any adjustements now */
…		…
1221	* job preparing multi-part monsters	1087	* job preparing multi-part monsters
1222	*/	1088	*/
1223	object *	1089	object *
1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1090	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1225	{	1091	{
1226	object *tmp;
1227
1228	if (op->head)
1229	op = op->head;
1230
1231	for (tmp = op; tmp; tmp = tmp->more)	1092	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1232	{	1093	{
1233	tmp->x = x + tmp->arch->clone.x;	1094	tmp->x = x + tmp->arch->clone.x;
1234	tmp->y = y + tmp->arch->clone.y;	1095	tmp->y = y + tmp->arch->clone.y;
1235	}	1096	}
1236		1097
…		…
1255	* Return value:	1116	* Return value:
1256	* new object if 'op' was merged with other object	1117	* new object if 'op' was merged with other object
1257	* NULL if 'op' was destroyed	1118	* NULL if 'op' was destroyed
1258	* just 'op' otherwise	1119	* just 'op' otherwise
1259	*/	1120	*/
1260
1261	object *	1121	object *
1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1122	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1263	{	1123	{
1264	object *tmp, *top, *floor = NULL;	1124	object *tmp, *top, *floor = NULL;
1265	sint16 x, y;	1125	sint16 x, y;
…		…
1268	{	1128	{
1269	LOG (llevError, "Trying to insert freed object!\n");	1129	LOG (llevError, "Trying to insert freed object!\n");
1270	return NULL;	1130	return NULL;
1271	}	1131	}
1272		1132
1273	if (m == NULL)	1133	if (!m)
1274	{	1134	{
1275	char *dump = dump_object (op);	1135	char *dump = dump_object (op);
1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1136	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1277	free (dump);	1137	free (dump);
1278	return op;	1138	return op;
…		…
1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1159	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1300	free (dump);	1160	free (dump);
1301	return op;	1161	return op;
1302	}	1162	}
1303		1163
1304	if (op->more != NULL)	1164	if (op->more)
1305	{	1165	{
1306	/* The part may be on a different map. */	1166	/* The part may be on a different map. */
1307		1167
1308	object *more = op->more;	1168	object *more = op->more;
1309		1169
1310	/* We really need the caller to normalize coordinates - if	1170	/* We really need the caller to normalise coordinates - if
1311	* we set the map, that doesn't work if the location is within	1171	* we set the map, that doesn't work if the location is within
1312	* a map and this is straddling an edge. So only if coordinate	1172	* a map and this is straddling an edge. So only if coordinate
1313	* is clear wrong do we normalize it.	1173	* is clear wrong do we normalise it.
1314	*/	1174	*/
1315	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1175	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1316	more->map = get_map_from_coord (m, &more->x, &more->y);	1176	more->map = get_map_from_coord (m, &more->x, &more->y);
1317	else if (!more->map)	1177	else if (!more->map)
1318	{	1178	{
…		…
1325	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1185	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1326	{	1186	{
1327	if (!op->head)	1187	if (!op->head)
1328	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1188	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1329		1189
1330	return NULL;	1190	return 0;
1331	}	1191	}
1332	}	1192	}
1333		1193
1334	CLEAR_FLAG (op, FLAG_REMOVED);	1194	CLEAR_FLAG (op, FLAG_REMOVED);
1335		1195
…		…
1342	y = op->y;	1202	y = op->y;
1343		1203
1344	/* this has to be done after we translate the coordinates.	1204	/* this has to be done after we translate the coordinates.
1345	*/	1205	*/
1346	if (op->nrof && !(flag & INS_NO_MERGE))	1206	if (op->nrof && !(flag & INS_NO_MERGE))
1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1207	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1348	if (CAN_MERGE (op, tmp))	1208	if (object::can_merge (op, tmp))
1349	{	1209	{
1350	op->nrof += tmp->nrof;	1210	op->nrof += tmp->nrof;
1351	tmp->destroy ();	1211	tmp->destroy ();
1352	}	1212	}
1353		1213
…		…
1369	op->below = originator->below;	1229	op->below = originator->below;
1370		1230
1371	if (op->below)	1231	if (op->below)
1372	op->below->above = op;	1232	op->below->above = op;
1373	else	1233	else
1374	SET_MAP_OB (op->map, op->x, op->y, op);	1234	op->ms ().bot = op;
1375		1235
1376	/* since *below* originator, no need to update top */	1236	/* since *below* originator, no need to update top */
1377	originator->below = op;	1237	originator->below = op;
1378	}	1238	}
1379	else	1239	else
1380	{	1240	{
1381	/* If there are other objects, then */	1241	/* If there are other objects, then */
1382	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1242	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1383	{	1243	{
1384	object *last = NULL;	1244	object *last = 0;
1385		1245
1386	/*	1246	/*
1387	* If there are multiple objects on this space, we do some trickier handling.	1247	* If there are multiple objects on this space, we do some trickier handling.
1388	* We've already dealt with merging if appropriate.	1248	* We've already dealt with merging if appropriate.
1389	* Generally, we want to put the new object on top. But if	1249	* Generally, we want to put the new object on top. But if
…		…
1393	* once we get to them. This reduces the need to traverse over all of	1253	* once we get to them. This reduces the need to traverse over all of
1394	* them when adding another one - this saves quite a bit of cpu time	1254	* them when adding another one - this saves quite a bit of cpu time
1395	* when lots of spells are cast in one area. Currently, it is presumed	1255	* when lots of spells are cast in one area. Currently, it is presumed
1396	* that flying non pickable objects are spell objects.	1256	* that flying non pickable objects are spell objects.
1397	*/	1257	*/
1398
1399	while (top != NULL)	1258	while (top)
1400	{	1259	{
1401	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1260	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1402	floor = top;	1261	floor = top;
1403		1262
1404	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1263	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1425	* If INS_ON_TOP is used, don't do this processing	1284	* If INS_ON_TOP is used, don't do this processing
1426	* Need to find the object that in fact blocks view, otherwise	1285	* Need to find the object that in fact blocks view, otherwise
1427	* stacking is a bit odd.	1286	* stacking is a bit odd.
1428	*/	1287	*/
1429	if (!(flag & INS_ON_TOP) &&	1288	if (!(flag & INS_ON_TOP) &&
1430	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1289	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1431	{	1290	{
1432	for (last = top; last != floor; last = last->below)	1291	for (last = top; last != floor; last = last->below)
1433	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1292	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1434	break;	1293	break;
1435	/* Check to see if we found the object that blocks view,	1294	/* Check to see if we found the object that blocks view,
…		…
1457	op->above = GET_MAP_OB (op->map, op->x, op->y);	1316	op->above = GET_MAP_OB (op->map, op->x, op->y);
1458		1317
1459	if (op->above)	1318	if (op->above)
1460	op->above->below = op;	1319	op->above->below = op;
1461		1320
1462	op->below = NULL;	1321	op->below = 0;
1463	SET_MAP_OB (op->map, op->x, op->y, op);	1322	op->ms ().bot = op;
1464	}	1323	}
1465	else	1324	else
1466	{ /* get inserted into the stack above top */	1325	{ /* get inserted into the stack above top */
1467	op->above = top->above;	1326	op->above = top->above;
1468		1327
…		…
1471		1330
1472	op->below = top;	1331	op->below = top;
1473	top->above = op;	1332	top->above = op;
1474	}	1333	}
1475		1334
1476	if (op->above == NULL)	1335	if (!op->above)
1477	SET_MAP_TOP (op->map, op->x, op->y, op);	1336	op->ms ().top = op;
1478	} /* else not INS_BELOW_ORIGINATOR */	1337	} /* else not INS_BELOW_ORIGINATOR */
1479		1338
1480	if (op->type == PLAYER)	1339	if (op->type == PLAYER)
		1340	{
1481	op->contr->do_los = 1;	1341	op->contr->do_los = 1;
		1342	++op->map->players;
		1343	op->map->touch ();
		1344	}
		1345
		1346	op->map->dirty = true;
1482		1347
1483	/* If we have a floor, we know the player, if any, will be above	1348	/* If we have a floor, we know the player, if any, will be above
1484	* it, so save a few ticks and start from there.	1349	* it, so save a few ticks and start from there.
1485	*/	1350	*/
1486	if (!(flag & INS_MAP_LOAD))	1351	if (!(flag & INS_MAP_LOAD))
1487	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1352	if (object *pl = op->ms ().player ())
1488	if (tmp->type == PLAYER)	1353	if (pl->contr->ns)
1489	tmp->contr->socket.update_look = 1;	1354	pl->contr->ns->floorbox_update ();
1490		1355
1491	/* If this object glows, it may affect lighting conditions that are	1356	/* If this object glows, it may affect lighting conditions that are
1492	* visible to others on this map. But update_all_los is really	1357	* visible to others on this map. But update_all_los is really
1493	* an inefficient way to do this, as it means los for all players	1358	* an inefficient way to do this, as it means los for all players
1494	* on the map will get recalculated. The players could very well	1359	* on the map will get recalculated. The players could very well
1495	* be far away from this change and not affected in any way -	1360	* be far away from this change and not affected in any way -
1496	* this should get redone to only look for players within range,	1361	* this should get redone to only look for players within range,
1497	* or just updating the P_NEED_UPDATE for spaces within this area	1362	* or just updating the P_UPTODATE for spaces within this area
1498	* of effect may be sufficient.	1363	* of effect may be sufficient.
1499	*/	1364	*/
1500	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1365	if (op->map->darkness && (op->glow_radius != 0))
1501	update_all_los (op->map, op->x, op->y);	1366	update_all_los (op->map, op->x, op->y);
1502		1367
1503	/* updates flags (blocked, alive, no magic, etc) for this map space */	1368	/* updates flags (blocked, alive, no magic, etc) for this map space */
1504	update_object (op, UP_OBJ_INSERT);	1369	update_object (op, UP_OBJ_INSERT);
1505		1370
		1371	INVOKE_OBJECT (INSERT, op);
		1372
1506	/* Don't know if moving this to the end will break anything. However,	1373	/* Don't know if moving this to the end will break anything. However,
1507	* we want to have update_look set above before calling this.	1374	* we want to have floorbox_update called before calling this.
1508	*	1375	*
1509	* check_move_on() must be after this because code called from	1376	* check_move_on() must be after this because code called from
1510	* check_move_on() depends on correct map flags (so functions like	1377	* check_move_on() depends on correct map flags (so functions like
1511	* blocked() and wall() work properly), and these flags are updated by	1378	* blocked() and wall() work properly), and these flags are updated by
1512	* update_object().	1379	* update_object().
…		…
1514		1381
1515	/* if this is not the head or flag has been passed, don't check walk on status */	1382	/* if this is not the head or flag has been passed, don't check walk on status */
1516	if (!(flag & INS_NO_WALK_ON) && !op->head)	1383	if (!(flag & INS_NO_WALK_ON) && !op->head)
1517	{	1384	{
1518	if (check_move_on (op, originator))	1385	if (check_move_on (op, originator))
1519	return NULL;	1386	return 0;
1520		1387
1521	/* If we are a multi part object, lets work our way through the check	1388	/* If we are a multi part object, lets work our way through the check
1522	* walk on's.	1389	* walk on's.
1523	*/	1390	*/
1524	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1391	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1525	if (check_move_on (tmp, originator))	1392	if (check_move_on (tmp, originator))
1526	return NULL;	1393	return 0;
1527	}	1394	}
1528		1395
1529	return op;	1396	return op;
1530	}	1397	}
1531		1398
1532	/* this function inserts an object in the map, but if it	1399	/* this function inserts an object in the map, but if it
1533	* finds an object of its own type, it'll remove that one first.	1400	* finds an object of its own type, it'll remove that one first.
1534	* op is the object to insert it under: supplies x and the map.	1401	* op is the object to insert it under: supplies x and the map.
1535	*/	1402	*/
1536	void	1403	void
1537	replace_insert_ob_in_map (const char *arch_string, object *op)	1404	replace_insert_ob_in_map (const char *arch_string, object *op)
1538	{	1405	{
1539	object *	1406	object *tmp, *tmp1;
1540	tmp;
1541	object *
1542	tmp1;
1543		1407
1544	/* first search for itself and remove any old instances */	1408	/* first search for itself and remove any old instances */
1545		1409
1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1410	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1411	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548	tmp->destroy ();	1412	tmp->destroy ();
1549		1413
1550	tmp1 = arch_to_object (archetype::find (arch_string));	1414	tmp1 = arch_to_object (archetype::find (arch_string));
1551		1415
1552	tmp1->x = op->x;	1416	tmp1->x = op->x;
1553	tmp1->y = op->y;	1417	tmp1->y = op->y;
1554	insert_ob_in_map (tmp1, op->map, op, 0);	1418	insert_ob_in_map (tmp1, op->map, op, 0);
		1419	}
		1420
		1421	object *
		1422	object::insert_at (object *where, object *originator, int flags)
		1423	{
		1424	where->map->insert (this, where->x, where->y, originator, flags);
1555	}	1425	}
1556		1426
1557	/*	1427	/*
1558	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1428	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1559	* is returned contains nr objects, and the remaining parts contains	1429	* is returned contains nr objects, and the remaining parts contains
1560	* the rest (or is removed and freed if that number is 0).	1430	* the rest (or is removed and freed if that number is 0).
1561	* On failure, NULL is returned, and the reason put into the	1431	* On failure, NULL is returned, and the reason put into the
1562	* global static errmsg array.	1432	* global static errmsg array.
1563	*/	1433	*/
1564
1565	object *	1434	object *
1566	get_split_ob (object *orig_ob, uint32 nr)	1435	get_split_ob (object *orig_ob, uint32 nr)
1567	{	1436	{
1568	object *newob;	1437	object *newob;
1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1438	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1605		1474
1606	object *	1475	object *
1607	decrease_ob_nr (object *op, uint32 i)	1476	decrease_ob_nr (object *op, uint32 i)
1608	{	1477	{
1609	object *tmp;	1478	object *tmp;
1610	player *pl;
1611		1479
1612	if (i == 0) /* objects with op->nrof require this check */	1480	if (i == 0) /* objects with op->nrof require this check */
1613	return op;	1481	return op;
1614		1482
1615	if (i > op->nrof)	1483	if (i > op->nrof)
1616	i = op->nrof;	1484	i = op->nrof;
1617		1485
1618	if (QUERY_FLAG (op, FLAG_REMOVED))	1486	if (QUERY_FLAG (op, FLAG_REMOVED))
1619	op->nrof -= i;	1487	op->nrof -= i;
1620	else if (op->env != NULL)	1488	else if (op->env)
1621	{	1489	{
1622	/* is this object in the players inventory, or sub container	1490	/* is this object in the players inventory, or sub container
1623	* therein?	1491	* therein?
1624	*/	1492	*/
1625	tmp = is_player_inv (op->env);	1493	tmp = op->in_player ();
1626	/* nope. Is this a container the player has opened?	1494	/* nope. Is this a container the player has opened?
1627	* If so, set tmp to that player.	1495	* If so, set tmp to that player.
1628	* IMO, searching through all the players will mostly	1496	* IMO, searching through all the players will mostly
1629	* likely be quicker than following op->env to the map,	1497	* likely be quicker than following op->env to the map,
1630	* and then searching the map for a player.	1498	* and then searching the map for a player.
1631	*/	1499	*/
1632	if (!tmp)	1500	if (!tmp)
1633	{	1501	for_all_players (pl)
1634	for (pl = first_player; pl; pl = pl->next)
1635	if (pl->ob->container == op->env)	1502	if (pl->ob->container == op->env)
		1503	{
		1504	tmp = pl->ob;
1636	break;	1505	break;
1637	if (pl)
1638	tmp = pl->ob;
1639	else
1640	tmp = NULL;
1641	}	1506	}
1642		1507
1643	if (i < op->nrof)	1508	if (i < op->nrof)
1644	{	1509	{
1645	sub_weight (op->env, op->weight * i);	1510	sub_weight (op->env, op->weight * i);
1646	op->nrof -= i;	1511	op->nrof -= i;
1647	if (tmp)	1512	if (tmp)
1648	{
1649	esrv_send_item (tmp, op);	1513	esrv_send_item (tmp, op);
1650	}
1651	}	1514	}
1652	else	1515	else
1653	{	1516	{
1654	op->remove ();	1517	op->remove ();
1655	op->nrof = 0;	1518	op->nrof = 0;
1656	if (tmp)	1519	if (tmp)
1657	{
1658	esrv_del_item (tmp->contr, op->count);	1520	esrv_del_item (tmp->contr, op->count);
1659	}
1660	}	1521	}
1661	}	1522	}
1662	else	1523	else
1663	{	1524	{
1664	object *above = op->above;	1525	object *above = op->above;
…		…
1670	op->remove ();	1531	op->remove ();
1671	op->nrof = 0;	1532	op->nrof = 0;
1672	}	1533	}
1673		1534
1674	/* Since we just removed op, op->above is null */	1535	/* Since we just removed op, op->above is null */
1675	for (tmp = above; tmp != NULL; tmp = tmp->above)	1536	for (tmp = above; tmp; tmp = tmp->above)
1676	if (tmp->type == PLAYER)	1537	if (tmp->type == PLAYER)
1677	{	1538	{
1678	if (op->nrof)	1539	if (op->nrof)
1679	esrv_send_item (tmp, op);	1540	esrv_send_item (tmp, op);
1680	else	1541	else
…		…
1685	if (op->nrof)	1546	if (op->nrof)
1686	return op;	1547	return op;
1687	else	1548	else
1688	{	1549	{
1689	op->destroy ();	1550	op->destroy ();
1690	return NULL;	1551	return 0;
1691	}	1552	}
1692	}	1553	}
1693		1554
1694	/*	1555	/*
1695	* add_weight(object, weight) adds the specified weight to an object,	1556	* add_weight(object, weight) adds the specified weight to an object,
…		…
1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1616	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1756	CLEAR_FLAG (op, FLAG_REMOVED);	1617	CLEAR_FLAG (op, FLAG_REMOVED);
1757	if (op->nrof)	1618	if (op->nrof)
1758	{	1619	{
1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1620	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1760	if (CAN_MERGE (tmp, op))	1621	if (object::can_merge (tmp, op))
1761	{	1622	{
1762	/* return the original object and remove inserted object	1623	/* return the original object and remove inserted object
1763	(client needs the original object) */	1624	(client needs the original object) */
1764	tmp->nrof += op->nrof;	1625	tmp->nrof += op->nrof;
1765	/* Weight handling gets pretty funky. Since we are adding to	1626	/* Weight handling gets pretty funky. Since we are adding to
…		…
1783	add_weight (this, op->weight * op->nrof);	1644	add_weight (this, op->weight * op->nrof);
1784	}	1645	}
1785	else	1646	else
1786	add_weight (this, (op->weight + op->carrying));	1647	add_weight (this, (op->weight + op->carrying));
1787		1648
1788	otmp = is_player_inv (this);	1649	otmp = this->in_player ();
1789	if (otmp && otmp->contr)	1650	if (otmp && otmp->contr)
1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1651	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1791	fix_player (otmp);	1652	otmp->update_stats ();
1792		1653
1793	op->map = NULL;	1654	op->map = 0;
1794	op->env = this;	1655	op->env = this;
1795	op->above = NULL;	1656	op->above = 0;
1796	op->below = NULL;	1657	op->below = 0;
1797	op->x = 0, op->y = 0;	1658	op->x = 0, op->y = 0;
1798		1659
1799	/* reset the light list and los of the players on the map */	1660	/* reset the light list and los of the players on the map */
1800	if ((op->glow_radius != 0) && map)	1661	if ((op->glow_radius != 0) && map)
1801	{	1662	{
1802	#ifdef DEBUG_LIGHTS	1663	#ifdef DEBUG_LIGHTS
1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1664	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1804	#endif /* DEBUG_LIGHTS */	1665	#endif /* DEBUG_LIGHTS */
1805	if (MAP_DARKNESS (map))	1666	if (map->darkness)
1806	update_all_los (map, x, y);	1667	update_all_los (map, x, y);
1807	}	1668	}
1808		1669
1809	/* Client has no idea of ordering so lets not bother ordering it here.	1670	/* Client has no idea of ordering so lets not bother ordering it here.
1810	* It sure simplifies this function...	1671	* It sure simplifies this function...
…		…
1815	{	1676	{
1816	op->below = inv;	1677	op->below = inv;
1817	op->below->above = op;	1678	op->below->above = op;
1818	inv = op;	1679	inv = op;
1819	}	1680	}
		1681
		1682	INVOKE_OBJECT (INSERT, this);
1820		1683
1821	return op;	1684	return op;
1822	}	1685	}
1823		1686
1824	/*	1687	/*
…		…
1839	*	1702	*
1840	* MSW 2001-07-08: Check all objects on space, not just those below	1703	* MSW 2001-07-08: Check all objects on space, not just those below
1841	* object being inserted. insert_ob_in_map may not put new objects	1704	* object being inserted. insert_ob_in_map may not put new objects
1842	* on top.	1705	* on top.
1843	*/	1706	*/
1844
1845	int	1707	int
1846	check_move_on (object *op, object *originator)	1708	check_move_on (object *op, object *originator)
1847	{	1709	{
1848	object *tmp;	1710	object *tmp;
1849	maptile *m = op->map;	1711	maptile *m = op->map;
…		…
1876		1738
1877	/* The objects have to be checked from top to bottom.	1739	/* The objects have to be checked from top to bottom.
1878	* Hence, we first go to the top:	1740	* Hence, we first go to the top:
1879	*/	1741	*/
1880		1742
1881	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1743	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1882	{	1744	{
1883	/* Trim the search when we find the first other spell effect	1745	/* Trim the search when we find the first other spell effect
1884	* this helps performance so that if a space has 50 spell objects,	1746	* this helps performance so that if a space has 50 spell objects,
1885	* we don't need to check all of them.	1747	* we don't need to check all of them.
1886	*/	1748	*/
…		…
1941	/*	1803	/*
1942	* present_arch(arch, map, x, y) searches for any objects with	1804	* present_arch(arch, map, x, y) searches for any objects with
1943	* a matching archetype at the given map and coordinates.	1805	* a matching archetype at the given map and coordinates.
1944	* The first matching object is returned, or NULL if none.	1806	* The first matching object is returned, or NULL if none.
1945	*/	1807	*/
1946
1947	object *	1808	object *
1948	present_arch (const archetype *at, maptile *m, int x, int y)	1809	present_arch (const archetype *at, maptile *m, int x, int y)
1949	{	1810	{
1950	object *
1951	tmp;
1952
1953	if (m == NULL || out_of_map (m, x, y))	1811	if (!m || out_of_map (m, x, y))
1954	{	1812	{
1955	LOG (llevError, "Present_arch called outside map.\n");	1813	LOG (llevError, "Present_arch called outside map.\n");
1956	return NULL;	1814	return NULL;
1957	}	1815	}
1958	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1816
		1817	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1959	if (tmp->arch == at)	1818	if (tmp->arch == at)
1960	return tmp;	1819	return tmp;
		1820
1961	return NULL;	1821	return NULL;
1962	}	1822	}
1963		1823
1964	/*	1824	/*
1965	* present(type, map, x, y) searches for any objects with	1825	* present(type, map, x, y) searches for any objects with
1966	* a matching type variable at the given map and coordinates.	1826	* a matching type variable at the given map and coordinates.
1967	* The first matching object is returned, or NULL if none.	1827	* The first matching object is returned, or NULL if none.
1968	*/	1828	*/
1969
1970	object *	1829	object *
1971	present (unsigned char type, maptile *m, int x, int y)	1830	present (unsigned char type, maptile *m, int x, int y)
1972	{	1831	{
1973	object *
1974	tmp;
1975
1976	if (out_of_map (m, x, y))	1832	if (out_of_map (m, x, y))
1977	{	1833	{
1978	LOG (llevError, "Present called outside map.\n");	1834	LOG (llevError, "Present called outside map.\n");
1979	return NULL;	1835	return NULL;
1980	}	1836	}
1981	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1837
		1838	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1982	if (tmp->type == type)	1839	if (tmp->type == type)
1983	return tmp;	1840	return tmp;
		1841
1984	return NULL;	1842	return NULL;
1985	}	1843	}
1986		1844
1987	/*	1845	/*
1988	* present_in_ob(type, object) searches for any objects with	1846	* present_in_ob(type, object) searches for any objects with
1989	* a matching type variable in the inventory of the given object.	1847	* a matching type variable in the inventory of the given object.
1990	* The first matching object is returned, or NULL if none.	1848	* The first matching object is returned, or NULL if none.
1991	*/	1849	*/
1992
1993	object *	1850	object *
1994	present_in_ob (unsigned char type, const object *op)	1851	present_in_ob (unsigned char type, const object *op)
1995	{	1852	{
1996	object *
1997	tmp;
1998
1999	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1853	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2000	if (tmp->type == type)	1854	if (tmp->type == type)
2001	return tmp;	1855	return tmp;
		1856
2002	return NULL;	1857	return NULL;
2003	}	1858	}
2004		1859
2005	/*	1860	/*
2006	* present_in_ob (type, str, object) searches for any objects with	1861	* present_in_ob (type, str, object) searches for any objects with
…		…
2014	* str is the string to match against. Note that we match against	1869	* str is the string to match against. Note that we match against
2015	* the object name, not the archetype name. this is so that the	1870	* the object name, not the archetype name. this is so that the
2016	* spell code can use one object type (force), but change it's name	1871	* spell code can use one object type (force), but change it's name
2017	* to be unique.	1872	* to be unique.
2018	*/	1873	*/
2019
2020	object *	1874	object *
2021	present_in_ob_by_name (int type, const char *str, const object *op)	1875	present_in_ob_by_name (int type, const char *str, const object *op)
2022	{	1876	{
2023	object *
2024	tmp;
2025
2026	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1877	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2027	{
2028	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1878	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2029	return tmp;	1879	return tmp;
2030	}	1880
2031	return NULL;	1881	return 0;
2032	}	1882	}
2033		1883
2034	/*	1884	/*
2035	* present_arch_in_ob(archetype, object) searches for any objects with	1885	* present_arch_in_ob(archetype, object) searches for any objects with
2036	* a matching archetype in the inventory of the given object.	1886	* a matching archetype in the inventory of the given object.
2037	* The first matching object is returned, or NULL if none.	1887	* The first matching object is returned, or NULL if none.
2038	*/	1888	*/
2039
2040	object *	1889	object *
2041	present_arch_in_ob (const archetype *at, const object *op)	1890	present_arch_in_ob (const archetype *at, const object *op)
2042	{	1891	{
2043	object *
2044	tmp;
2045
2046	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1892	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047	if (tmp->arch == at)	1893	if (tmp->arch == at)
2048	return tmp;	1894	return tmp;
		1895
2049	return NULL;	1896	return NULL;
2050	}	1897	}
2051		1898
2052	/*	1899	/*
2053	* activate recursively a flag on an object inventory	1900	* activate recursively a flag on an object inventory
2054	*/	1901	*/
2055	void	1902	void
2056	flag_inv (object *op, int flag)	1903	flag_inv (object *op, int flag)
2057	{	1904	{
2058	object *
2059	tmp;
2060
2061	if (op->inv)	1905	if (op->inv)
2062	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2063	{	1907	{
2064	SET_FLAG (tmp, flag);	1908	SET_FLAG (tmp, flag);
2065	flag_inv (tmp, flag);	1909	flag_inv (tmp, flag);
2066	}	1910	}
2067	} /*	1911	}
		1912
		1913	/*
2068	* desactivate recursively a flag on an object inventory	1914	* deactivate recursively a flag on an object inventory
2069	*/	1915	*/
2070	void	1916	void
2071	unflag_inv (object *op, int flag)	1917	unflag_inv (object *op, int flag)
2072	{	1918	{
2073	object *
2074	tmp;
2075
2076	if (op->inv)	1919	if (op->inv)
2077	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2078	{	1921	{
2079	CLEAR_FLAG (tmp, flag);	1922	CLEAR_FLAG (tmp, flag);
2080	unflag_inv (tmp, flag);	1923	unflag_inv (tmp, flag);
2081	}	1924	}
2082	}	1925	}
…		…
2085	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1928	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2086	* all it's inventory (recursively).	1929	* all it's inventory (recursively).
2087	* If checksums are used, a player will get set_cheat called for	1930	* If checksums are used, a player will get set_cheat called for
2088	* him/her-self and all object carried by a call to this function.	1931	* him/her-self and all object carried by a call to this function.
2089	*/	1932	*/
2090
2091	void	1933	void
2092	set_cheat (object *op)	1934	set_cheat (object *op)
2093	{	1935	{
2094	SET_FLAG (op, FLAG_WAS_WIZ);	1936	SET_FLAG (op, FLAG_WAS_WIZ);
2095	flag_inv (op, FLAG_WAS_WIZ);	1937	flag_inv (op, FLAG_WAS_WIZ);
…		…
2114	* because arch_blocked (now ob_blocked) needs to know the movement type	1956	* because arch_blocked (now ob_blocked) needs to know the movement type
2115	* to know if the space in question will block the object. We can't use	1957	* to know if the space in question will block the object. We can't use
2116	* the archetype because that isn't correct if the monster has been	1958	* the archetype because that isn't correct if the monster has been
2117	* customized, changed states, etc.	1959	* customized, changed states, etc.
2118	*/	1960	*/
2119
2120	int	1961	int
2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1962	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2122	{	1963	{
2123	int
2124	i,
2125	index = 0, flag;	1964	int index = 0, flag;
2126	static int
2127	altern[SIZEOFFREE];	1965	int altern[SIZEOFFREE];
2128		1966
2129	for (i = start; i < stop; i++)	1967	for (int i = start; i < stop; i++)
2130	{	1968	{
2131	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1969	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2132	if (!flag)	1970	if (!flag)
2133	altern[index++] = i;	1971	altern [index++] = i;
2134		1972
2135	/* Basically, if we find a wall on a space, we cut down the search size.	1973	/* Basically, if we find a wall on a space, we cut down the search size.
2136	* In this way, we won't return spaces that are on another side of a wall.	1974	* In this way, we won't return spaces that are on another side of a wall.
2137	* This mostly work, but it cuts down the search size in all directions -	1975	* This mostly work, but it cuts down the search size in all directions -
2138	* if the space being examined only has a wall to the north and empty	1976	* if the space being examined only has a wall to the north and empty
2139	* spaces in all the other directions, this will reduce the search space	1977	* spaces in all the other directions, this will reduce the search space
2140	* to only the spaces immediately surrounding the target area, and	1978	* to only the spaces immediately surrounding the target area, and
2141	* won't look 2 spaces south of the target space.	1979	* won't look 2 spaces south of the target space.
2142	*/	1980	*/
2143	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1981	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2144	stop = maxfree[i];	1982	stop = maxfree[i];
2145	}	1983	}
		1984
2146	if (!index)	1985	if (!index)
2147	return -1;	1986	return -1;
		1987
2148	return altern[RANDOM () % index];	1988	return altern[RANDOM () % index];
2149	}	1989	}
2150		1990
2151	/*	1991	/*
2152	* find_first_free_spot(archetype, maptile, x, y) works like	1992	* find_first_free_spot(archetype, maptile, x, y) works like
2153	* find_free_spot(), but it will search max number of squares.	1993	* find_free_spot(), but it will search max number of squares.
2154	* But it will return the first available spot, not a random choice.	1994	* But it will return the first available spot, not a random choice.
2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.	1995	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2156	*/	1996	*/
2157
2158	int	1997	int
2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)	1998	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2160	{	1999	{
2161	int
2162	i;
2163
2164	for (i = 0; i < SIZEOFFREE; i++)	2000	for (int i = 0; i < SIZEOFFREE; i++)
2165	{
2166	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2001	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2167	return i;	2002	return i;
2168	}	2003
2169	return -1;	2004	return -1;
2170	}	2005	}
2171		2006
2172	/*	2007	/*
2173	* The function permute(arr, begin, end) randomly reorders the array	2008	* The function permute(arr, begin, end) randomly reorders the array
2174	* arr[begin..end-1].	2009	* arr[begin..end-1].
		2010	* now uses a fisher-yates shuffle, old permute was broken
2175	*/	2011	*/
2176	static void	2012	static void
2177	permute (int *arr, int begin, int end)	2013	permute (int *arr, int begin, int end)
2178	{	2014	{
2179	int	2015	arr += begin;
2180	i,
2181	j,
2182	tmp,
2183	len;
2184
2185	len = end - begin;	2016	end -= begin;
2186	for (i = begin; i < end; i++)
2187	{
2188	j = begin + RANDOM () % len;
2189		2017
2190	tmp = arr[i];	2018	while (--end)
2191	arr[i] = arr[j];	2019	swap (arr [end], arr [RANDOM () % (end + 1)]);
2192	arr[j] = tmp;
2193	}
2194	}	2020	}
2195		2021
2196	/* new function to make monster searching more efficient, and effective!	2022	/* new function to make monster searching more efficient, and effective!
2197	* This basically returns a randomized array (in the passed pointer) of	2023	* This basically returns a randomized array (in the passed pointer) of
2198	* the spaces to find monsters. In this way, it won't always look for	2024	* the spaces to find monsters. In this way, it won't always look for
…		…
2201	* the 3x3 area will be searched, just not in a predictable order.	2027	* the 3x3 area will be searched, just not in a predictable order.
2202	*/	2028	*/
2203	void	2029	void
2204	get_search_arr (int *search_arr)	2030	get_search_arr (int *search_arr)
2205	{	2031	{
2206	int	2032	int i;
2207	i;
2208		2033
2209	for (i = 0; i < SIZEOFFREE; i++)	2034	for (i = 0; i < SIZEOFFREE; i++)
2210	{
2211	search_arr[i] = i;	2035	search_arr[i] = i;
2212	}
2213		2036
2214	permute (search_arr, 1, SIZEOFFREE1 + 1);	2037	permute (search_arr, 1, SIZEOFFREE1 + 1);
2215	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2038	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2216	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2039	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2217	}	2040	}
…		…
2226	* Perhaps incorrectly, but I'm making the assumption that exclude	2049	* Perhaps incorrectly, but I'm making the assumption that exclude
2227	* is actually want is going to try and move there. We need this info	2050	* is actually want is going to try and move there. We need this info
2228	* because we have to know what movement the thing looking to move	2051	* because we have to know what movement the thing looking to move
2229	* there is capable of.	2052	* there is capable of.
2230	*/	2053	*/
2231
2232	int	2054	int
2233	find_dir (maptile *m, int x, int y, object *exclude)	2055	find_dir (maptile *m, int x, int y, object *exclude)
2234	{	2056	{
2235	int
2236	i,
2237	max = SIZEOFFREE, mflags;	2057	int i, max = SIZEOFFREE, mflags;
2238		2058
2239	sint16 nx, ny;	2059	sint16 nx, ny;
2240	object *	2060	object *tmp;
2241	tmp;
2242	maptile *	2061	maptile *mp;
2243	mp;
2244		2062
2245	MoveType blocked, move_type;	2063	MoveType blocked, move_type;
2246		2064
2247	if (exclude && exclude->head)	2065	if (exclude && exclude->head)
2248	{	2066	{
…		…
2260	mp = m;	2078	mp = m;
2261	nx = x + freearr_x[i];	2079	nx = x + freearr_x[i];
2262	ny = y + freearr_y[i];	2080	ny = y + freearr_y[i];
2263		2081
2264	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2082	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2083
2265	if (mflags & P_OUT_OF_MAP)	2084	if (mflags & P_OUT_OF_MAP)
2266	{
2267	max = maxfree[i];	2085	max = maxfree[i];
2268	}
2269	else	2086	else
2270	{	2087	{
2271	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2088	mapspace &ms = mp->at (nx, ny);
		2089
		2090	blocked = ms.move_block;
2272		2091
2273	if ((move_type & blocked) == move_type)	2092	if ((move_type & blocked) == move_type)
2274	{
2275	max = maxfree[i];	2093	max = maxfree[i];
2276	}
2277	else if (mflags & P_IS_ALIVE)	2094	else if (mflags & P_IS_ALIVE)
2278	{	2095	{
2279	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2096	for (tmp = ms.bot; tmp; tmp = tmp->above)
2280	{	2097	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2281	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2098	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2282	{
2283	break;	2099	break;
2284	}	2100
2285	}
2286	if (tmp)	2101	if (tmp)
2287	{
2288	return freedir[i];	2102	return freedir[i];
2289	}
2290	}	2103	}
2291	}	2104	}
2292	}	2105	}
		2106
2293	return 0;	2107	return 0;
2294	}	2108	}
2295		2109
2296	/*	2110	/*
2297	* distance(object 1, object 2) will return the square of the	2111	* distance(object 1, object 2) will return the square of the
2298	* distance between the two given objects.	2112	* distance between the two given objects.
2299	*/	2113	*/
2300
2301	int	2114	int
2302	distance (const object *ob1, const object *ob2)	2115	distance (const object *ob1, const object *ob2)
2303	{	2116	{
2304	int
2305	i;
2306
2307	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2117	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2308	return i;
2309	}	2118	}
2310		2119
2311	/*	2120	/*
2312	* find_dir_2(delta-x,delta-y) will return a direction in which	2121	* find_dir_2(delta-x,delta-y) will return a direction in which
2313	* an object which has subtracted the x and y coordinates of another	2122	* an object which has subtracted the x and y coordinates of another
2314	* object, needs to travel toward it.	2123	* object, needs to travel toward it.
2315	*/	2124	*/
2316
2317	int	2125	int
2318	find_dir_2 (int x, int y)	2126	find_dir_2 (int x, int y)
2319	{	2127	{
2320	int	2128	int q;
2321	q;
2322		2129
2323	if (y)	2130	if (y)
2324	q = x * 100 / y;	2131	q = x * 100 / y;
2325	else if (x)	2132	else if (x)
2326	q = -300 * x;	2133	q = -300 * x;
…		…
2361	int	2168	int
2362	absdir (int d)	2169	absdir (int d)
2363	{	2170	{
2364	while (d < 1)	2171	while (d < 1)
2365	d += 8;	2172	d += 8;
		2173
2366	while (d > 8)	2174	while (d > 8)
2367	d -= 8;	2175	d -= 8;
		2176
2368	return d;	2177	return d;
2369	}	2178	}
2370		2179
2371	/*	2180	/*
2372	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2374	*/	2183	*/
2375		2184
2376	int	2185	int
2377	dirdiff (int dir1, int dir2)	2186	dirdiff (int dir1, int dir2)
2378	{	2187	{
2379	int	2188	int d;
2380	d;
2381		2189
2382	d = abs (dir1 - dir2);	2190	d = abs (dir1 - dir2);
2383	if (d > 4)	2191	if (d > 4)
2384	d = 8 - d;	2192	d = 8 - d;
		2193
2385	return d;	2194	return d;
2386	}	2195	}
2387		2196
2388	/* peterm:	2197	/* peterm:
2389	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2198	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2392	* This basically means that if direction is 15, then it could either go	2201	* This basically means that if direction is 15, then it could either go
2393	* direction 4, 14, or 16 to get back to where we are.	2202	* direction 4, 14, or 16 to get back to where we are.
2394	* Moved from spell_util.c to object.c with the other related direction	2203	* Moved from spell_util.c to object.c with the other related direction
2395	* functions.	2204	* functions.
2396	*/	2205	*/
2397
2398	int
2399	reduction_dir[SIZEOFFREE][3] = {	2206	int reduction_dir[SIZEOFFREE][3] = {
2400	{0, 0, 0}, /* 0 */	2207	{0, 0, 0}, /* 0 */
2401	{0, 0, 0}, /* 1 */	2208	{0, 0, 0}, /* 1 */
2402	{0, 0, 0}, /* 2 */	2209	{0, 0, 0}, /* 2 */
2403	{0, 0, 0}, /* 3 */	2210	{0, 0, 0}, /* 3 */
2404	{0, 0, 0}, /* 4 */	2211	{0, 0, 0}, /* 4 */
…		…
2452	* find a path to that monster that we found. If not,	2259	* find a path to that monster that we found. If not,
2453	* we don't bother going toward it. Returns 1 if we	2260	* we don't bother going toward it. Returns 1 if we
2454	* can see a direct way to get it	2261	* can see a direct way to get it
2455	* Modified to be map tile aware -.MSW	2262	* Modified to be map tile aware -.MSW
2456	*/	2263	*/
2457
2458
2459	int	2264	int
2460	can_see_monsterP (maptile *m, int x, int y, int dir)	2265	can_see_monsterP (maptile *m, int x, int y, int dir)
2461	{	2266	{
2462	sint16 dx, dy;	2267	sint16 dx, dy;
2463	int
2464	mflags;	2268	int mflags;
2465		2269
2466	if (dir < 0)	2270	if (dir < 0)
2467	return 0; /* exit condition: invalid direction */	2271	return 0; /* exit condition: invalid direction */
2468		2272
2469	dx = x + freearr_x[dir];	2273	dx = x + freearr_x[dir];
…		…
2482	return 0;	2286	return 0;
2483		2287
2484	/* yes, can see. */	2288	/* yes, can see. */
2485	if (dir < 9)	2289	if (dir < 9)
2486	return 1;	2290	return 1;
		2291
2487	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2292	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2488	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2293	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2294	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2489	}	2295	}
2490
2491
2492		2296
2493	/*	2297	/*
2494	* can_pick(picker, item): finds out if an object is possible to be	2298	* can_pick(picker, item): finds out if an object is possible to be
2495	* picked up by the picker. Returnes 1 if it can be	2299	* picked up by the picker. Returnes 1 if it can be
2496	* picked up, otherwise 0.	2300	* picked up, otherwise 0.
…		…
2507	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2311	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2508	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2312	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2509	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2313	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2510	}	2314	}
2511		2315
2512
2513	/*	2316	/*
2514	* create clone from object to another	2317	* create clone from object to another
2515	*/	2318	*/
2516	object *	2319	object *
2517	object_create_clone (object *asrc)	2320	object_create_clone (object *asrc)
…		…
2536	{	2339	{
2537	dst = tmp;	2340	dst = tmp;
2538	tmp->head = 0;	2341	tmp->head = 0;
2539	}	2342	}
2540	else	2343	else
2541	{
2542	tmp->head = dst;	2344	tmp->head = dst;
2543	}
2544		2345
2545	tmp->more = 0;	2346	tmp->more = 0;
2546		2347
2547	if (prev)	2348	if (prev)
2548	prev->more = tmp;	2349	prev->more = tmp;
…		…
2560	/* Basically, we save the content of the string to a temp file, then call */	2361	/* Basically, we save the content of the string to a temp file, then call */
2561	/* load_object on it. I admit it is a highly inefficient way to make things, */	2362	/* load_object on it. I admit it is a highly inefficient way to make things, */
2562	/* but it was simple to make and allows reusing the load_object function. */	2363	/* but it was simple to make and allows reusing the load_object function. */
2563	/* Remember not to use load_object_str in a time-critical situation. */	2364	/* Remember not to use load_object_str in a time-critical situation. */
2564	/* Also remember that multiparts objects are not supported for now. */	2365	/* Also remember that multiparts objects are not supported for now. */
2565
2566	object *	2366	object *
2567	load_object_str (const char *obstr)	2367	load_object_str (const char *obstr)
2568	{	2368	{
2569	object *op;	2369	object *op;
2570	char filename[MAX_BUF];	2370	char filename[MAX_BUF];
…		…
2600	* returns NULL if no match.	2400	* returns NULL if no match.
2601	*/	2401	*/
2602	object *	2402	object *
2603	find_obj_by_type_subtype (const object *who, int type, int subtype)	2403	find_obj_by_type_subtype (const object *who, int type, int subtype)
2604	{	2404	{
2605	object *tmp;
2606
2607	for (tmp = who->inv; tmp; tmp = tmp->below)	2405	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2608	if (tmp->type == type && tmp->subtype == subtype)	2406	if (tmp->type == type && tmp->subtype == subtype)
2609	return tmp;	2407	return tmp;
2610		2408
2611	return NULL;	2409	return 0;
2612	}	2410	}
2613		2411
2614	/* If ob has a field named key, return the link from the list,	2412	/* If ob has a field named key, return the link from the list,
2615	* otherwise return NULL.	2413	* otherwise return NULL.
2616	*	2414	*
…		…
2618	* do the desired thing.	2416	* do the desired thing.
2619	*/	2417	*/
2620	key_value *	2418	key_value *
2621	get_ob_key_link (const object *ob, const char *key)	2419	get_ob_key_link (const object *ob, const char *key)
2622	{	2420	{
2623	key_value *link;
2624
2625	for (link = ob->key_values; link != NULL; link = link->next)	2421	for (key_value *link = ob->key_values; link; link = link->next)
2626	if (link->key == key)	2422	if (link->key == key)
2627	return link;	2423	return link;
2628		2424
2629	return NULL;	2425	return 0;
2630	}	2426	}
2631		2427
2632	/*	2428	/*
2633	* Returns the value of op has an extra_field for key, or NULL.	2429	* Returns the value of op has an extra_field for key, or NULL.
2634	*	2430	*
…		…
2674	* Returns TRUE on success.	2470	* Returns TRUE on success.
2675	*/	2471	*/
2676	int	2472	int
2677	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2473	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2678	{	2474	{
2679	key_value *
2680	field = NULL, *last = NULL;	2475	key_value *field = NULL, *last = NULL;
2681		2476
2682	for (field = op->key_values; field != NULL; field = field->next)	2477	for (field = op->key_values; field != NULL; field = field->next)
2683	{	2478	{
2684	if (field->key != canonical_key)	2479	if (field->key != canonical_key)
2685	{	2480	{
…		…
2713	/* IF we get here, key doesn't exist */	2508	/* IF we get here, key doesn't exist */
2714		2509
2715	/* No field, we'll have to add it. */	2510	/* No field, we'll have to add it. */
2716		2511
2717	if (!add_key)	2512	if (!add_key)
2718	{
2719	return FALSE;	2513	return FALSE;
2720	}	2514
2721	/* There isn't any good reason to store a null	2515	/* There isn't any good reason to store a null
2722	* value in the key/value list. If the archetype has	2516	* value in the key/value list. If the archetype has
2723	* this key, then we should also have it, so shouldn't	2517	* this key, then we should also have it, so shouldn't
2724	* be here. If user wants to store empty strings,	2518	* be here. If user wants to store empty strings,
2725	* should pass in ""	2519	* should pass in ""
…		…
2774	}	2568	}
2775	else	2569	else
2776	item = item->env;	2570	item = item->env;
2777	}	2571	}
2778		2572
		2573
		2574	const char *
		2575	object::flag_desc (char *desc, int len) const
		2576	{
		2577	char *p = desc;
		2578	bool first = true;
		2579
		2580	*p = 0;
		2581
		2582	for (int i = 0; i < NUM_FLAGS; i++)
		2583	{
		2584	if (len <= 10) // magic constant!
		2585	{
		2586	snprintf (p, len, ",...");
		2587	break;
		2588	}
		2589
		2590	if (flag [i])
		2591	{
		2592	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2593	len -= cnt;
		2594	p += cnt;
		2595	first = false;
		2596	}
		2597	}
		2598
		2599	return desc;
		2600	}
		2601
2779	// return a suitable string describing an objetc in enough detail to find it	2602	// return a suitable string describing an object in enough detail to find it
2780	const char *	2603	const char *
2781	object::debug_desc (char *info) const	2604	object::debug_desc (char *info) const
2782	{	2605	{
		2606	char flagdesc[512];
2783	char info2[256 * 3];	2607	char info2[256 * 4];
2784	char *p = info;	2608	char *p = info;
2785		2609
2786	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2610	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2787	count,	2611	count, uuid.seq,
2788	&name,	2612	&name,
2789	title ? " " : "",	2613	title ? "\",title:" : "",
2790	title ? (const char *)title : "");	2614	title ? (const char *)title : "",
		2615	flag_desc (flagdesc, 512), type);
2791		2616
2792	if (env)	2617	if (env)
2793	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2794		2619
2795	if (map)	2620	if (map)
2796	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2621	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2797		2622
2798	return info;	2623	return info;
2799	}	2624	}
2800		2625
2801	const char *	2626	const char *
2802	object::debug_desc () const	2627	object::debug_desc () const
2803	{	2628	{
2804	static char info[256 * 3];	2629	static char info[256 * 4];
2805	return debug_desc (info);	2630	return debug_desc (info);
2806	}	2631	}
2807		2632

Diff Legend

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