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.64 by root, Tue Dec 12 21:39:56 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);
		525	}
		526
		527	object *
		528	object::clone ()
		529	{
		530	object *neu = create ();
		531	copy_to (neu);
		532	return neu;
591	}	533	}
592		534
593	/*	535	/*
594	* 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
595	* 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
596	* 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.
597	*/	539	*/
598
599	void	540	void
600	update_turn_face (object *op)	541	update_turn_face (object *op)
601	{	542	{
602	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	543	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
603	return;	544	return;
		545
604	SET_ANIMATION (op, op->direction);	546	SET_ANIMATION (op, op->direction);
605	update_object (op, UP_OBJ_FACE);	547	update_object (op, UP_OBJ_FACE);
606	}	548	}
607		549
608	/*	550	/*
609	* 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
610	* 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.
611	* 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.
612	*/	554	*/
613	void	555	void
614	update_ob_speed (object *op)	556	object::set_speed (float speed)
615	{	557	{
616	extern int arch_init;	558	if (flag [FLAG_FREED] && speed)
617
618	/* No reason putting the archetypes objects on the speed list,
619	* since they never really need to be updated.
620	*/
621
622	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
623	{	559	{
624	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	560	LOG (llevError, "Object %s is freed but has speed.\n", &name);
625	#ifdef MANY_CORES
626	abort ();
627	#else
628	op->speed = 0;	561	speed = 0;
629	#endif
630	}
631
632	if (arch_init)
633	return;
634
635	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
636	{	562	}
637	/* If already on active list, don't do anything */
638	if (op->active_next || op->active_prev || op == active_objects)
639	return;
640		563
641	/* process_events() expects us to insert the object at the beginning	564	this->speed = speed;
642	* of the list. */
643	op->active_next = active_objects;
644		565
645	if (op->active_next != NULL)	566	if (has_active_speed ())
646	op->active_next->active_prev = op;	567	activate ();
647
648	active_objects = op;
649	}
650	else	568	else
651	{	569	deactivate ();
652	/* If not on the active list, nothing needs to be done */
653	if (!op->active_next && !op->active_prev && op != active_objects)
654	return;
655
656	if (op->active_prev == NULL)
657	{
658	active_objects = op->active_next;
659
660	if (op->active_next != NULL)
661	op->active_next->active_prev = NULL;
662	}
663	else
664	{
665	op->active_prev->active_next = op->active_next;
666
667	if (op->active_next)
668	op->active_next->active_prev = op->active_prev;
669	}
670
671	op->active_next = NULL;
672	op->active_prev = NULL;
673	}
674	}	570	}
675		571
676	/* This function removes object 'op' from the list of active
677	* objects.
678	* This should only be used for style maps or other such
679	* reference maps where you don't want an object that isn't
680	* in play chewing up cpu time getting processed.
681	* The reverse of this is to call update_ob_speed, which
682	* will do the right thing based on the speed of the object.
683	*/
684	void
685	remove_from_active_list (object *op)
686	{
687	/* If not on the active list, nothing needs to be done */
688	if (!op->active_next && !op->active_prev && op != active_objects)
689	return;
690
691	if (op->active_prev == NULL)
692	{
693	active_objects = op->active_next;
694	if (op->active_next != NULL)
695	op->active_next->active_prev = NULL;
696	}
697	else
698	{
699	op->active_prev->active_next = op->active_next;
700	if (op->active_next)
701	op->active_next->active_prev = op->active_prev;
702	}
703	op->active_next = NULL;
704	op->active_prev = NULL;
705	}
706
707	/*	572	/*
708	* update_object() updates the array which represents the map.	573	* update_object() updates the the map.
709	* It takes into account invisible objects (and represent squares covered	574	* It takes into account invisible objects (and represent squares covered
710	* 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
711	* invisible object, etc...)	576	* invisible object, etc...)
712	* 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
713	* 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
714	* updating that window, though, since update_object() is called _often_)	579	* updating that window, though, since update_object() is called _often_)
715	*	580	*
716	* 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.
717	* For example, if the only thing that has changed is the face (due to
718	* an animation), we don't need to call update_position until that actually
719	* comes into view of a player. OTOH, many other things, like addition/removal
720	* of walls or living creatures may need us to update the flags now.
721	* current action are:	582	* current action are:
722	* UP_OBJ_INSERT: op was inserted	583	* UP_OBJ_INSERT: op was inserted
723	* UP_OBJ_REMOVE: op was removed	584	* UP_OBJ_REMOVE: op was removed
724	* 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
725	* 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.
726	* UP_OBJ_FACE: only the objects face has changed.	587	* UP_OBJ_FACE: only the objects face has changed.
727	*/	588	*/
728
729	void	589	void
730	update_object (object *op, int action)	590	update_object (object *op, int action)
731	{	591	{
732	int update_now = 0, flags;
733	MoveType move_on, move_off, move_block, move_slow;	592	MoveType move_on, move_off, move_block, move_slow;
734		593
735	if (op == NULL)	594	if (op == NULL)
736	{	595	{
737	/* this should never happen */	596	/* this should never happen */
738	LOG (llevDebug, "update_object() called for NULL object.\n");	597	LOG (llevDebug, "update_object() called for NULL object.\n");
739	return;	598	return;
740	}	599	}
741		600
742	if (op->env != NULL)	601	if (op->env)
743	{	602	{
744	/* Animation is currently handled by client, so nothing	603	/* Animation is currently handled by client, so nothing
745	* to do in this case.	604	* to do in this case.
746	*/	605	*/
747	return;	606	return;
…		…
752	*/	611	*/
753	if (!op->map || op->map->in_memory == MAP_SAVING)	612	if (!op->map || op->map->in_memory == MAP_SAVING)
754	return;	613	return;
755		614
756	/* make sure the object is within map boundaries */	615	/* make sure the object is within map boundaries */
757	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)
758	{	617	{
759	LOG (llevError, "update_object() called for object out of map!\n");	618	LOG (llevError, "update_object() called for object out of map!\n");
760	#ifdef MANY_CORES	619	#ifdef MANY_CORES
761	abort ();	620	abort ();
762	#endif	621	#endif
763	return;	622	return;
764	}	623	}
765		624
766	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	625	mapspace &m = op->ms ();
767	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
768	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
769	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
770	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
771	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
772		626
		627	if (!(m.flags_ & P_UPTODATE))
		628	/* nop */;
773	if (action == UP_OBJ_INSERT)	629	else if (action == UP_OBJ_INSERT)
774	{	630	{
		631	// this is likely overkill, TODO: revisit (schmorp)
775	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	632	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
776	update_now = 1;
777
778	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	633	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
779	update_now = 1;	634	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
780		635	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		636	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
781	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	637	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
785	update_now = 1;
786
787	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
788	update_now = 1;
789
790	if ((move_on | op->move_on) != move_on)	638	|| (m.move_on | op->move_on ) != m.move_on
791	update_now = 1;
792
793	if ((move_off | op->move_off) != move_off)	639	|| (m.move_off | op->move_off ) != m.move_off
794	update_now = 1;	640	|| (m.move_slow | op->move_slow) != m.move_slow
795
796	/* 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
797	* to have move_allow right now.	642	* to have move_allow right now.
798	*/	643	*/
799	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	644	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
800	update_now = 1;	645	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
801		646	m.flags_ = 0;
802	if ((move_slow | op->move_slow) != move_slow)
803	update_now = 1;
804	}	647	}
805
806	/* if the object is being removed, we can't make intelligent	648	/* if the object is being removed, we can't make intelligent
807	* decisions, because remove_ob can't really pass the object	649	* decisions, because remove_ob can't really pass the object
808	* that is being removed.	650	* that is being removed.
809	*/	651	*/
810	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	652	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
811	update_now = 1;	653	m.flags_ = 0;
812	else if (action == UP_OBJ_FACE)	654	else if (action == UP_OBJ_FACE)
813	/* Nothing to do for that case */ ;	655	/* Nothing to do for that case */ ;
814	else	656	else
815	LOG (llevError, "update_object called with invalid action: %d\n", action);	657	LOG (llevError, "update_object called with invalid action: %d\n", action);
816		658
817	if (update_now)
818	{
819	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
820	update_position (op->map, op->x, op->y);
821	}
822
823	if (op->more != NULL)	659	if (op->more)
824	update_object (op->more, action);	660	update_object (op->more, action);
825	}	661	}
826		662
827	object::vector object::mortals;
828	object::vector object::objects; // not yet used
829	object *object::first;	663	object *object::first;
830
831	void object::free_mortals ()
832	{
833	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
834	if ((*i)->refcnt)
835	++i; // further delay freeing
836	else
837	{
838	delete *i;
839	mortals.erase (i);
840	}
841	}
842		664
843	object::object ()	665	object::object ()
844	{	666	{
845	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
846		668
…		…
853	free_key_values (this);	675	free_key_values (this);
854	}	676	}
855		677
856	void object::link ()	678	void object::link ()
857	{	679	{
858	count = ++ob_count;
859	uuid = gen_uuid ();	680	uuid = gen_uuid ();
860		681
861	prev = 0;	682	objects.insert (this);
862	next = object::first;
863
864	if (object::first)
865	object::first->prev = this;
866
867	object::first = this;
868	}	683	}
869		684
870	void object::unlink ()	685	void object::unlink ()
871	{	686	{
872	if (this == object::first)	687	objects.erase (this);
873	object::first = next;	688	}
874		689
875	/* Remove this object from the list of used objects */	690	void
876	if (prev) prev->next = next;	691	object::activate ()
877	if (next) next->prev = prev;	692	{
		693	/* If already on active list, don't do anything */
		694	if (active)
		695	return;
878		696
879	prev = 0;	697	if (has_active_speed ())
880	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	}
881	}	793	}
882		794
883	object *object::create ()	795	object *object::create ()
884	{	796	{
885	object *op = new object;	797	object *op = new object;
886	op->link ();	798	op->link ();
887	return op;	799	return op;
888	}	800	}
889		801
890	/*	802	void
891	* free_object() frees everything allocated by an object, removes	803	object::do_destroy ()
892	* it from the list of used objects, and puts it on the list of
893	* free objects. The IS_FREED() flag is set in the object.
894	* The object must have been removed by remove_ob() first for
895	* this function to succeed.
896	*
897	* If destroy_inventory is set, free inventory as well. Else drop items in
898	* inventory to the ground.
899	*/
900	void object::destroy (bool destroy_inventory)
901	{	804	{
902	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])
903	return;	815	return;
904		816
905	if (QUERY_FLAG (this, FLAG_FRIENDLY))	817	set_speed (0);
906	remove_friendly_object (this);
907		818
908	if (!QUERY_FLAG (this, FLAG_REMOVED))	819	flag [FLAG_FREED] = 1;
909	remove ();
910		820
911	SET_FLAG (this, FLAG_FREED);	821	attachable::do_destroy ();
912		822
913	if (more)	823	destroy_inv (true);
914	{	824	unlink ();
915	more->destroy (destroy_inventory);
916	more = 0;
917	}
918
919	if (inv)
920	{
921	/* Only if the space blocks everything do we not process -
922	* if some form of movement is allowed, let objects
923	* drop on that space.
924	*/
925	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
926	{
927	object *op = inv;
928
929	while (op)
930	{
931	object *tmp = op->below;
932	op->destroy (destroy_inventory);
933	op = tmp;
934	}
935	}
936	else
937	{ /* Put objects in inventory onto this space */
938	object *op = inv;
939
940	while (op)
941	{
942	object *tmp = op->below;
943
944	op->remove ();
945
946	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
947	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
948	op->destroy ();
949	else
950	{
951	op->x = x;
952	op->y = y;
953	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
954	}
955
956	op = tmp;
957	}
958	}
959	}
960		825
961	// hack to ensure that freed objects still have a valid map	826	// hack to ensure that freed objects still have a valid map
962	{	827	{
963	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
964		829
…		…
968		833
969	freed_map->name = "/internal/freed_objects_map";	834	freed_map->name = "/internal/freed_objects_map";
970	freed_map->width = 3;	835	freed_map->width = 3;
971	freed_map->height = 3;	836	freed_map->height = 3;
972		837
973	freed_map->allocate ();	838	freed_map->alloc ();
		839	freed_map->in_memory = MAP_IN_MEMORY;
974	}	840	}
975		841
976	map = freed_map;	842	map = freed_map;
977	x = 1;	843	x = 1;
978	y = 1;	844	y = 1;
979	}	845	}
980		846
		847	head = 0;
		848
		849	if (more)
		850	{
		851	more->destroy ();
		852	more = 0;
		853	}
		854
981	// clear those pointers that likely might have circular references to us	855	// clear those pointers that likely might have circular references to us
982	owner = 0;	856	owner = 0;
983	enemy = 0;	857	enemy = 0;
984	attacked_by = 0;	858	attacked_by = 0;
		859	}
985		860
986	// only relevant for players(?), but make sure of it anyways	861	void
987	contr = 0;	862	object::destroy (bool destroy_inventory)
		863	{
		864	if (destroyed ())
		865	return;
988		866
989	/* Remove object from the active list */	867	if (destroy_inventory)
990	speed = 0;	868	destroy_inv (false);
991	update_ob_speed (this);
992		869
993	unlink ();	870	attachable::destroy ();
994
995	mortals.push_back (this);
996	}	871	}
997		872
998	/*	873	/*
999	* sub_weight() recursively (outwards) subtracts a number from the	874	* sub_weight() recursively (outwards) subtracts a number from the
1000	* 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)).
…		…
1024	object::remove ()	899	object::remove ()
1025	{	900	{
1026	object *tmp, *last = 0;	901	object *tmp, *last = 0;
1027	object *otmp;	902	object *otmp;
1028		903
1029	int check_walk_off;
1030
1031	if (QUERY_FLAG (this, FLAG_REMOVED))	904	if (QUERY_FLAG (this, FLAG_REMOVED))
1032	return;	905	return;
1033		906
1034	SET_FLAG (this, FLAG_REMOVED);	907	SET_FLAG (this, FLAG_REMOVED);
		908	INVOKE_OBJECT (REMOVE, this);
1035		909
1036	if (more)	910	if (more)
1037	more->remove ();	911	more->remove ();
1038		912
1039	/*	913	/*
…		…
1049		923
1050	/* 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
1051	* made to players inventory. If set, avoiding the call	925	* made to players inventory. If set, avoiding the call
1052	* to save cpu time.	926	* to save cpu time.
1053	*/	927	*/
1054	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))
1055	fix_player (otmp);	929	otmp->update_stats ();
1056		930
1057	if (above != NULL)	931	if (above)
1058	above->below = below;	932	above->below = below;
1059	else	933	else
1060	env->inv = below;	934	env->inv = below;
1061		935
1062	if (below != NULL)	936	if (below)
1063	below->above = above;	937	below->above = above;
1064		938
1065	/* we set up values so that it could be inserted into	939	/* we set up values so that it could be inserted into
1066	* 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
1067	* to the caller to decide what we want to do.	941	* to the caller to decide what we want to do.
…		…
1071	above = 0, below = 0;	945	above = 0, below = 0;
1072	env = 0;	946	env = 0;
1073	}	947	}
1074	else if (map)	948	else if (map)
1075	{	949	{
1076	/* Re did the following section of code - it looks like it had	950	if (type == PLAYER)
1077	* lots of logic for things we no longer care about
1078	*/	951	{
		952	--map->players;
		953	map->touch ();
		954	}
		955
		956	map->dirty = true;
1079		957
1080	/* link the object above us */	958	/* link the object above us */
1081	if (above)	959	if (above)
1082	above->below = below;	960	above->below = below;
1083	else	961	else
1084	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 */
1085		963
1086	/* Relink the object below us, if there is one */	964	/* Relink the object below us, if there is one */
1087	if (below)	965	if (below)
1088	below->above = above;	966	below->above = above;
1089	else	967	else
…		…
1101	dump = dump_object (GET_MAP_OB (map, x, y));	979	dump = dump_object (GET_MAP_OB (map, x, y));
1102	LOG (llevError, "%s\n", dump);	980	LOG (llevError, "%s\n", dump);
1103	free (dump);	981	free (dump);
1104	}	982	}
1105		983
1106	SET_MAP_OB (map, x, y, above); /* goes on above it. */	984	map->at (x, y).bot = above; /* goes on above it. */
1107	}	985	}
1108		986
1109	above = 0;	987	above = 0;
1110	below = 0;	988	below = 0;
1111		989
1112	if (map->in_memory == MAP_SAVING)	990	if (map->in_memory == MAP_SAVING)
1113	return;	991	return;
1114		992
1115	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	993	int check_walk_off = !flag [FLAG_NO_APPLY];
1116		994
1117	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	995	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1118	{	996	{
1119	/* 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
1120	* being removed.	998	* being removed.
1121	*/	999	*/
1122		1000
…		…
1126	* removed (most likely destroyed), update the player view	1004	* removed (most likely destroyed), update the player view
1127	* appropriately.	1005	* appropriately.
1128	*/	1006	*/
1129	if (tmp->container == this)	1007	if (tmp->container == this)
1130	{	1008	{
1131	CLEAR_FLAG (this, FLAG_APPLIED);	1009	flag [FLAG_APPLIED] = 0;
1132	tmp->container = 0;	1010	tmp->container = 0;
1133	}	1011	}
1134		1012
1135	tmp->contr->socket.update_look = 1;	1013	if (tmp->contr->ns)
		1014	tmp->contr->ns->floorbox_update ();
1136	}	1015	}
1137		1016
1138	/* See if player moving off should effect something */	1017	/* See if object moving off should effect something */
1139	if (check_walk_off	1018	if (check_walk_off
1140	&& ((move_type & tmp->move_off)	1019	&& ((move_type & tmp->move_off)
1141	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1020	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1142	{	1021	{
1143	move_apply (tmp, this, 0);	1022	move_apply (tmp, this, 0);
…		…
1145	if (destroyed ())	1024	if (destroyed ())
1146	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 ());
1147	}	1026	}
1148		1027
1149	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1028	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1150		1029	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1151	if (tmp->above == tmp)	1030	if (tmp->above == tmp)
1152	tmp->above = 0;	1031	tmp->above = 0;
1153		1032
1154	last = tmp;	1033	last = tmp;
1155	}	1034	}
1156		1035
1157	/* 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?
1158	if (!last)	1038	if (!last)
1159	{	1039	map->at (x, y).flags_ = 0;
1160	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1161	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1162	* those out anyways, and if there are any flags set right now, they won't
1163	* be correct anyways.
1164	*/
1165	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1166	update_position (map, x, y);
1167	}
1168	else	1040	else
1169	update_object (last, UP_OBJ_REMOVE);	1041	update_object (last, UP_OBJ_REMOVE);
1170		1042
1171	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1043	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1172	update_all_los (map, x, y);	1044	update_all_los (map, x, y);
1173	}	1045	}
1174	}	1046	}
1175		1047
1176	/*	1048	/*
…		…
1185	merge_ob (object *op, object *top)	1057	merge_ob (object *op, object *top)
1186	{	1058	{
1187	if (!op->nrof)	1059	if (!op->nrof)
1188	return 0;	1060	return 0;
1189		1061
1190	if (top == NULL)	1062	if (top)
1191	for (top = op; top != NULL && top->above != NULL; top = top->above);	1063	for (top = op; top && top->above; top = top->above)
		1064	;
1192		1065
1193	for (; top != NULL; top = top->below)	1066	for (; top; top = top->below)
1194	{	1067	{
1195	if (top == op)	1068	if (top == op)
1196	continue;	1069	continue;
1197	if (CAN_MERGE (op, top))	1070
		1071	if (object::can_merge (op, top))
1198	{	1072	{
1199	top->nrof += op->nrof;	1073	top->nrof += op->nrof;
1200		1074
1201	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1075	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1202	op->weight = 0; /* Don't want any adjustements now */	1076	op->weight = 0; /* Don't want any adjustements now */
…		…
1213	* job preparing multi-part monsters	1087	* job preparing multi-part monsters
1214	*/	1088	*/
1215	object *	1089	object *
1216	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)
1217	{	1091	{
1218	object *tmp;
1219
1220	if (op->head)
1221	op = op->head;
1222
1223	for (tmp = op; tmp; tmp = tmp->more)	1092	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1224	{	1093	{
1225	tmp->x = x + tmp->arch->clone.x;	1094	tmp->x = x + tmp->arch->clone.x;
1226	tmp->y = y + tmp->arch->clone.y;	1095	tmp->y = y + tmp->arch->clone.y;
1227	}	1096	}
1228		1097
…		…
1247	* Return value:	1116	* Return value:
1248	* new object if 'op' was merged with other object	1117	* new object if 'op' was merged with other object
1249	* NULL if 'op' was destroyed	1118	* NULL if 'op' was destroyed
1250	* just 'op' otherwise	1119	* just 'op' otherwise
1251	*/	1120	*/
1252
1253	object *	1121	object *
1254	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)
1255	{	1123	{
1256	object *tmp, *top, *floor = NULL;	1124	object *tmp, *top, *floor = NULL;
1257	sint16 x, y;	1125	sint16 x, y;
…		…
1260	{	1128	{
1261	LOG (llevError, "Trying to insert freed object!\n");	1129	LOG (llevError, "Trying to insert freed object!\n");
1262	return NULL;	1130	return NULL;
1263	}	1131	}
1264		1132
1265	if (m == NULL)	1133	if (!m)
1266	{	1134	{
1267	char *dump = dump_object (op);	1135	char *dump = dump_object (op);
1268	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);
1269	free (dump);	1137	free (dump);
1270	return op;	1138	return op;
…		…
1291	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);
1292	free (dump);	1160	free (dump);
1293	return op;	1161	return op;
1294	}	1162	}
1295		1163
1296	if (op->more != NULL)	1164	if (op->more)
1297	{	1165	{
1298	/* The part may be on a different map. */	1166	/* The part may be on a different map. */
1299		1167
1300	object *more = op->more;	1168	object *more = op->more;
1301		1169
1302	/* We really need the caller to normalize coordinates - if	1170	/* We really need the caller to normalise coordinates - if
1303	* 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
1304	* 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
1305	* is clear wrong do we normalize it.	1173	* is clear wrong do we normalise it.
1306	*/	1174	*/
1307	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1175	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1308	more->map = get_map_from_coord (m, &more->x, &more->y);	1176	more->map = get_map_from_coord (m, &more->x, &more->y);
1309	else if (!more->map)	1177	else if (!more->map)
1310	{	1178	{
…		…
1317	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1185	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1318	{	1186	{
1319	if (!op->head)	1187	if (!op->head)
1320	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");
1321		1189
1322	return NULL;	1190	return 0;
1323	}	1191	}
1324	}	1192	}
1325		1193
1326	CLEAR_FLAG (op, FLAG_REMOVED);	1194	CLEAR_FLAG (op, FLAG_REMOVED);
1327		1195
…		…
1334	y = op->y;	1202	y = op->y;
1335		1203
1336	/* this has to be done after we translate the coordinates.	1204	/* this has to be done after we translate the coordinates.
1337	*/	1205	*/
1338	if (op->nrof && !(flag & INS_NO_MERGE))	1206	if (op->nrof && !(flag & INS_NO_MERGE))
1339	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)
1340	if (CAN_MERGE (op, tmp))	1208	if (object::can_merge (op, tmp))
1341	{	1209	{
1342	op->nrof += tmp->nrof;	1210	op->nrof += tmp->nrof;
1343	tmp->destroy ();	1211	tmp->destroy ();
1344	}	1212	}
1345		1213
…		…
1361	op->below = originator->below;	1229	op->below = originator->below;
1362		1230
1363	if (op->below)	1231	if (op->below)
1364	op->below->above = op;	1232	op->below->above = op;
1365	else	1233	else
1366	SET_MAP_OB (op->map, op->x, op->y, op);	1234	op->ms ().bot = op;
1367		1235
1368	/* since *below* originator, no need to update top */	1236	/* since *below* originator, no need to update top */
1369	originator->below = op;	1237	originator->below = op;
1370	}	1238	}
1371	else	1239	else
1372	{	1240	{
1373	/* If there are other objects, then */	1241	/* If there are other objects, then */
1374	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))
1375	{	1243	{
1376	object *last = NULL;	1244	object *last = 0;
1377		1245
1378	/*	1246	/*
1379	* 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.
1380	* We've already dealt with merging if appropriate.	1248	* We've already dealt with merging if appropriate.
1381	* 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
…		…
1385	* 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
1386	* 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
1387	* 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
1388	* that flying non pickable objects are spell objects.	1256	* that flying non pickable objects are spell objects.
1389	*/	1257	*/
1390
1391	while (top != NULL)	1258	while (top)
1392	{	1259	{
1393	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))
1394	floor = top;	1261	floor = top;
1395		1262
1396	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))
…		…
1417	* If INS_ON_TOP is used, don't do this processing	1284	* If INS_ON_TOP is used, don't do this processing
1418	* Need to find the object that in fact blocks view, otherwise	1285	* Need to find the object that in fact blocks view, otherwise
1419	* stacking is a bit odd.	1286	* stacking is a bit odd.
1420	*/	1287	*/
1421	if (!(flag & INS_ON_TOP) &&	1288	if (!(flag & INS_ON_TOP) &&
1422	(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))
1423	{	1290	{
1424	for (last = top; last != floor; last = last->below)	1291	for (last = top; last != floor; last = last->below)
1425	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1292	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1426	break;	1293	break;
1427	/* Check to see if we found the object that blocks view,	1294	/* Check to see if we found the object that blocks view,
…		…
1449	op->above = GET_MAP_OB (op->map, op->x, op->y);	1316	op->above = GET_MAP_OB (op->map, op->x, op->y);
1450		1317
1451	if (op->above)	1318	if (op->above)
1452	op->above->below = op;	1319	op->above->below = op;
1453		1320
1454	op->below = NULL;	1321	op->below = 0;
1455	SET_MAP_OB (op->map, op->x, op->y, op);	1322	op->ms ().bot = op;
1456	}	1323	}
1457	else	1324	else
1458	{ /* get inserted into the stack above top */	1325	{ /* get inserted into the stack above top */
1459	op->above = top->above;	1326	op->above = top->above;
1460		1327
…		…
1463		1330
1464	op->below = top;	1331	op->below = top;
1465	top->above = op;	1332	top->above = op;
1466	}	1333	}
1467		1334
1468	if (op->above == NULL)	1335	if (!op->above)
1469	SET_MAP_TOP (op->map, op->x, op->y, op);	1336	op->ms ().top = op;
1470	} /* else not INS_BELOW_ORIGINATOR */	1337	} /* else not INS_BELOW_ORIGINATOR */
1471		1338
1472	if (op->type == PLAYER)	1339	if (op->type == PLAYER)
		1340	{
1473	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;
1474		1347
1475	/* 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
1476	* it, so save a few ticks and start from there.	1349	* it, so save a few ticks and start from there.
1477	*/	1350	*/
1478	if (!(flag & INS_MAP_LOAD))	1351	if (!(flag & INS_MAP_LOAD))
1479	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 ())
1480	if (tmp->type == PLAYER)	1353	if (pl->contr->ns)
1481	tmp->contr->socket.update_look = 1;	1354	pl->contr->ns->floorbox_update ();
1482		1355
1483	/* If this object glows, it may affect lighting conditions that are	1356	/* If this object glows, it may affect lighting conditions that are
1484	* 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
1485	* 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
1486	* on the map will get recalculated. The players could very well	1359	* on the map will get recalculated. The players could very well
1487	* 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 -
1488	* this should get redone to only look for players within range,	1361	* this should get redone to only look for players within range,
1489	* or just updating the P_NEED_UPDATE for spaces within this area	1362	* or just updating the P_UPTODATE for spaces within this area
1490	* of effect may be sufficient.	1363	* of effect may be sufficient.
1491	*/	1364	*/
1492	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1365	if (op->map->darkness && (op->glow_radius != 0))
1493	update_all_los (op->map, op->x, op->y);	1366	update_all_los (op->map, op->x, op->y);
1494		1367
1495	/* updates flags (blocked, alive, no magic, etc) for this map space */	1368	/* updates flags (blocked, alive, no magic, etc) for this map space */
1496	update_object (op, UP_OBJ_INSERT);	1369	update_object (op, UP_OBJ_INSERT);
1497		1370
		1371	INVOKE_OBJECT (INSERT, op);
		1372
1498	/* 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,
1499	* we want to have update_look set above before calling this.	1374	* we want to have floorbox_update called before calling this.
1500	*	1375	*
1501	* check_move_on() must be after this because code called from	1376	* check_move_on() must be after this because code called from
1502	* check_move_on() depends on correct map flags (so functions like	1377	* check_move_on() depends on correct map flags (so functions like
1503	* blocked() and wall() work properly), and these flags are updated by	1378	* blocked() and wall() work properly), and these flags are updated by
1504	* update_object().	1379	* update_object().
…		…
1506		1381
1507	/* 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 */
1508	if (!(flag & INS_NO_WALK_ON) && !op->head)	1383	if (!(flag & INS_NO_WALK_ON) && !op->head)
1509	{	1384	{
1510	if (check_move_on (op, originator))	1385	if (check_move_on (op, originator))
1511	return NULL;	1386	return 0;
1512		1387
1513	/* 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
1514	* walk on's.	1389	* walk on's.
1515	*/	1390	*/
1516	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1391	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1517	if (check_move_on (tmp, originator))	1392	if (check_move_on (tmp, originator))
1518	return NULL;	1393	return 0;
1519	}	1394	}
1520		1395
1521	return op;	1396	return op;
1522	}	1397	}
1523		1398
1524	/* this function inserts an object in the map, but if it	1399	/* this function inserts an object in the map, but if it
1525	* 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.
1526	* 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.
1527	*/	1402	*/
1528	void	1403	void
1529	replace_insert_ob_in_map (const char *arch_string, object *op)	1404	replace_insert_ob_in_map (const char *arch_string, object *op)
1530	{	1405	{
1531	object *	1406	object *tmp, *tmp1;
1532	tmp;
1533	object *
1534	tmp1;
1535		1407
1536	/* first search for itself and remove any old instances */	1408	/* first search for itself and remove any old instances */
1537		1409
1538	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)
1539	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1411	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1540	tmp->destroy ();	1412	tmp->destroy ();
1541		1413
1542	tmp1 = arch_to_object (archetype::find (arch_string));	1414	tmp1 = arch_to_object (archetype::find (arch_string));
1543		1415
1544	tmp1->x = op->x;	1416	tmp1->x = op->x;
1545	tmp1->y = op->y;	1417	tmp1->y = op->y;
1546	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);
1547	}	1425	}
1548		1426
1549	/*	1427	/*
1550	* 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
1551	* is returned contains nr objects, and the remaining parts contains	1429	* is returned contains nr objects, and the remaining parts contains
1552	* 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).
1553	* On failure, NULL is returned, and the reason put into the	1431	* On failure, NULL is returned, and the reason put into the
1554	* global static errmsg array.	1432	* global static errmsg array.
1555	*/	1433	*/
1556
1557	object *	1434	object *
1558	get_split_ob (object *orig_ob, uint32 nr)	1435	get_split_ob (object *orig_ob, uint32 nr)
1559	{	1436	{
1560	object *newob;	1437	object *newob;
1561	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1438	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1597		1474
1598	object *	1475	object *
1599	decrease_ob_nr (object *op, uint32 i)	1476	decrease_ob_nr (object *op, uint32 i)
1600	{	1477	{
1601	object *tmp;	1478	object *tmp;
1602	player *pl;
1603		1479
1604	if (i == 0) /* objects with op->nrof require this check */	1480	if (i == 0) /* objects with op->nrof require this check */
1605	return op;	1481	return op;
1606		1482
1607	if (i > op->nrof)	1483	if (i > op->nrof)
1608	i = op->nrof;	1484	i = op->nrof;
1609		1485
1610	if (QUERY_FLAG (op, FLAG_REMOVED))	1486	if (QUERY_FLAG (op, FLAG_REMOVED))
1611	op->nrof -= i;	1487	op->nrof -= i;
1612	else if (op->env != NULL)	1488	else if (op->env)
1613	{	1489	{
1614	/* is this object in the players inventory, or sub container	1490	/* is this object in the players inventory, or sub container
1615	* therein?	1491	* therein?
1616	*/	1492	*/
1617	tmp = is_player_inv (op->env);	1493	tmp = op->in_player ();
1618	/* nope. Is this a container the player has opened?	1494	/* nope. Is this a container the player has opened?
1619	* If so, set tmp to that player.	1495	* If so, set tmp to that player.
1620	* IMO, searching through all the players will mostly	1496	* IMO, searching through all the players will mostly
1621	* likely be quicker than following op->env to the map,	1497	* likely be quicker than following op->env to the map,
1622	* and then searching the map for a player.	1498	* and then searching the map for a player.
1623	*/	1499	*/
1624	if (!tmp)	1500	if (!tmp)
1625	{	1501	for_all_players (pl)
1626	for (pl = first_player; pl; pl = pl->next)
1627	if (pl->ob->container == op->env)	1502	if (pl->ob->container == op->env)
		1503	{
		1504	tmp = pl->ob;
1628	break;	1505	break;
1629	if (pl)
1630	tmp = pl->ob;
1631	else
1632	tmp = NULL;
1633	}	1506	}
1634		1507
1635	if (i < op->nrof)	1508	if (i < op->nrof)
1636	{	1509	{
1637	sub_weight (op->env, op->weight * i);	1510	sub_weight (op->env, op->weight * i);
1638	op->nrof -= i;	1511	op->nrof -= i;
1639	if (tmp)	1512	if (tmp)
1640	{
1641	esrv_send_item (tmp, op);	1513	esrv_send_item (tmp, op);
1642	}
1643	}	1514	}
1644	else	1515	else
1645	{	1516	{
1646	op->remove ();	1517	op->remove ();
1647	op->nrof = 0;	1518	op->nrof = 0;
1648	if (tmp)	1519	if (tmp)
1649	{
1650	esrv_del_item (tmp->contr, op->count);	1520	esrv_del_item (tmp->contr, op->count);
1651	}
1652	}	1521	}
1653	}	1522	}
1654	else	1523	else
1655	{	1524	{
1656	object *above = op->above;	1525	object *above = op->above;
…		…
1662	op->remove ();	1531	op->remove ();
1663	op->nrof = 0;	1532	op->nrof = 0;
1664	}	1533	}
1665		1534
1666	/* Since we just removed op, op->above is null */	1535	/* Since we just removed op, op->above is null */
1667	for (tmp = above; tmp != NULL; tmp = tmp->above)	1536	for (tmp = above; tmp; tmp = tmp->above)
1668	if (tmp->type == PLAYER)	1537	if (tmp->type == PLAYER)
1669	{	1538	{
1670	if (op->nrof)	1539	if (op->nrof)
1671	esrv_send_item (tmp, op);	1540	esrv_send_item (tmp, op);
1672	else	1541	else
…		…
1677	if (op->nrof)	1546	if (op->nrof)
1678	return op;	1547	return op;
1679	else	1548	else
1680	{	1549	{
1681	op->destroy ();	1550	op->destroy ();
1682	return NULL;	1551	return 0;
1683	}	1552	}
1684	}	1553	}
1685		1554
1686	/*	1555	/*
1687	* add_weight(object, weight) adds the specified weight to an object,	1556	* add_weight(object, weight) adds the specified weight to an object,
…		…
1747	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1616	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1748	CLEAR_FLAG (op, FLAG_REMOVED);	1617	CLEAR_FLAG (op, FLAG_REMOVED);
1749	if (op->nrof)	1618	if (op->nrof)
1750	{	1619	{
1751	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1620	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1752	if (CAN_MERGE (tmp, op))	1621	if (object::can_merge (tmp, op))
1753	{	1622	{
1754	/* return the original object and remove inserted object	1623	/* return the original object and remove inserted object
1755	(client needs the original object) */	1624	(client needs the original object) */
1756	tmp->nrof += op->nrof;	1625	tmp->nrof += op->nrof;
1757	/* Weight handling gets pretty funky. Since we are adding to	1626	/* Weight handling gets pretty funky. Since we are adding to
…		…
1775	add_weight (this, op->weight * op->nrof);	1644	add_weight (this, op->weight * op->nrof);
1776	}	1645	}
1777	else	1646	else
1778	add_weight (this, (op->weight + op->carrying));	1647	add_weight (this, (op->weight + op->carrying));
1779		1648
1780	otmp = is_player_inv (this);	1649	otmp = this->in_player ();
1781	if (otmp && otmp->contr)	1650	if (otmp && otmp->contr)
1782	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1651	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1783	fix_player (otmp);	1652	otmp->update_stats ();
1784		1653
1785	op->map = NULL;	1654	op->map = 0;
1786	op->env = this;	1655	op->env = this;
1787	op->above = NULL;	1656	op->above = 0;
1788	op->below = NULL;	1657	op->below = 0;
1789	op->x = 0, op->y = 0;	1658	op->x = 0, op->y = 0;
1790		1659
1791	/* 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 */
1792	if ((op->glow_radius != 0) && map)	1661	if ((op->glow_radius != 0) && map)
1793	{	1662	{
1794	#ifdef DEBUG_LIGHTS	1663	#ifdef DEBUG_LIGHTS
1795	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);
1796	#endif /* DEBUG_LIGHTS */	1665	#endif /* DEBUG_LIGHTS */
1797	if (MAP_DARKNESS (map))	1666	if (map->darkness)
1798	update_all_los (map, x, y);	1667	update_all_los (map, x, y);
1799	}	1668	}
1800		1669
1801	/* 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.
1802	* It sure simplifies this function...	1671	* It sure simplifies this function...
…		…
1807	{	1676	{
1808	op->below = inv;	1677	op->below = inv;
1809	op->below->above = op;	1678	op->below->above = op;
1810	inv = op;	1679	inv = op;
1811	}	1680	}
		1681
		1682	INVOKE_OBJECT (INSERT, this);
1812		1683
1813	return op;	1684	return op;
1814	}	1685	}
1815		1686
1816	/*	1687	/*
…		…
1831	*	1702	*
1832	* 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
1833	* 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
1834	* on top.	1705	* on top.
1835	*/	1706	*/
1836
1837	int	1707	int
1838	check_move_on (object *op, object *originator)	1708	check_move_on (object *op, object *originator)
1839	{	1709	{
1840	object *tmp;	1710	object *tmp;
1841	maptile *m = op->map;	1711	maptile *m = op->map;
…		…
1868		1738
1869	/* The objects have to be checked from top to bottom.	1739	/* The objects have to be checked from top to bottom.
1870	* Hence, we first go to the top:	1740	* Hence, we first go to the top:
1871	*/	1741	*/
1872		1742
1873	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)
1874	{	1744	{
1875	/* Trim the search when we find the first other spell effect	1745	/* Trim the search when we find the first other spell effect
1876	* 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,
1877	* we don't need to check all of them.	1747	* we don't need to check all of them.
1878	*/	1748	*/
…		…
1933	/*	1803	/*
1934	* present_arch(arch, map, x, y) searches for any objects with	1804	* present_arch(arch, map, x, y) searches for any objects with
1935	* a matching archetype at the given map and coordinates.	1805	* a matching archetype at the given map and coordinates.
1936	* The first matching object is returned, or NULL if none.	1806	* The first matching object is returned, or NULL if none.
1937	*/	1807	*/
1938
1939	object *	1808	object *
1940	present_arch (const archetype *at, maptile *m, int x, int y)	1809	present_arch (const archetype *at, maptile *m, int x, int y)
1941	{	1810	{
1942	object *
1943	tmp;
1944
1945	if (m == NULL || out_of_map (m, x, y))	1811	if (!m || out_of_map (m, x, y))
1946	{	1812	{
1947	LOG (llevError, "Present_arch called outside map.\n");	1813	LOG (llevError, "Present_arch called outside map.\n");
1948	return NULL;	1814	return NULL;
1949	}	1815	}
1950	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)
1951	if (tmp->arch == at)	1818	if (tmp->arch == at)
1952	return tmp;	1819	return tmp;
		1820
1953	return NULL;	1821	return NULL;
1954	}	1822	}
1955		1823
1956	/*	1824	/*
1957	* present(type, map, x, y) searches for any objects with	1825	* present(type, map, x, y) searches for any objects with
1958	* a matching type variable at the given map and coordinates.	1826	* a matching type variable at the given map and coordinates.
1959	* The first matching object is returned, or NULL if none.	1827	* The first matching object is returned, or NULL if none.
1960	*/	1828	*/
1961
1962	object *	1829	object *
1963	present (unsigned char type, maptile *m, int x, int y)	1830	present (unsigned char type, maptile *m, int x, int y)
1964	{	1831	{
1965	object *
1966	tmp;
1967
1968	if (out_of_map (m, x, y))	1832	if (out_of_map (m, x, y))
1969	{	1833	{
1970	LOG (llevError, "Present called outside map.\n");	1834	LOG (llevError, "Present called outside map.\n");
1971	return NULL;	1835	return NULL;
1972	}	1836	}
1973	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)
1974	if (tmp->type == type)	1839	if (tmp->type == type)
1975	return tmp;	1840	return tmp;
		1841
1976	return NULL;	1842	return NULL;
1977	}	1843	}
1978		1844
1979	/*	1845	/*
1980	* present_in_ob(type, object) searches for any objects with	1846	* present_in_ob(type, object) searches for any objects with
1981	* a matching type variable in the inventory of the given object.	1847	* a matching type variable in the inventory of the given object.
1982	* The first matching object is returned, or NULL if none.	1848	* The first matching object is returned, or NULL if none.
1983	*/	1849	*/
1984
1985	object *	1850	object *
1986	present_in_ob (unsigned char type, const object *op)	1851	present_in_ob (unsigned char type, const object *op)
1987	{	1852	{
1988	object *
1989	tmp;
1990
1991	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1853	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1992	if (tmp->type == type)	1854	if (tmp->type == type)
1993	return tmp;	1855	return tmp;
		1856
1994	return NULL;	1857	return NULL;
1995	}	1858	}
1996		1859
1997	/*	1860	/*
1998	* present_in_ob (type, str, object) searches for any objects with	1861	* present_in_ob (type, str, object) searches for any objects with
…		…
2006	* 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
2007	* 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
2008	* 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
2009	* to be unique.	1872	* to be unique.
2010	*/	1873	*/
2011
2012	object *	1874	object *
2013	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)
2014	{	1876	{
2015	object *
2016	tmp;
2017
2018	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1877	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2019	{
2020	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1878	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2021	return tmp;	1879	return tmp;
2022	}	1880
2023	return NULL;	1881	return 0;
2024	}	1882	}
2025		1883
2026	/*	1884	/*
2027	* present_arch_in_ob(archetype, object) searches for any objects with	1885	* present_arch_in_ob(archetype, object) searches for any objects with
2028	* a matching archetype in the inventory of the given object.	1886	* a matching archetype in the inventory of the given object.
2029	* The first matching object is returned, or NULL if none.	1887	* The first matching object is returned, or NULL if none.
2030	*/	1888	*/
2031
2032	object *	1889	object *
2033	present_arch_in_ob (const archetype *at, const object *op)	1890	present_arch_in_ob (const archetype *at, const object *op)
2034	{	1891	{
2035	object *
2036	tmp;
2037
2038	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1892	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2039	if (tmp->arch == at)	1893	if (tmp->arch == at)
2040	return tmp;	1894	return tmp;
		1895
2041	return NULL;	1896	return NULL;
2042	}	1897	}
2043		1898
2044	/*	1899	/*
2045	* activate recursively a flag on an object inventory	1900	* activate recursively a flag on an object inventory
2046	*/	1901	*/
2047	void	1902	void
2048	flag_inv (object *op, int flag)	1903	flag_inv (object *op, int flag)
2049	{	1904	{
2050	object *
2051	tmp;
2052
2053	if (op->inv)	1905	if (op->inv)
2054	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2055	{	1907	{
2056	SET_FLAG (tmp, flag);	1908	SET_FLAG (tmp, flag);
2057	flag_inv (tmp, flag);	1909	flag_inv (tmp, flag);
2058	}	1910	}
2059	} /*	1911	}
		1912
		1913	/*
2060	* desactivate recursively a flag on an object inventory	1914	* deactivate recursively a flag on an object inventory
2061	*/	1915	*/
2062	void	1916	void
2063	unflag_inv (object *op, int flag)	1917	unflag_inv (object *op, int flag)
2064	{	1918	{
2065	object *
2066	tmp;
2067
2068	if (op->inv)	1919	if (op->inv)
2069	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2070	{	1921	{
2071	CLEAR_FLAG (tmp, flag);	1922	CLEAR_FLAG (tmp, flag);
2072	unflag_inv (tmp, flag);	1923	unflag_inv (tmp, flag);
2073	}	1924	}
2074	}	1925	}
…		…
2077	* 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
2078	* all it's inventory (recursively).	1929	* all it's inventory (recursively).
2079	* 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
2080	* 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.
2081	*/	1932	*/
2082
2083	void	1933	void
2084	set_cheat (object *op)	1934	set_cheat (object *op)
2085	{	1935	{
2086	SET_FLAG (op, FLAG_WAS_WIZ);	1936	SET_FLAG (op, FLAG_WAS_WIZ);
2087	flag_inv (op, FLAG_WAS_WIZ);	1937	flag_inv (op, FLAG_WAS_WIZ);
…		…
2106	* 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
2107	* 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
2108	* 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
2109	* customized, changed states, etc.	1959	* customized, changed states, etc.
2110	*/	1960	*/
2111
2112	int	1961	int
2113	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)
2114	{	1963	{
2115	int
2116	i,
2117	index = 0, flag;	1964	int index = 0, flag;
2118	static int
2119	altern[SIZEOFFREE];	1965	int altern[SIZEOFFREE];
2120		1966
2121	for (i = start; i < stop; i++)	1967	for (int i = start; i < stop; i++)
2122	{	1968	{
2123	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]);
2124	if (!flag)	1970	if (!flag)
2125	altern[index++] = i;	1971	altern [index++] = i;
2126		1972
2127	/* 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.
2128	* 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.
2129	* 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 -
2130	* 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
2131	* 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
2132	* to only the spaces immediately surrounding the target area, and	1978	* to only the spaces immediately surrounding the target area, and
2133	* won't look 2 spaces south of the target space.	1979	* won't look 2 spaces south of the target space.
2134	*/	1980	*/
2135	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1981	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2136	stop = maxfree[i];	1982	stop = maxfree[i];
2137	}	1983	}
		1984
2138	if (!index)	1985	if (!index)
2139	return -1;	1986	return -1;
		1987
2140	return altern[RANDOM () % index];	1988	return altern[RANDOM () % index];
2141	}	1989	}
2142		1990
2143	/*	1991	/*
2144	* find_first_free_spot(archetype, maptile, x, y) works like	1992	* find_first_free_spot(archetype, maptile, x, y) works like
2145	* find_free_spot(), but it will search max number of squares.	1993	* find_free_spot(), but it will search max number of squares.
2146	* 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.
2147	* 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.
2148	*/	1996	*/
2149
2150	int	1997	int
2151	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)
2152	{	1999	{
2153	int
2154	i;
2155
2156	for (i = 0; i < SIZEOFFREE; i++)	2000	for (int i = 0; i < SIZEOFFREE; i++)
2157	{
2158	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]))
2159	return i;	2002	return i;
2160	}	2003
2161	return -1;	2004	return -1;
2162	}	2005	}
2163		2006
2164	/*	2007	/*
2165	* The function permute(arr, begin, end) randomly reorders the array	2008	* The function permute(arr, begin, end) randomly reorders the array
2166	* arr[begin..end-1].	2009	* arr[begin..end-1].
		2010	* now uses a fisher-yates shuffle, old permute was broken
2167	*/	2011	*/
2168	static void	2012	static void
2169	permute (int *arr, int begin, int end)	2013	permute (int *arr, int begin, int end)
2170	{	2014	{
2171	int	2015	arr += begin;
2172	i,
2173	j,
2174	tmp,
2175	len;
2176
2177	len = end - begin;	2016	end -= begin;
2178	for (i = begin; i < end; i++)
2179	{
2180	j = begin + RANDOM () % len;
2181		2017
2182	tmp = arr[i];	2018	while (--end)
2183	arr[i] = arr[j];	2019	swap (arr [end], arr [RANDOM () % (end + 1)]);
2184	arr[j] = tmp;
2185	}
2186	}	2020	}
2187		2021
2188	/* new function to make monster searching more efficient, and effective!	2022	/* new function to make monster searching more efficient, and effective!
2189	* This basically returns a randomized array (in the passed pointer) of	2023	* This basically returns a randomized array (in the passed pointer) of
2190	* 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
…		…
2193	* 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.
2194	*/	2028	*/
2195	void	2029	void
2196	get_search_arr (int *search_arr)	2030	get_search_arr (int *search_arr)
2197	{	2031	{
2198	int	2032	int i;
2199	i;
2200		2033
2201	for (i = 0; i < SIZEOFFREE; i++)	2034	for (i = 0; i < SIZEOFFREE; i++)
2202	{
2203	search_arr[i] = i;	2035	search_arr[i] = i;
2204	}
2205		2036
2206	permute (search_arr, 1, SIZEOFFREE1 + 1);	2037	permute (search_arr, 1, SIZEOFFREE1 + 1);
2207	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2038	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2208	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2039	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2209	}	2040	}
…		…
2218	* Perhaps incorrectly, but I'm making the assumption that exclude	2049	* Perhaps incorrectly, but I'm making the assumption that exclude
2219	* 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
2220	* 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
2221	* there is capable of.	2052	* there is capable of.
2222	*/	2053	*/
2223
2224	int	2054	int
2225	find_dir (maptile *m, int x, int y, object *exclude)	2055	find_dir (maptile *m, int x, int y, object *exclude)
2226	{	2056	{
2227	int
2228	i,
2229	max = SIZEOFFREE, mflags;	2057	int i, max = SIZEOFFREE, mflags;
2230		2058
2231	sint16 nx, ny;	2059	sint16 nx, ny;
2232	object *	2060	object *tmp;
2233	tmp;
2234	maptile *	2061	maptile *mp;
2235	mp;
2236		2062
2237	MoveType blocked, move_type;	2063	MoveType blocked, move_type;
2238		2064
2239	if (exclude && exclude->head)	2065	if (exclude && exclude->head)
2240	{	2066	{
…		…
2252	mp = m;	2078	mp = m;
2253	nx = x + freearr_x[i];	2079	nx = x + freearr_x[i];
2254	ny = y + freearr_y[i];	2080	ny = y + freearr_y[i];
2255		2081
2256	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2082	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2083
2257	if (mflags & P_OUT_OF_MAP)	2084	if (mflags & P_OUT_OF_MAP)
2258	{
2259	max = maxfree[i];	2085	max = maxfree[i];
2260	}
2261	else	2086	else
2262	{	2087	{
2263	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2088	mapspace &ms = mp->at (nx, ny);
		2089
		2090	blocked = ms.move_block;
2264		2091
2265	if ((move_type & blocked) == move_type)	2092	if ((move_type & blocked) == move_type)
2266	{
2267	max = maxfree[i];	2093	max = maxfree[i];
2268	}
2269	else if (mflags & P_IS_ALIVE)	2094	else if (mflags & P_IS_ALIVE)
2270	{	2095	{
2271	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2096	for (tmp = ms.bot; tmp; tmp = tmp->above)
2272	{	2097	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2273	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2098	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2274	{
2275	break;	2099	break;
2276	}	2100
2277	}
2278	if (tmp)	2101	if (tmp)
2279	{
2280	return freedir[i];	2102	return freedir[i];
2281	}
2282	}	2103	}
2283	}	2104	}
2284	}	2105	}
		2106
2285	return 0;	2107	return 0;
2286	}	2108	}
2287		2109
2288	/*	2110	/*
2289	* distance(object 1, object 2) will return the square of the	2111	* distance(object 1, object 2) will return the square of the
2290	* distance between the two given objects.	2112	* distance between the two given objects.
2291	*/	2113	*/
2292
2293	int	2114	int
2294	distance (const object *ob1, const object *ob2)	2115	distance (const object *ob1, const object *ob2)
2295	{	2116	{
2296	int
2297	i;
2298
2299	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);
2300	return i;
2301	}	2118	}
2302		2119
2303	/*	2120	/*
2304	* 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
2305	* 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
2306	* object, needs to travel toward it.	2123	* object, needs to travel toward it.
2307	*/	2124	*/
2308
2309	int	2125	int
2310	find_dir_2 (int x, int y)	2126	find_dir_2 (int x, int y)
2311	{	2127	{
2312	int	2128	int q;
2313	q;
2314		2129
2315	if (y)	2130	if (y)
2316	q = x * 100 / y;	2131	q = x * 100 / y;
2317	else if (x)	2132	else if (x)
2318	q = -300 * x;	2133	q = -300 * x;
…		…
2353	int	2168	int
2354	absdir (int d)	2169	absdir (int d)
2355	{	2170	{
2356	while (d < 1)	2171	while (d < 1)
2357	d += 8;	2172	d += 8;
		2173
2358	while (d > 8)	2174	while (d > 8)
2359	d -= 8;	2175	d -= 8;
		2176
2360	return d;	2177	return d;
2361	}	2178	}
2362		2179
2363	/*	2180	/*
2364	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2366	*/	2183	*/
2367		2184
2368	int	2185	int
2369	dirdiff (int dir1, int dir2)	2186	dirdiff (int dir1, int dir2)
2370	{	2187	{
2371	int	2188	int d;
2372	d;
2373		2189
2374	d = abs (dir1 - dir2);	2190	d = abs (dir1 - dir2);
2375	if (d > 4)	2191	if (d > 4)
2376	d = 8 - d;	2192	d = 8 - d;
		2193
2377	return d;	2194	return d;
2378	}	2195	}
2379		2196
2380	/* peterm:	2197	/* peterm:
2381	* 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.
…		…
2384	* 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
2385	* 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.
2386	* 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
2387	* functions.	2204	* functions.
2388	*/	2205	*/
2389
2390	int
2391	reduction_dir[SIZEOFFREE][3] = {	2206	int reduction_dir[SIZEOFFREE][3] = {
2392	{0, 0, 0}, /* 0 */	2207	{0, 0, 0}, /* 0 */
2393	{0, 0, 0}, /* 1 */	2208	{0, 0, 0}, /* 1 */
2394	{0, 0, 0}, /* 2 */	2209	{0, 0, 0}, /* 2 */
2395	{0, 0, 0}, /* 3 */	2210	{0, 0, 0}, /* 3 */
2396	{0, 0, 0}, /* 4 */	2211	{0, 0, 0}, /* 4 */
…		…
2444	* find a path to that monster that we found. If not,	2259	* find a path to that monster that we found. If not,
2445	* we don't bother going toward it. Returns 1 if we	2260	* we don't bother going toward it. Returns 1 if we
2446	* can see a direct way to get it	2261	* can see a direct way to get it
2447	* Modified to be map tile aware -.MSW	2262	* Modified to be map tile aware -.MSW
2448	*/	2263	*/
2449
2450
2451	int	2264	int
2452	can_see_monsterP (maptile *m, int x, int y, int dir)	2265	can_see_monsterP (maptile *m, int x, int y, int dir)
2453	{	2266	{
2454	sint16 dx, dy;	2267	sint16 dx, dy;
2455	int
2456	mflags;	2268	int mflags;
2457		2269
2458	if (dir < 0)	2270	if (dir < 0)
2459	return 0; /* exit condition: invalid direction */	2271	return 0; /* exit condition: invalid direction */
2460		2272
2461	dx = x + freearr_x[dir];	2273	dx = x + freearr_x[dir];
…		…
2474	return 0;	2286	return 0;
2475		2287
2476	/* yes, can see. */	2288	/* yes, can see. */
2477	if (dir < 9)	2289	if (dir < 9)
2478	return 1;	2290	return 1;
		2291
2479	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2292	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2480	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]);
2481	}	2295	}
2482
2483
2484		2296
2485	/*	2297	/*
2486	* 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
2487	* picked up by the picker. Returnes 1 if it can be	2299	* picked up by the picker. Returnes 1 if it can be
2488	* picked up, otherwise 0.	2300	* picked up, otherwise 0.
…		…
2499	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2311	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2500	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2312	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2501	!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));
2502	}	2314	}
2503		2315
2504
2505	/*	2316	/*
2506	* create clone from object to another	2317	* create clone from object to another
2507	*/	2318	*/
2508	object *	2319	object *
2509	object_create_clone (object *asrc)	2320	object_create_clone (object *asrc)
…		…
2518	src = src->head;	2329	src = src->head;
2519		2330
2520	prev = 0;	2331	prev = 0;
2521	for (part = src; part; part = part->more)	2332	for (part = src; part; part = part->more)
2522	{	2333	{
2523	tmp = object::create ();	2334	tmp = part->clone ();
2524	part->copy_to (tmp);
2525	tmp->x -= src->x;	2335	tmp->x -= src->x;
2526	tmp->y -= src->y;	2336	tmp->y -= src->y;
2527		2337
2528	if (!part->head)	2338	if (!part->head)
2529	{	2339	{
2530	dst = tmp;	2340	dst = tmp;
2531	tmp->head = 0;	2341	tmp->head = 0;
2532	}	2342	}
2533	else	2343	else
2534	{
2535	tmp->head = dst;	2344	tmp->head = dst;
2536	}
2537		2345
2538	tmp->more = 0;	2346	tmp->more = 0;
2539		2347
2540	if (prev)	2348	if (prev)
2541	prev->more = tmp;	2349	prev->more = tmp;
…		…
2553	/* 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 */
2554	/* 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, */
2555	/* 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. */
2556	/* 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. */
2557	/* Also remember that multiparts objects are not supported for now. */	2365	/* Also remember that multiparts objects are not supported for now. */
2558
2559	object *	2366	object *
2560	load_object_str (const char *obstr)	2367	load_object_str (const char *obstr)
2561	{	2368	{
2562	object *op;	2369	object *op;
2563	char filename[MAX_BUF];	2370	char filename[MAX_BUF];
…		…
2593	* returns NULL if no match.	2400	* returns NULL if no match.
2594	*/	2401	*/
2595	object *	2402	object *
2596	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)
2597	{	2404	{
2598	object *tmp;
2599
2600	for (tmp = who->inv; tmp; tmp = tmp->below)	2405	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2601	if (tmp->type == type && tmp->subtype == subtype)	2406	if (tmp->type == type && tmp->subtype == subtype)
2602	return tmp;	2407	return tmp;
2603		2408
2604	return NULL;	2409	return 0;
2605	}	2410	}
2606		2411
2607	/* 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,
2608	* otherwise return NULL.	2413	* otherwise return NULL.
2609	*	2414	*
…		…
2611	* do the desired thing.	2416	* do the desired thing.
2612	*/	2417	*/
2613	key_value *	2418	key_value *
2614	get_ob_key_link (const object *ob, const char *key)	2419	get_ob_key_link (const object *ob, const char *key)
2615	{	2420	{
2616	key_value *link;
2617
2618	for (link = ob->key_values; link != NULL; link = link->next)	2421	for (key_value *link = ob->key_values; link; link = link->next)
2619	if (link->key == key)	2422	if (link->key == key)
2620	return link;	2423	return link;
2621		2424
2622	return NULL;	2425	return 0;
2623	}	2426	}
2624		2427
2625	/*	2428	/*
2626	* 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.
2627	*	2430	*
…		…
2667	* Returns TRUE on success.	2470	* Returns TRUE on success.
2668	*/	2471	*/
2669	int	2472	int
2670	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)
2671	{	2474	{
2672	key_value *
2673	field = NULL, *last = NULL;	2475	key_value *field = NULL, *last = NULL;
2674		2476
2675	for (field = op->key_values; field != NULL; field = field->next)	2477	for (field = op->key_values; field != NULL; field = field->next)
2676	{	2478	{
2677	if (field->key != canonical_key)	2479	if (field->key != canonical_key)
2678	{	2480	{
…		…
2706	/* IF we get here, key doesn't exist */	2508	/* IF we get here, key doesn't exist */
2707		2509
2708	/* No field, we'll have to add it. */	2510	/* No field, we'll have to add it. */
2709		2511
2710	if (!add_key)	2512	if (!add_key)
2711	{
2712	return FALSE;	2513	return FALSE;
2713	}	2514
2714	/* There isn't any good reason to store a null	2515	/* There isn't any good reason to store a null
2715	* value in the key/value list. If the archetype has	2516	* value in the key/value list. If the archetype has
2716	* this key, then we should also have it, so shouldn't	2517	* this key, then we should also have it, so shouldn't
2717	* be here. If user wants to store empty strings,	2518	* be here. If user wants to store empty strings,
2718	* should pass in ""	2519	* should pass in ""
…		…
2767	}	2568	}
2768	else	2569	else
2769	item = item->env;	2570	item = item->env;
2770	}	2571	}
2771		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
2772	// 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
2773	const char *	2603	const char *
2774	object::debug_desc (char *info) const	2604	object::debug_desc (char *info) const
2775	{	2605	{
		2606	char flagdesc[512];
2776	char info2[256 * 3];	2607	char info2[256 * 4];
2777	char *p = info;	2608	char *p = info;
2778		2609
2779	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}",
2780	count,	2611	count, uuid.seq,
2781	&name,	2612	&name,
2782	title ? " " : "",	2613	title ? "\",title:" : "",
2783	title ? (const char *)title : "");	2614	title ? (const char *)title : "",
		2615	flag_desc (flagdesc, 512), type);
2784		2616
2785	if (env)	2617	if (env)
2786	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2787		2619
2788	if (map)	2620	if (map)
2789	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);
2790		2622
2791	return info;	2623	return info;
2792	}	2624	}
2793		2625
2794	const char *	2626	const char *
2795	object::debug_desc () const	2627	object::debug_desc () const
2796	{	2628	{
2797	static char info[256 * 3];	2629	static char info[256 * 4];
2798	return debug_desc (info);	2630	return debug_desc (info);
2799	}	2631	}
2800		2632

Diff Legend

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