ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.53 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.88 by root, Tue Dec 26 09:37:00 2006 UTC

…		…
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
34		36
35	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
36	static UUID uuid;	38	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
38		40
…		…
104	_exit (1);	106	_exit (1);
105	}	107	}
106		108
107	uuid.seq = uid;	109	uuid.seq = uid;
108	write_uuid ();	110	write_uuid ();
109	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110	fclose (fp);	112	fclose (fp);
111	}	113	}
112		114
113	UUID	115	UUID
114	gen_uuid ()	116	gen_uuid ()
…		…
139	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
141	*/	143	*/
142		144
143	/* For each field in wants, */	145	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	147	{
146	key_value *has_field;	148	key_value *has_field;
147		149
148	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
183	*	185	*
184	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
187	*	189	*
188	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
189	*	191	*
190	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
191	* check weight	193	* check weight
192	*/	194	*/
193		195
194	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	197	{
196	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
198	return 0;	204	return 0;
199		205
200	if (ob1->speed != ob2->speed)	206	//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	207	/* 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	208	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	209	* used to store nrof).
206	*/	210	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		222
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		225
222		226	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	227	|| 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) ||	228	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	247	|| 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))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	251	return 0;
254		252
255	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	254	* check all objects in the inventory.
257	*/	255	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	260	return 0;
263		261
264	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	264	return 0;
267		265
268	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	267	* if it is valid.
270	*/	268	*/
…		…
354	op = op->env;	352	op = op->env;
355	return op;	353	return op;
356	}	354	}
357		355
358	/*	356	/*
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.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	358	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
377	*/	360	*/
378		361
…		…
381	{	364	{
382	if (!op)	365	if (!op)
383	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
384		367
385	object_freezer freezer;	368	object_freezer freezer;
386	save_object (freezer, op, 3);	369	save_object (freezer, op, 1);
387	return freezer.as_string ();	370	return freezer.as_string ();
388	}	371	}
389		372
390	/*	373	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
412	*/	395	*/
413		396
414	object *	397	object *
415	find_object (tag_t i)	398	find_object (tag_t i)
416	{	399	{
417	object *op;
418
419	for (op = object::first; op != NULL; op = op->next)	400	for (object *op = object::first; op; op = op->next)
420	if (op->count == i)	401	if (op->count == i)
421	break;	402	return op;
422		403
423	return op;	404	return 0;
424	}	405	}
425		406
426	/*	407	/*
427	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
428	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
486	}	467	}
487		468
488	op->key_values = 0;	469	op->key_values = 0;
489	}	470	}
490		471
491	void object::clear ()
492	{
493	attachable_base::clear ();
494
495	free_key_values (this);
496
497	owner = 0;
498	name = 0;
499	name_pl = 0;
500	title = 0;
501	race = 0;
502	slaying = 0;
503	skill = 0;
504	msg = 0;
505	lore = 0;
506	custom_name = 0;
507	materialname = 0;
508	contr = 0;
509	below = 0;
510	above = 0;
511	inv = 0;
512	container = 0;
513	env = 0;
514	more = 0;
515	head = 0;
516	map = 0;
517	active_next = 0;
518	active_prev = 0;
519
520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
521
522	SET_FLAG (this, FLAG_REMOVED);
523
524	/* What is not cleared is next, prev, and count */
525
526	expmul = 1.0;
527	face = blank_face;
528
529	if (settings.casting_time)
530	casting_time = -1;
531	}
532
533	void object::clone (object *destination)
534	{
535	*(object_copy *)destination = *this;
536	*(object_pod *)destination = *this;
537
538	if (self || cb)
539	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
540	}
541
542	/*	472	/*
543	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
544	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
545	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
546	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
547	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
548	* will point at garbage.	478	* will point at garbage.
549	*/	479	*/
550	void	480	void
551	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
552	{	482	{
553	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
554	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
555		485
556	op2->clone (op);	486	*(object_copy *)dst = *this;
557		487
558	if (is_freed)	488	if (is_freed)
559	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
560	if (is_removed)	491	if (is_removed)
561	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
562		493
563	if (op2->speed < 0)	494	if (speed < 0)
564	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
565		496
566	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
567	if (op2->key_values)	498	if (key_values)
568	{	499	{
569	key_value *tail = 0;	500	key_value *tail = 0;
570	key_value *i;	501	key_value *i;
571		502
572	op->key_values = 0;	503	dst->key_values = 0;
573		504
574	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
575	{	506	{
576	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
577		508
578	new_link->next = 0;	509	new_link->next = 0;
579	new_link->key = i->key;	510	new_link->key = i->key;
580	new_link->value = i->value;	511	new_link->value = i->value;
581		512
582	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
583	if (!op->key_values)	514	if (!dst->key_values)
584	{	515	{
585	op->key_values = new_link;	516	dst->key_values = new_link;
586	tail = new_link;	517	tail = new_link;
587	}	518	}
588	else	519	else
589	{	520	{
590	tail->next = new_link;	521	tail->next = new_link;
591	tail = new_link;	522	tail = new_link;
592	}	523	}
593	}	524	}
594	}	525	}
595		526
596	update_ob_speed (op);	527	dst->set_speed (dst->speed);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
597	}	536	}
598		537
599	/*	538	/*
600	* If an object with the IS_TURNABLE() flag needs to be turned due	539	* If an object with the IS_TURNABLE() flag needs to be turned due
601	* to the closest player being on the other side, this function can	540	* to the closest player being on the other side, this function can
…		…
615	* Updates the speed of an object. If the speed changes from 0 to another	554	* Updates the speed of an object. If the speed changes from 0 to another
616	* value, or vice versa, then add/remove the object from the active list.	555	* value, or vice versa, then add/remove the object from the active list.
617	* This function needs to be called whenever the speed of an object changes.	556	* This function needs to be called whenever the speed of an object changes.
618	*/	557	*/
619	void	558	void
620	update_ob_speed (object *op)	559	object::set_speed (float speed)
621	{	560	{
622	extern int arch_init;	561	extern int arch_init;
623		562
624	/* No reason putting the archetypes objects on the speed list,	563	/* No reason putting the archetypes objects on the speed list,
625	* since they never really need to be updated.	564	* since they never really need to be updated.
626	*/	565	*/
627		566	if (flag [FLAG_FREED] && speed)
628	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
629	{	567	{
630	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	568	LOG (llevError, "Object %s is freed but has speed.\n", &name);
631	#ifdef MANY_CORES
632	abort ();
633	#else
634	op->speed = 0;	569	speed = 0;
635	#endif
636	}	570	}
		571
		572	this->speed = speed;
637		573
638	if (arch_init)	574	if (arch_init)
639	return;	575	return;
640		576
641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	577	if (FABS (speed) > MIN_ACTIVE_SPEED)
642	{	578	{
643	/* If already on active list, don't do anything */	579	/* If already on active list, don't do anything */
644	if (op->active_next || op->active_prev || op == active_objects)	580	if (active_next || active_prev || this == active_objects)
645	return;	581	return;
646		582
647	/* process_events() expects us to insert the object at the beginning	583	/* process_events() expects us to insert the object at the beginning
648	* of the list. */	584	* of the list. */
649	op->active_next = active_objects;	585	active_next = active_objects;
650		586
651	if (op->active_next != NULL)	587	if (active_next)
652	op->active_next->active_prev = op;	588	active_next->active_prev = this;
653		589
654	active_objects = op;	590	active_objects = this;
655	}	591	}
656	else	592	else
657	{	593	{
658	/* If not on the active list, nothing needs to be done */	594	/* If not on the active list, nothing needs to be done */
659	if (!op->active_next && !op->active_prev && op != active_objects)	595	if (!active_next && !active_prev && this != active_objects)
660	return;	596	return;
661		597
662	if (op->active_prev == NULL)	598	if (!active_prev)
663	{	599	{
664	active_objects = op->active_next;	600	active_objects = active_next;
665		601
666	if (op->active_next != NULL)	602	if (active_next)
667	op->active_next->active_prev = NULL;	603	active_next->active_prev = 0;
668	}	604	}
669	else	605	else
670	{	606	{
671	op->active_prev->active_next = op->active_next;	607	active_prev->active_next = active_next;
672		608
673	if (op->active_next)	609	if (active_next)
674	op->active_next->active_prev = op->active_prev;	610	active_next->active_prev = active_prev;
675	}	611	}
676		612
677	op->active_next = NULL;	613	active_next = 0;
678	op->active_prev = NULL;	614	active_prev = 0;
679	}	615	}
680	}	616	}
681		617
682	/* This function removes object 'op' from the list of active	618	/* This function removes object 'op' from the list of active
683	* objects.	619	* objects.
…		…
709	op->active_next = NULL;	645	op->active_next = NULL;
710	op->active_prev = NULL;	646	op->active_prev = NULL;
711	}	647	}
712		648
713	/*	649	/*
714	* update_object() updates the array which represents the map.	650	* update_object() updates the the map.
715	* It takes into account invisible objects (and represent squares covered	651	* It takes into account invisible objects (and represent squares covered
716	* by invisible objects by whatever is below them (unless it's another	652	* by invisible objects by whatever is below them (unless it's another
717	* invisible object, etc...)	653	* invisible object, etc...)
718	* If the object being updated is beneath a player, the look-window	654	* If the object being updated is beneath a player, the look-window
719	* of that player is updated (this might be a suboptimal way of	655	* of that player is updated (this might be a suboptimal way of
720	* updating that window, though, since update_object() is called _often_)	656	* updating that window, though, since update_object() is called _often_)
721	*	657	*
722	* action is a hint of what the caller believes need to be done.	658	* action is a hint of what the caller believes need to be done.
723	* For example, if the only thing that has changed is the face (due to
724	* an animation), we don't need to call update_position until that actually
725	* comes into view of a player. OTOH, many other things, like addition/removal
726	* of walls or living creatures may need us to update the flags now.
727	* current action are:	659	* current action are:
728	* UP_OBJ_INSERT: op was inserted	660	* UP_OBJ_INSERT: op was inserted
729	* UP_OBJ_REMOVE: op was removed	661	* UP_OBJ_REMOVE: op was removed
730	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	662	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731	* as that is easier than trying to look at what may have changed.	663	* as that is easier than trying to look at what may have changed.
732	* UP_OBJ_FACE: only the objects face has changed.	664	* UP_OBJ_FACE: only the objects face has changed.
733	*/	665	*/
734
735	void	666	void
736	update_object (object *op, int action)	667	update_object (object *op, int action)
737	{	668	{
738	int update_now = 0, flags;
739	MoveType move_on, move_off, move_block, move_slow;	669	MoveType move_on, move_off, move_block, move_slow;
740		670
741	if (op == NULL)	671	if (op == NULL)
742	{	672	{
743	/* this should never happen */	673	/* this should never happen */
744	LOG (llevDebug, "update_object() called for NULL object.\n");	674	LOG (llevDebug, "update_object() called for NULL object.\n");
745	return;	675	return;
746	}	676	}
747		677
748	if (op->env != NULL)	678	if (op->env)
749	{	679	{
750	/* Animation is currently handled by client, so nothing	680	/* Animation is currently handled by client, so nothing
751	* to do in this case.	681	* to do in this case.
752	*/	682	*/
753	return;	683	return;
…		…
758	*/	688	*/
759	if (!op->map || op->map->in_memory == MAP_SAVING)	689	if (!op->map || op->map->in_memory == MAP_SAVING)
760	return;	690	return;
761		691
762	/* make sure the object is within map boundaries */	692	/* make sure the object is within map boundaries */
763	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	693	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
764	{	694	{
765	LOG (llevError, "update_object() called for object out of map!\n");	695	LOG (llevError, "update_object() called for object out of map!\n");
766	#ifdef MANY_CORES	696	#ifdef MANY_CORES
767	abort ();	697	abort ();
768	#endif	698	#endif
769	return;	699	return;
770	}	700	}
771		701
772	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	702	mapspace &m = op->ms ();
773	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778		703
		704	if (m.flags_ & P_NEED_UPDATE)
		705	/* nop */;
779	if (action == UP_OBJ_INSERT)	706	else if (action == UP_OBJ_INSERT)
780	{	707	{
		708	// this is likely overkill, TODO: revisit (schmorp)
781	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	710	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	update_now = 1;	711	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786		712	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		713	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	714	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	update_now = 1;
789
790	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791	update_now = 1;
792
793	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794	update_now = 1;
795
796	if ((move_on | op->move_on) != move_on)	715	|| (m.move_on | op->move_on ) != m.move_on
797	update_now = 1;
798
799	if ((move_off | op->move_off) != move_off)	716	|| (m.move_off | op->move_off ) != m.move_off
800	update_now = 1;	717	|| (m.move_slow | op->move_slow) != m.move_slow
801
802	/* This isn't perfect, but I don't expect a lot of objects to	718	/* This isn't perfect, but I don't expect a lot of objects to
803	* to have move_allow right now.	719	* to have move_allow right now.
804	*/	720	*/
805	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806	update_now = 1;	722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807		723	m.flags_ = P_NEED_UPDATE;
808	if ((move_slow | op->move_slow) != move_slow)
809	update_now = 1;
810	}	724	}
811	/* if the object is being removed, we can't make intelligent	725	/* if the object is being removed, we can't make intelligent
812	* decisions, because remove_ob can't really pass the object	726	* decisions, because remove_ob can't really pass the object
813	* that is being removed.	727	* that is being removed.
814	*/	728	*/
815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
816	update_now = 1;	730	m.flags_ = P_NEED_UPDATE;
817	else if (action == UP_OBJ_FACE)	731	else if (action == UP_OBJ_FACE)
818	/* Nothing to do for that case */ ;	732	/* Nothing to do for that case */ ;
819	else	733	else
820	LOG (llevError, "update_object called with invalid action: %d\n", action);	734	LOG (llevError, "update_object called with invalid action: %d\n", action);
821		735
822	if (update_now)
823	{
824	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
825	update_position (op->map, op->x, op->y);
826	}
827
828	if (op->more != NULL)	736	if (op->more)
829	update_object (op->more, action);	737	update_object (op->more, action);
830	}	738	}
831		739
832	object::vector object::mortals;
833	object::vector object::objects; // not yet used	740	object::vector object::objects; // not yet used
834	object *object::first;	741	object *object::first;
835
836	void object::free_mortals ()
837	{
838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
839	if ((*i)->refcnt)
840	++i; // further delay freeing
841	else
842	{
843	delete *i;
844	mortals.erase (i);
845	}
846
847	static int lastmortals = 0;//D
848
849	if (mortals.size() != lastmortals && lastmortals > 100)//D
850	{
851	lastmortals = mortals.size ();//D
852	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
853	}
854	}
855		742
856	object::object ()	743	object::object ()
857	{	744	{
858	SET_FLAG (this, FLAG_REMOVED);	745	SET_FLAG (this, FLAG_REMOVED);
859		746
…		…
898	object *op = new object;	785	object *op = new object;
899	op->link ();	786	op->link ();
900	return op;	787	return op;
901	}	788	}
902		789
903	/*	790	void
904	* free_object() frees everything allocated by an object, removes	791	object::do_destroy ()
905	* it from the list of used objects, and puts it on the list of
906	* free objects. The IS_FREED() flag is set in the object.
907	* The object must have been removed by remove_ob() first for
908	* this function to succeed.
909	*
910	* If destroy_inventory is set, free inventory as well. Else drop items in
911	* inventory to the ground.
912	*/
913	void object::destroy (bool destroy_inventory)
914	{	792	{
915	if (QUERY_FLAG (this, FLAG_FREED))	793	attachable::do_destroy ();
		794
		795	if (flag [FLAG_IS_LINKED])
		796	remove_button_link (this);
		797
		798	if (flag [FLAG_FRIENDLY])
		799	remove_friendly_object (this);
		800
		801	if (!flag [FLAG_REMOVED])
		802	remove ();
		803
		804	if (flag [FLAG_FREED])
916	return;	805	return;
917		806
918	if (QUERY_FLAG (this, FLAG_FRIENDLY))	807	flag [FLAG_FREED] = 1;
919	remove_friendly_object (this);
920		808
921	if (!QUERY_FLAG (this, FLAG_REMOVED))	809	while (inv)
922	remove_ob (this);	810	inv->destroy ();
923		811
924	SET_FLAG (this, FLAG_FREED);	812	set_speed (0);
		813	unlink ();
		814
		815	// hack to ensure that freed objects still have a valid map
		816	{
		817	static maptile *freed_map; // freed objects are moved here to avoid crashes
		818
		819	if (!freed_map)
		820	{
		821	freed_map = new maptile;
		822
		823	freed_map->name = "/internal/freed_objects_map";
		824	freed_map->width = 3;
		825	freed_map->height = 3;
		826
		827	freed_map->allocate ();
		828	}
		829
		830	map = freed_map;
		831	x = 1;
		832	y = 1;
		833	}
		834
		835	head = 0;
925		836
926	if (more)	837	if (more)
927	{	838	{
928	more->destroy (destroy_inventory);	839	more->destroy ();
929	more = 0;	840	more = 0;
930	}
931
932	if (inv)
933	{
934	/* Only if the space blocks everything do we not process -
935	* if some form of movement is allowed, let objects
936	* drop on that space.
937	*/
938	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
939	{
940	object *op = inv;
941
942	while (op)
943	{
944	object *tmp = op->below;
945	op->destroy (destroy_inventory);
946	op = tmp;
947	}
948	}
949	else
950	{ /* Put objects in inventory onto this space */
951	object *op = inv;
952
953	while (op)
954	{
955	object *tmp = op->below;
956
957	remove_ob (op);
958
959	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
960	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
961	free_object (op);
962	else
963	{
964	op->x = x;
965	op->y = y;
966	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
967	}
968
969	op = tmp;
970	}
971	}
972	}	841	}
973		842
974	// clear those pointers that likely might have circular references to us	843	// clear those pointers that likely might have circular references to us
975	owner = 0;	844	owner = 0;
976	enemy = 0;	845	enemy = 0;
977	attacked_by = 0;	846	attacked_by = 0;
978		847
979	// only relevant for players(?), but make sure of it anyways	848	// only relevant for players(?), but make sure of it anyways
980	contr = 0;	849	contr = 0;
		850	}
981		851
982	/* Remove object from the active list */	852	/*
983	speed = 0;	853	* Remove and free all objects in the inventory of the given object.
984	update_ob_speed (this);	854	* object.c ?
		855	*/
		856	void
		857	object::destroy_inv (bool drop_to_ground)
		858	{
		859	/* Only if the space blocks everything do we not process -
		860	* if some form of movement is allowed, let objects
		861	* drop on that space.
		862	*/
		863	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
		864	{
		865	while (inv)
		866	inv->destroy ();
		867	}
		868	else
		869	{ /* Put objects in inventory onto this space */
		870	while (inv)
		871	{
		872	object *op = inv;
985		873
986	unlink ();	874	if (op->flag [FLAG_STARTEQUIP]
		875	|| op->flag [FLAG_NO_DROP]
		876	|| op->type == RUNE
		877	|| op->type == TRAP
		878	|| op->flag [FLAG_IS_A_TEMPLATE])
		879	op->destroy ();
		880	else
		881	{
		882	op->remove ();
		883	op->x = x;
		884	op->y = y;
		885	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
		886	}
		887	}
		888	}
		889	}
987		890
988	mortals.push_back (this);	891	void
		892	object::destroy (bool destroy_inventory)
		893	{
		894	if (destroyed ())
		895	return;
		896
		897	if (destroy_inventory)
		898	destroy_inv (true);
		899
		900	attachable::destroy ();
989	}	901	}
990		902
991	/*	903	/*
992	* sub_weight() recursively (outwards) subtracts a number from the	904	* sub_weight() recursively (outwards) subtracts a number from the
993	* weight of an object (and what is carried by it's environment(s)).	905	* weight of an object (and what is carried by it's environment(s)).
994	*/	906	*/
995
996	void	907	void
997	sub_weight (object *op, signed long weight)	908	sub_weight (object *op, signed long weight)
998	{	909	{
999	while (op != NULL)	910	while (op != NULL)
1000	{	911	{
…		…
1004	op->carrying -= weight;	915	op->carrying -= weight;
1005	op = op->env;	916	op = op->env;
1006	}	917	}
1007	}	918	}
1008		919
1009	/* remove_ob(op):	920	/* op->remove ():
1010	* This function removes the object op from the linked list of objects	921	* This function removes the object op from the linked list of objects
1011	* which it is currently tied to. When this function is done, the	922	* which it is currently tied to. When this function is done, the
1012	* object will have no environment. If the object previously had an	923	* object will have no environment. If the object previously had an
1013	* environment, the x and y coordinates will be updated to	924	* environment, the x and y coordinates will be updated to
1014	* the previous environment.	925	* the previous environment.
1015	* Beware: This function is called from the editor as well!	926	* Beware: This function is called from the editor as well!
1016	*/	927	*/
1017
1018	void	928	void
1019	remove_ob (object *op)	929	object::remove ()
1020	{	930	{
1021	object *tmp, *last = 0;	931	object *tmp, *last = 0;
1022	object *otmp;	932	object *otmp;
1023		933
1024	int check_walk_off;
1025	maptile *m;
1026
1027	sint16 x, y;
1028
1029	if (QUERY_FLAG (op, FLAG_REMOVED))	934	if (QUERY_FLAG (this, FLAG_REMOVED))
1030	return;	935	return;
1031		936
1032	SET_FLAG (op, FLAG_REMOVED);	937	SET_FLAG (this, FLAG_REMOVED);
		938	INVOKE_OBJECT (REMOVE, this);
1033		939
1034	if (op->more != NULL)	940	if (more)
1035	remove_ob (op->more);	941	more->remove ();
1036		942
1037	/*	943	/*
1038	* In this case, the object to be removed is in someones	944	* In this case, the object to be removed is in someones
1039	* inventory.	945	* inventory.
1040	*/	946	*/
1041	if (op->env != NULL)	947	if (env)
1042	{	948	{
1043	if (op->nrof)	949	if (nrof)
1044	sub_weight (op->env, op->weight * op->nrof);	950	sub_weight (env, weight * nrof);
1045	else	951	else
1046	sub_weight (op->env, op->weight + op->carrying);	952	sub_weight (env, weight + carrying);
1047		953
1048	/* NO_FIX_PLAYER is set when a great many changes are being	954	/* NO_FIX_PLAYER is set when a great many changes are being
1049	* made to players inventory. If set, avoiding the call	955	* made to players inventory. If set, avoiding the call
1050	* to save cpu time.	956	* to save cpu time.
1051	*/	957	*/
1052	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	958	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1053	fix_player (otmp);	959	otmp->update_stats ();
1054		960
1055	if (op->above != NULL)	961	if (above != NULL)
1056	op->above->below = op->below;	962	above->below = below;
1057	else	963	else
1058	op->env->inv = op->below;	964	env->inv = below;
1059		965
1060	if (op->below != NULL)	966	if (below != NULL)
1061	op->below->above = op->above;	967	below->above = above;
1062		968
1063	/* we set up values so that it could be inserted into	969	/* we set up values so that it could be inserted into
1064	* the map, but we don't actually do that - it is up	970	* the map, but we don't actually do that - it is up
1065	* to the caller to decide what we want to do.	971	* to the caller to decide what we want to do.
1066	*/	972	*/
1067	op->x = op->env->x, op->y = op->env->y;	973	x = env->x, y = env->y;
1068	op->map = op->env->map;	974	map = env->map;
1069	op->above = NULL, op->below = NULL;	975	above = 0, below = 0;
1070	op->env = NULL;	976	env = 0;
1071	}	977	}
1072	else if (op->map)	978	else if (map)
1073	{	979	{
1074	x = op->x;
1075	y = op->y;
1076	m = get_map_from_coord (op->map, &x, &y);
1077
1078	if (!m)
1079	{
1080	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1081	op->map->path, op->x, op->y);
1082	/* in old days, we used to set x and y to 0 and continue.
1083	* it seems if we get into this case, something is probablye
1084	* screwed up and should be fixed.
1085	*/
1086	abort ();
1087	}
1088
1089	if (op->map != m)
1090	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1091	op->map->path, m->path, op->x, op->y, x, y);
1092
1093	/* Re did the following section of code - it looks like it had	980	/* Re did the following section of code - it looks like it had
1094	* lots of logic for things we no longer care about	981	* lots of logic for things we no longer care about
1095	*/	982	*/
1096		983
1097	/* link the object above us */	984	/* link the object above us */
1098	if (op->above)	985	if (above)
1099	op->above->below = op->below;	986	above->below = below;
1100	else	987	else
1101	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	988	map->at (x, y).top = below; /* we were top, set new top */
1102		989
1103	/* Relink the object below us, if there is one */	990	/* Relink the object below us, if there is one */
1104	if (op->below)	991	if (below)
1105	op->below->above = op->above;	992	below->above = above;
1106	else	993	else
1107	{	994	{
1108	/* Nothing below, which means we need to relink map object for this space	995	/* Nothing below, which means we need to relink map object for this space
1109	* use translated coordinates in case some oddness with map tiling is	996	* use translated coordinates in case some oddness with map tiling is
1110	* evident	997	* evident
1111	*/	998	*/
1112	if (GET_MAP_OB (m, x, y) != op)	999	if (GET_MAP_OB (map, x, y) != this)
1113	{	1000	{
1114	char *dump = dump_object (op);	1001	char *dump = dump_object (this);
1115	LOG (llevError,	1002	LOG (llevError,
1116	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1003	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
1117	free (dump);	1004	free (dump);
1118	dump = dump_object (GET_MAP_OB (m, x, y));	1005	dump = dump_object (GET_MAP_OB (map, x, y));
1119	LOG (llevError, "%s\n", dump);	1006	LOG (llevError, "%s\n", dump);
1120	free (dump);	1007	free (dump);
1121	}	1008	}
1122		1009
1123	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1010	map->at (x, y).bot = above; /* goes on above it. */
1124	}	1011	}
1125		1012
1126	op->above = 0;	1013	above = 0;
1127	op->below = 0;	1014	below = 0;
1128		1015
1129	if (op->map->in_memory == MAP_SAVING)	1016	if (map->in_memory == MAP_SAVING)
1130	return;	1017	return;
1131		1018
1132	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1019	int check_walk_off = !flag [FLAG_NO_APPLY];
1133		1020
1134	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1021	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1135	{	1022	{
1136	/* No point updating the players look faces if he is the object	1023	/* No point updating the players look faces if he is the object
1137	* being removed.	1024	* being removed.
1138	*/	1025	*/
1139		1026
1140	if (tmp->type == PLAYER && tmp != op)	1027	if (tmp->type == PLAYER && tmp != this)
1141	{	1028	{
1142	/* If a container that the player is currently using somehow gets	1029	/* If a container that the player is currently using somehow gets
1143	* removed (most likely destroyed), update the player view	1030	* removed (most likely destroyed), update the player view
1144	* appropriately.	1031	* appropriately.
1145	*/	1032	*/
1146	if (tmp->container == op)	1033	if (tmp->container == this)
1147	{	1034	{
1148	CLEAR_FLAG (op, FLAG_APPLIED);	1035	flag [FLAG_APPLIED] = 0;
1149	tmp->container = NULL;	1036	tmp->container = 0;
1150	}	1037	}
1151		1038
1152	tmp->contr->socket.update_look = 1;	1039	if (tmp->contr->ns)
		1040	tmp->contr->ns->floorbox_update ();
1153	}	1041	}
1154		1042
1155	/* See if player moving off should effect something */	1043	/* See if player moving off should effect something */
1156	if (check_walk_off	1044	if (check_walk_off
1157	&& ((op->move_type & tmp->move_off)	1045	&& ((move_type & tmp->move_off)
1158	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1046	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1159	{	1047	{
1160	move_apply (tmp, op, NULL);	1048	move_apply (tmp, this, 0);
1161		1049
1162	if (op->destroyed ())	1050	if (destroyed ())
1163	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1051	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1164	}	1052	}
1165		1053
1166	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1054	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1167		1055
1168	if (tmp->above == tmp)	1056	if (tmp->above == tmp)
1169	tmp->above = NULL;	1057	tmp->above = 0;
1170		1058
1171	last = tmp;	1059	last = tmp;
1172	}	1060	}
1173		1061
1174	/* last == NULL of there are no objects on this space */	1062	/* last == NULL of there are no objects on this space */
1175	if (last == NULL)	1063	if (!last)
1176	{	1064	map->at (x, y).flags_ = P_NEED_UPDATE;
1177	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1178	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1179	* those out anyways, and if there are any flags set right now, they won't
1180	* be correct anyways.
1181	*/
1182	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1183	update_position (op->map, op->x, op->y);
1184	}
1185	else	1065	else
1186	update_object (last, UP_OBJ_REMOVE);	1066	update_object (last, UP_OBJ_REMOVE);
1187		1067
1188	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1068	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1189	update_all_los (op->map, op->x, op->y);	1069	update_all_los (map, x, y);
1190	}	1070	}
1191	}	1071	}
1192		1072
1193	/*	1073	/*
1194	* merge_ob(op,top):	1074	* merge_ob(op,top):
…		…
1202	merge_ob (object *op, object *top)	1082	merge_ob (object *op, object *top)
1203	{	1083	{
1204	if (!op->nrof)	1084	if (!op->nrof)
1205	return 0;	1085	return 0;
1206		1086
1207	if (top == NULL)	1087	if (top)
1208	for (top = op; top != NULL && top->above != NULL; top = top->above);	1088	for (top = op; top && top->above; top = top->above)
		1089	;
1209		1090
1210	for (; top != NULL; top = top->below)	1091	for (; top; top = top->below)
1211	{	1092	{
1212	if (top == op)	1093	if (top == op)
1213	continue;	1094	continue;
1214	if (CAN_MERGE (op, top))	1095
		1096	if (object::can_merge (op, top))
1215	{	1097	{
1216	top->nrof += op->nrof;	1098	top->nrof += op->nrof;
1217		1099
1218	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1100	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1219	op->weight = 0; /* Don't want any adjustements now */	1101	op->weight = 0; /* Don't want any adjustements now */
1220	remove_ob (op);	1102	op->destroy ();
1221	free_object (op);
1222	return top;	1103	return top;
1223	}	1104	}
1224	}	1105	}
1225		1106
1226	return 0;	1107	return 0;
…		…
1265	* Return value:	1146	* Return value:
1266	* new object if 'op' was merged with other object	1147	* new object if 'op' was merged with other object
1267	* NULL if 'op' was destroyed	1148	* NULL if 'op' was destroyed
1268	* just 'op' otherwise	1149	* just 'op' otherwise
1269	*/	1150	*/
1270
1271	object *	1151	object *
1272	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1152	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1273	{	1153	{
1274	object *tmp, *top, *floor = NULL;	1154	object *tmp, *top, *floor = NULL;
1275	sint16 x, y;	1155	sint16 x, y;
…		…
1309	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1189	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1310	free (dump);	1190	free (dump);
1311	return op;	1191	return op;
1312	}	1192	}
1313		1193
1314	if (op->more != NULL)	1194	if (op->more)
1315	{	1195	{
1316	/* The part may be on a different map. */	1196	/* The part may be on a different map. */
1317		1197
1318	object *more = op->more;	1198	object *more = op->more;
1319		1199
…		…
1335	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1215	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1336	{	1216	{
1337	if (!op->head)	1217	if (!op->head)
1338	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1218	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1339		1219
1340	return NULL;	1220	return 0;
1341	}	1221	}
1342	}	1222	}
1343		1223
1344	CLEAR_FLAG (op, FLAG_REMOVED);	1224	CLEAR_FLAG (op, FLAG_REMOVED);
1345		1225
…		…
1353		1233
1354	/* this has to be done after we translate the coordinates.	1234	/* this has to be done after we translate the coordinates.
1355	*/	1235	*/
1356	if (op->nrof && !(flag & INS_NO_MERGE))	1236	if (op->nrof && !(flag & INS_NO_MERGE))
1357	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1237	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1358	if (CAN_MERGE (op, tmp))	1238	if (object::can_merge (op, tmp))
1359	{	1239	{
1360	op->nrof += tmp->nrof;	1240	op->nrof += tmp->nrof;
1361	remove_ob (tmp);	1241	tmp->destroy ();
1362	free_object (tmp);
1363	}	1242	}
1364		1243
1365	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1244	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1366	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1245	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1367		1246
…		…
1380	op->below = originator->below;	1259	op->below = originator->below;
1381		1260
1382	if (op->below)	1261	if (op->below)
1383	op->below->above = op;	1262	op->below->above = op;
1384	else	1263	else
1385	SET_MAP_OB (op->map, op->x, op->y, op);	1264	op->ms ().bot = op;
1386		1265
1387	/* since *below* originator, no need to update top */	1266	/* since *below* originator, no need to update top */
1388	originator->below = op;	1267	originator->below = op;
1389	}	1268	}
1390	else	1269	else
…		…
1436	* If INS_ON_TOP is used, don't do this processing	1315	* If INS_ON_TOP is used, don't do this processing
1437	* Need to find the object that in fact blocks view, otherwise	1316	* Need to find the object that in fact blocks view, otherwise
1438	* stacking is a bit odd.	1317	* stacking is a bit odd.
1439	*/	1318	*/
1440	if (!(flag & INS_ON_TOP) &&	1319	if (!(flag & INS_ON_TOP) &&
1441	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1320	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1442	{	1321	{
1443	for (last = top; last != floor; last = last->below)	1322	for (last = top; last != floor; last = last->below)
1444	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1323	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1445	break;	1324	break;
1446	/* Check to see if we found the object that blocks view,	1325	/* Check to see if we found the object that blocks view,
…		…
1469		1348
1470	if (op->above)	1349	if (op->above)
1471	op->above->below = op;	1350	op->above->below = op;
1472		1351
1473	op->below = NULL;	1352	op->below = NULL;
1474	SET_MAP_OB (op->map, op->x, op->y, op);	1353	op->ms ().bot = op;
1475	}	1354	}
1476	else	1355	else
1477	{ /* get inserted into the stack above top */	1356	{ /* get inserted into the stack above top */
1478	op->above = top->above;	1357	op->above = top->above;
1479		1358
…		…
1483	op->below = top;	1362	op->below = top;
1484	top->above = op;	1363	top->above = op;
1485	}	1364	}
1486		1365
1487	if (op->above == NULL)	1366	if (op->above == NULL)
1488	SET_MAP_TOP (op->map, op->x, op->y, op);	1367	op->ms ().top = op;
1489	} /* else not INS_BELOW_ORIGINATOR */	1368	} /* else not INS_BELOW_ORIGINATOR */
1490		1369
1491	if (op->type == PLAYER)	1370	if (op->type == PLAYER)
1492	op->contr->do_los = 1;	1371	op->contr->do_los = 1;
1493		1372
1494	/* If we have a floor, we know the player, if any, will be above	1373	/* If we have a floor, we know the player, if any, will be above
1495	* it, so save a few ticks and start from there.	1374	* it, so save a few ticks and start from there.
1496	*/	1375	*/
1497	if (!(flag & INS_MAP_LOAD))	1376	if (!(flag & INS_MAP_LOAD))
1498	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1377	if (object *pl = op->ms ().player ())
1499	if (tmp->type == PLAYER)	1378	if (pl->contr->ns)
1500	tmp->contr->socket.update_look = 1;	1379	pl->contr->ns->floorbox_update ();
1501		1380
1502	/* If this object glows, it may affect lighting conditions that are	1381	/* If this object glows, it may affect lighting conditions that are
1503	* visible to others on this map. But update_all_los is really	1382	* visible to others on this map. But update_all_los is really
1504	* an inefficient way to do this, as it means los for all players	1383	* an inefficient way to do this, as it means los for all players
1505	* on the map will get recalculated. The players could very well	1384	* on the map will get recalculated. The players could very well
1506	* be far away from this change and not affected in any way -	1385	* be far away from this change and not affected in any way -
1507	* this should get redone to only look for players within range,	1386	* this should get redone to only look for players within range,
1508	* or just updating the P_NEED_UPDATE for spaces within this area	1387	* or just updating the P_NEED_UPDATE for spaces within this area
1509	* of effect may be sufficient.	1388	* of effect may be sufficient.
1510	*/	1389	*/
1511	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1390	if (op->map->darkness && (op->glow_radius != 0))
1512	update_all_los (op->map, op->x, op->y);	1391	update_all_los (op->map, op->x, op->y);
1513		1392
1514	/* updates flags (blocked, alive, no magic, etc) for this map space */	1393	/* updates flags (blocked, alive, no magic, etc) for this map space */
1515	update_object (op, UP_OBJ_INSERT);	1394	update_object (op, UP_OBJ_INSERT);
1516		1395
		1396	INVOKE_OBJECT (INSERT, op);
		1397
1517	/* Don't know if moving this to the end will break anything. However,	1398	/* Don't know if moving this to the end will break anything. However,
1518	* we want to have update_look set above before calling this.	1399	* we want to have floorbox_update called before calling this.
1519	*	1400	*
1520	* check_move_on() must be after this because code called from	1401	* check_move_on() must be after this because code called from
1521	* check_move_on() depends on correct map flags (so functions like	1402	* check_move_on() depends on correct map flags (so functions like
1522	* blocked() and wall() work properly), and these flags are updated by	1403	* blocked() and wall() work properly), and these flags are updated by
1523	* update_object().	1404	* update_object().
…		…
1525		1406
1526	/* if this is not the head or flag has been passed, don't check walk on status */	1407	/* if this is not the head or flag has been passed, don't check walk on status */
1527	if (!(flag & INS_NO_WALK_ON) && !op->head)	1408	if (!(flag & INS_NO_WALK_ON) && !op->head)
1528	{	1409	{
1529	if (check_move_on (op, originator))	1410	if (check_move_on (op, originator))
1530	return NULL;	1411	return 0;
1531		1412
1532	/* If we are a multi part object, lets work our way through the check	1413	/* If we are a multi part object, lets work our way through the check
1533	* walk on's.	1414	* walk on's.
1534	*/	1415	*/
1535	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1416	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1536	if (check_move_on (tmp, originator))	1417	if (check_move_on (tmp, originator))
1537	return NULL;	1418	return 0;
1538	}	1419	}
1539		1420
1540	return op;	1421	return op;
1541	}	1422	}
1542		1423
1543	/* this function inserts an object in the map, but if it	1424	/* this function inserts an object in the map, but if it
1544	* finds an object of its own type, it'll remove that one first.	1425	* finds an object of its own type, it'll remove that one first.
1545	* op is the object to insert it under: supplies x and the map.	1426	* op is the object to insert it under: supplies x and the map.
1546	*/	1427	*/
1547	void	1428	void
1548	replace_insert_ob_in_map (const char *arch_string, object *op)	1429	replace_insert_ob_in_map (const char *arch_string, object *op)
1549	{	1430	{
1550	object *	1431	object *tmp, *tmp1;
1551	tmp;
1552	object *
1553	tmp1;
1554		1432
1555	/* first search for itself and remove any old instances */	1433	/* first search for itself and remove any old instances */
1556		1434
1557	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1435	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1558	{
1559	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1436	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1560	{	1437	tmp->destroy ();
1561	remove_ob (tmp);
1562	free_object (tmp);
1563	}
1564	}
1565		1438
1566	tmp1 = arch_to_object (archetype::find (arch_string));	1439	tmp1 = arch_to_object (archetype::find (arch_string));
1567		1440
1568	tmp1->x = op->x;	1441	tmp1->x = op->x;
1569	tmp1->y = op->y;	1442	tmp1->y = op->y;
…		…
1579	*/	1452	*/
1580		1453
1581	object *	1454	object *
1582	get_split_ob (object *orig_ob, uint32 nr)	1455	get_split_ob (object *orig_ob, uint32 nr)
1583	{	1456	{
1584	object *	1457	object *newob;
1585	newob;
1586	int
1587	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1458	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1588		1459
1589	if (orig_ob->nrof < nr)	1460	if (orig_ob->nrof < nr)
1590	{	1461	{
1591	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1462	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1592	return NULL;	1463	return NULL;
1593	}	1464	}
1594		1465
1595	newob = object_create_clone (orig_ob);	1466	newob = object_create_clone (orig_ob);
1596		1467
1597	if ((orig_ob->nrof -= nr) < 1)	1468	if ((orig_ob->nrof -= nr) < 1)
1598	{	1469	orig_ob->destroy (1);
1599	if (!is_removed)
1600	remove_ob (orig_ob);
1601	free_object2 (orig_ob, 1);
1602	}
1603	else if (!is_removed)	1470	else if (!is_removed)
1604	{	1471	{
1605	if (orig_ob->env != NULL)	1472	if (orig_ob->env != NULL)
1606	sub_weight (orig_ob->env, orig_ob->weight * nr);	1473	sub_weight (orig_ob->env, orig_ob->weight * nr);
1607	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1474	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1627		1494
1628	object *	1495	object *
1629	decrease_ob_nr (object *op, uint32 i)	1496	decrease_ob_nr (object *op, uint32 i)
1630	{	1497	{
1631	object *tmp;	1498	object *tmp;
1632	player *pl;
1633		1499
1634	if (i == 0) /* objects with op->nrof require this check */	1500	if (i == 0) /* objects with op->nrof require this check */
1635	return op;	1501	return op;
1636		1502
1637	if (i > op->nrof)	1503	if (i > op->nrof)
1638	i = op->nrof;	1504	i = op->nrof;
1639		1505
1640	if (QUERY_FLAG (op, FLAG_REMOVED))	1506	if (QUERY_FLAG (op, FLAG_REMOVED))
1641	op->nrof -= i;	1507	op->nrof -= i;
1642	else if (op->env != NULL)	1508	else if (op->env)
1643	{	1509	{
1644	/* is this object in the players inventory, or sub container	1510	/* is this object in the players inventory, or sub container
1645	* therein?	1511	* therein?
1646	*/	1512	*/
1647	tmp = is_player_inv (op->env);	1513	tmp = op->in_player ();
1648	/* nope. Is this a container the player has opened?	1514	/* nope. Is this a container the player has opened?
1649	* If so, set tmp to that player.	1515	* If so, set tmp to that player.
1650	* IMO, searching through all the players will mostly	1516	* IMO, searching through all the players will mostly
1651	* likely be quicker than following op->env to the map,	1517	* likely be quicker than following op->env to the map,
1652	* and then searching the map for a player.	1518	* and then searching the map for a player.
1653	*/	1519	*/
1654	if (!tmp)	1520	if (!tmp)
1655	{	1521	for_all_players (pl)
1656	for (pl = first_player; pl; pl = pl->next)
1657	if (pl->ob->container == op->env)	1522	if (pl->ob->container == op->env)
		1523	{
		1524	tmp = pl->ob;
1658	break;	1525	break;
1659	if (pl)
1660	tmp = pl->ob;
1661	else
1662	tmp = NULL;
1663	}	1526	}
1664		1527
1665	if (i < op->nrof)	1528	if (i < op->nrof)
1666	{	1529	{
1667	sub_weight (op->env, op->weight * i);	1530	sub_weight (op->env, op->weight * i);
1668	op->nrof -= i;	1531	op->nrof -= i;
1669	if (tmp)	1532	if (tmp)
1670	{
1671	esrv_send_item (tmp, op);	1533	esrv_send_item (tmp, op);
1672	}
1673	}	1534	}
1674	else	1535	else
1675	{	1536	{
1676	remove_ob (op);	1537	op->remove ();
1677	op->nrof = 0;	1538	op->nrof = 0;
1678	if (tmp)	1539	if (tmp)
1679	{
1680	esrv_del_item (tmp->contr, op->count);	1540	esrv_del_item (tmp->contr, op->count);
1681	}
1682	}	1541	}
1683	}	1542	}
1684	else	1543	else
1685	{	1544	{
1686	object *above = op->above;	1545	object *above = op->above;
1687		1546
1688	if (i < op->nrof)	1547	if (i < op->nrof)
1689	op->nrof -= i;	1548	op->nrof -= i;
1690	else	1549	else
1691	{	1550	{
1692	remove_ob (op);	1551	op->remove ();
1693	op->nrof = 0;	1552	op->nrof = 0;
1694	}	1553	}
1695		1554
1696	/* Since we just removed op, op->above is null */	1555	/* Since we just removed op, op->above is null */
1697	for (tmp = above; tmp != NULL; tmp = tmp->above)	1556	for (tmp = above; tmp; tmp = tmp->above)
1698	if (tmp->type == PLAYER)	1557	if (tmp->type == PLAYER)
1699	{	1558	{
1700	if (op->nrof)	1559	if (op->nrof)
1701	esrv_send_item (tmp, op);	1560	esrv_send_item (tmp, op);
1702	else	1561	else
…		…
1706		1565
1707	if (op->nrof)	1566	if (op->nrof)
1708	return op;	1567	return op;
1709	else	1568	else
1710	{	1569	{
1711	free_object (op);	1570	op->destroy ();
1712	return NULL;	1571	return 0;
1713	}	1572	}
1714	}	1573	}
1715		1574
1716	/*	1575	/*
1717	* add_weight(object, weight) adds the specified weight to an object,	1576	* add_weight(object, weight) adds the specified weight to an object,
…		…
1729	op->carrying += weight;	1588	op->carrying += weight;
1730	op = op->env;	1589	op = op->env;
1731	}	1590	}
1732	}	1591	}
1733		1592
1734	/*
1735	* insert_ob_in_ob(op,environment):
1736	* This function inserts the object op in the linked list
1737	* inside the object environment.
1738	*
1739	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1740	* the inventory at the last position or next to other objects of the same
1741	* type.
1742	* Frank: Now sorted by type, archetype and magic!
1743	*
1744	* The function returns now pointer to inserted item, and return value can
1745	* be != op, if items are merged. -Tero
1746	*/
1747
1748	object *	1593	object *
1749	insert_ob_in_ob (object *op, object *where)	1594	insert_ob_in_ob (object *op, object *where)
1750	{	1595	{
1751	object *	1596	if (!where)
1752	tmp, *
1753	otmp;
1754
1755	if (!QUERY_FLAG (op, FLAG_REMOVED))
1756	{
1757	char *dump = dump_object (op);
1758	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1759	free (dump);
1760	return op;
1761	}
1762
1763	if (where == NULL)
1764	{	1597	{
1765	char *dump = dump_object (op);	1598	char *dump = dump_object (op);
1766	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1599	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1767	free (dump);	1600	free (dump);
1768	return op;	1601	return op;
1769	}	1602	}
1770		1603
1771	if (where->head)	1604	if (where->head)
1772	{	1605	{
1773	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1606	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1774	where = where->head;	1607	where = where->head;
1775	}	1608	}
		1609
		1610	return where->insert (op);
		1611	}
		1612
		1613	/*
		1614	* env->insert (op)
		1615	* This function inserts the object op in the linked list
		1616	* inside the object environment.
		1617	*
		1618	* The function returns now pointer to inserted item, and return value can
		1619	* be != op, if items are merged. -Tero
		1620	*/
		1621
		1622	object *
		1623	object::insert (object *op)
		1624	{
		1625	object *tmp, *otmp;
		1626
		1627	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1628	op->remove ();
1776		1629
1777	if (op->more)	1630	if (op->more)
1778	{	1631	{
1779	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1632	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1780	return op;	1633	return op;
…		…
1782		1635
1783	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1636	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1784	CLEAR_FLAG (op, FLAG_REMOVED);	1637	CLEAR_FLAG (op, FLAG_REMOVED);
1785	if (op->nrof)	1638	if (op->nrof)
1786	{	1639	{
1787	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1640	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1788	if (CAN_MERGE (tmp, op))	1641	if (object::can_merge (tmp, op))
1789	{	1642	{
1790	/* return the original object and remove inserted object	1643	/* return the original object and remove inserted object
1791	(client needs the original object) */	1644	(client needs the original object) */
1792	tmp->nrof += op->nrof;	1645	tmp->nrof += op->nrof;
1793	/* Weight handling gets pretty funky. Since we are adding to	1646	/* Weight handling gets pretty funky. Since we are adding to
1794	* tmp->nrof, we need to increase the weight.	1647	* tmp->nrof, we need to increase the weight.
1795	*/	1648	*/
1796	add_weight (where, op->weight * op->nrof);	1649	add_weight (this, op->weight * op->nrof);
1797	SET_FLAG (op, FLAG_REMOVED);	1650	SET_FLAG (op, FLAG_REMOVED);
1798	free_object (op); /* free the inserted object */	1651	op->destroy (); /* free the inserted object */
1799	op = tmp;	1652	op = tmp;
1800	remove_ob (op); /* and fix old object's links */	1653	op->remove (); /* and fix old object's links */
1801	CLEAR_FLAG (op, FLAG_REMOVED);	1654	CLEAR_FLAG (op, FLAG_REMOVED);
1802	break;	1655	break;
1803	}	1656	}
1804		1657
1805	/* I assume combined objects have no inventory	1658	/* I assume combined objects have no inventory
1806	* We add the weight - this object could have just been removed	1659	* We add the weight - this object could have just been removed
1807	* (if it was possible to merge). calling remove_ob will subtract	1660	* (if it was possible to merge). calling remove_ob will subtract
1808	* the weight, so we need to add it in again, since we actually do	1661	* the weight, so we need to add it in again, since we actually do
1809	* the linking below	1662	* the linking below
1810	*/	1663	*/
1811	add_weight (where, op->weight * op->nrof);	1664	add_weight (this, op->weight * op->nrof);
1812	}	1665	}
1813	else	1666	else
1814	add_weight (where, (op->weight + op->carrying));	1667	add_weight (this, (op->weight + op->carrying));
1815		1668
1816	otmp = is_player_inv (where);	1669	otmp = this->in_player ();
1817	if (otmp && otmp->contr != NULL)	1670	if (otmp && otmp->contr)
1818	{
1819	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1671	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1820	fix_player (otmp);	1672	otmp->update_stats ();
1821	}
1822		1673
1823	op->map = NULL;	1674	op->map = 0;
1824	op->env = where;	1675	op->env = this;
1825	op->above = NULL;	1676	op->above = 0;
1826	op->below = NULL;	1677	op->below = 0;
1827	op->x = 0, op->y = 0;	1678	op->x = 0, op->y = 0;
1828		1679
1829	/* reset the light list and los of the players on the map */	1680	/* reset the light list and los of the players on the map */
1830	if ((op->glow_radius != 0) && where->map)	1681	if ((op->glow_radius != 0) && map)
1831	{	1682	{
1832	#ifdef DEBUG_LIGHTS	1683	#ifdef DEBUG_LIGHTS
1833	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1684	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1834	#endif /* DEBUG_LIGHTS */	1685	#endif /* DEBUG_LIGHTS */
1835	if (MAP_DARKNESS (where->map))	1686	if (map->darkness)
1836	update_all_los (where->map, where->x, where->y);	1687	update_all_los (map, x, y);
1837	}	1688	}
1838		1689
1839	/* Client has no idea of ordering so lets not bother ordering it here.	1690	/* Client has no idea of ordering so lets not bother ordering it here.
1840	* It sure simplifies this function...	1691	* It sure simplifies this function...
1841	*/	1692	*/
1842	if (where->inv == NULL)	1693	if (!inv)
1843	where->inv = op;	1694	inv = op;
1844	else	1695	else
1845	{	1696	{
1846	op->below = where->inv;	1697	op->below = inv;
1847	op->below->above = op;	1698	op->below->above = op;
1848	where->inv = op;	1699	inv = op;
1849	}	1700	}
		1701
		1702	INVOKE_OBJECT (INSERT, this);
		1703
1850	return op;	1704	return op;
1851	}	1705	}
1852		1706
1853	/*	1707	/*
1854	* Checks if any objects has a move_type that matches objects	1708	* Checks if any objects has a move_type that matches objects
…		…
1905		1759
1906	/* The objects have to be checked from top to bottom.	1760	/* The objects have to be checked from top to bottom.
1907	* Hence, we first go to the top:	1761	* Hence, we first go to the top:
1908	*/	1762	*/
1909		1763
1910	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1764	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1911	{	1765	{
1912	/* Trim the search when we find the first other spell effect	1766	/* Trim the search when we find the first other spell effect
1913	* this helps performance so that if a space has 50 spell objects,	1767	* this helps performance so that if a space has 50 spell objects,
1914	* we don't need to check all of them.	1768	* we don't need to check all of them.
1915	*/	1769	*/
…		…
1970	/*	1824	/*
1971	* present_arch(arch, map, x, y) searches for any objects with	1825	* present_arch(arch, map, x, y) searches for any objects with
1972	* a matching archetype at the given map and coordinates.	1826	* a matching archetype at the given map and coordinates.
1973	* The first matching object is returned, or NULL if none.	1827	* The first matching object is returned, or NULL if none.
1974	*/	1828	*/
1975
1976	object *	1829	object *
1977	present_arch (const archetype *at, maptile *m, int x, int y)	1830	present_arch (const archetype *at, maptile *m, int x, int y)
1978	{	1831	{
1979	object *
1980	tmp;
1981
1982	if (m == NULL || out_of_map (m, x, y))	1832	if (m == NULL || out_of_map (m, x, y))
1983	{	1833	{
1984	LOG (llevError, "Present_arch called outside map.\n");	1834	LOG (llevError, "Present_arch called outside map.\n");
1985	return NULL;	1835	return NULL;
1986	}	1836	}
		1837
1987	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1838	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1988	if (tmp->arch == at)	1839	if (tmp->arch == at)
1989	return tmp;	1840	return tmp;
		1841
1990	return NULL;	1842	return NULL;
1991	}	1843	}
1992		1844
1993	/*	1845	/*
1994	* present(type, map, x, y) searches for any objects with	1846	* present(type, map, x, y) searches for any objects with
1995	* a matching type variable at the given map and coordinates.	1847	* a matching type variable at the given map and coordinates.
1996	* The first matching object is returned, or NULL if none.	1848	* The first matching object is returned, or NULL if none.
1997	*/	1849	*/
1998
1999	object *	1850	object *
2000	present (unsigned char type, maptile *m, int x, int y)	1851	present (unsigned char type, maptile *m, int x, int y)
2001	{	1852	{
2002	object *
2003	tmp;
2004
2005	if (out_of_map (m, x, y))	1853	if (out_of_map (m, x, y))
2006	{	1854	{
2007	LOG (llevError, "Present called outside map.\n");	1855	LOG (llevError, "Present called outside map.\n");
2008	return NULL;	1856	return NULL;
2009	}	1857	}
		1858
2010	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1859	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
2011	if (tmp->type == type)	1860	if (tmp->type == type)
2012	return tmp;	1861	return tmp;
		1862
2013	return NULL;	1863	return NULL;
2014	}	1864	}
2015		1865
2016	/*	1866	/*
2017	* present_in_ob(type, object) searches for any objects with	1867	* present_in_ob(type, object) searches for any objects with
2018	* a matching type variable in the inventory of the given object.	1868	* a matching type variable in the inventory of the given object.
2019	* The first matching object is returned, or NULL if none.	1869	* The first matching object is returned, or NULL if none.
2020	*/	1870	*/
2021
2022	object *	1871	object *
2023	present_in_ob (unsigned char type, const object *op)	1872	present_in_ob (unsigned char type, const object *op)
2024	{	1873	{
2025	object *
2026	tmp;
2027
2028	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1874	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2029	if (tmp->type == type)	1875	if (tmp->type == type)
2030	return tmp;	1876	return tmp;
		1877
2031	return NULL;	1878	return NULL;
2032	}	1879	}
2033		1880
2034	/*	1881	/*
2035	* present_in_ob (type, str, object) searches for any objects with	1882	* present_in_ob (type, str, object) searches for any objects with
…		…
2043	* str is the string to match against. Note that we match against	1890	* str is the string to match against. Note that we match against
2044	* the object name, not the archetype name. this is so that the	1891	* the object name, not the archetype name. this is so that the
2045	* spell code can use one object type (force), but change it's name	1892	* spell code can use one object type (force), but change it's name
2046	* to be unique.	1893	* to be unique.
2047	*/	1894	*/
2048
2049	object *	1895	object *
2050	present_in_ob_by_name (int type, const char *str, const object *op)	1896	present_in_ob_by_name (int type, const char *str, const object *op)
2051	{	1897	{
2052	object *
2053	tmp;
2054
2055	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2056	{
2057	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1899	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2058	return tmp;	1900	return tmp;
2059	}	1901
2060	return NULL;	1902	return 0;
2061	}	1903	}
2062		1904
2063	/*	1905	/*
2064	* present_arch_in_ob(archetype, object) searches for any objects with	1906	* present_arch_in_ob(archetype, object) searches for any objects with
2065	* a matching archetype in the inventory of the given object.	1907	* a matching archetype in the inventory of the given object.
2066	* The first matching object is returned, or NULL if none.	1908	* The first matching object is returned, or NULL if none.
2067	*/	1909	*/
2068
2069	object *	1910	object *
2070	present_arch_in_ob (const archetype *at, const object *op)	1911	present_arch_in_ob (const archetype *at, const object *op)
2071	{	1912	{
2072	object *
2073	tmp;
2074
2075	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1913	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2076	if (tmp->arch == at)	1914	if (tmp->arch == at)
2077	return tmp;	1915	return tmp;
		1916
2078	return NULL;	1917	return NULL;
2079	}	1918	}
2080		1919
2081	/*	1920	/*
2082	* activate recursively a flag on an object inventory	1921	* activate recursively a flag on an object inventory
2083	*/	1922	*/
2084	void	1923	void
2085	flag_inv (object *op, int flag)	1924	flag_inv (object *op, int flag)
2086	{	1925	{
2087	object *
2088	tmp;
2089
2090	if (op->inv)	1926	if (op->inv)
2091	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1927	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2092	{	1928	{
2093	SET_FLAG (tmp, flag);	1929	SET_FLAG (tmp, flag);
2094	flag_inv (tmp, flag);	1930	flag_inv (tmp, flag);
2095	}	1931	}
2096	} /*	1932	}
		1933
		1934	/*
2097	* desactivate recursively a flag on an object inventory	1935	* deactivate recursively a flag on an object inventory
2098	*/	1936	*/
2099	void	1937	void
2100	unflag_inv (object *op, int flag)	1938	unflag_inv (object *op, int flag)
2101	{	1939	{
2102	object *
2103	tmp;
2104
2105	if (op->inv)	1940	if (op->inv)
2106	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1941	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2107	{	1942	{
2108	CLEAR_FLAG (tmp, flag);	1943	CLEAR_FLAG (tmp, flag);
2109	unflag_inv (tmp, flag);	1944	unflag_inv (tmp, flag);
2110	}	1945	}
2111	}	1946	}
…		…
2114	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1949	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2115	* all it's inventory (recursively).	1950	* all it's inventory (recursively).
2116	* If checksums are used, a player will get set_cheat called for	1951	* If checksums are used, a player will get set_cheat called for
2117	* him/her-self and all object carried by a call to this function.	1952	* him/her-self and all object carried by a call to this function.
2118	*/	1953	*/
2119
2120	void	1954	void
2121	set_cheat (object *op)	1955	set_cheat (object *op)
2122	{	1956	{
2123	SET_FLAG (op, FLAG_WAS_WIZ);	1957	SET_FLAG (op, FLAG_WAS_WIZ);
2124	flag_inv (op, FLAG_WAS_WIZ);	1958	flag_inv (op, FLAG_WAS_WIZ);
…		…
2143	* because arch_blocked (now ob_blocked) needs to know the movement type	1977	* because arch_blocked (now ob_blocked) needs to know the movement type
2144	* to know if the space in question will block the object. We can't use	1978	* to know if the space in question will block the object. We can't use
2145	* the archetype because that isn't correct if the monster has been	1979	* the archetype because that isn't correct if the monster has been
2146	* customized, changed states, etc.	1980	* customized, changed states, etc.
2147	*/	1981	*/
2148
2149	int	1982	int
2150	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1983	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2151	{	1984	{
2152	int
2153	i,
2154	index = 0, flag;	1985	int index = 0, flag;
2155	static int
2156	altern[SIZEOFFREE];	1986	int altern[SIZEOFFREE];
2157		1987
2158	for (i = start; i < stop; i++)	1988	for (int i = start; i < stop; i++)
2159	{	1989	{
2160	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1990	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2161	if (!flag)	1991	if (!flag)
2162	altern[index++] = i;	1992	altern [index++] = i;
2163		1993
2164	/* Basically, if we find a wall on a space, we cut down the search size.	1994	/* Basically, if we find a wall on a space, we cut down the search size.
2165	* In this way, we won't return spaces that are on another side of a wall.	1995	* In this way, we won't return spaces that are on another side of a wall.
2166	* This mostly work, but it cuts down the search size in all directions -	1996	* This mostly work, but it cuts down the search size in all directions -
2167	* if the space being examined only has a wall to the north and empty	1997	* if the space being examined only has a wall to the north and empty
2168	* spaces in all the other directions, this will reduce the search space	1998	* spaces in all the other directions, this will reduce the search space
2169	* to only the spaces immediately surrounding the target area, and	1999	* to only the spaces immediately surrounding the target area, and
2170	* won't look 2 spaces south of the target space.	2000	* won't look 2 spaces south of the target space.
2171	*/	2001	*/
2172	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2002	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2173	stop = maxfree[i];	2003	stop = maxfree[i];
2174	}	2004	}
		2005
2175	if (!index)	2006	if (!index)
2176	return -1;	2007	return -1;
		2008
2177	return altern[RANDOM () % index];	2009	return altern[RANDOM () % index];
2178	}	2010	}
2179		2011
2180	/*	2012	/*
2181	* find_first_free_spot(archetype, maptile, x, y) works like	2013	* find_first_free_spot(archetype, maptile, x, y) works like
2182	* find_free_spot(), but it will search max number of squares.	2014	* find_free_spot(), but it will search max number of squares.
2183	* But it will return the first available spot, not a random choice.	2015	* But it will return the first available spot, not a random choice.
2184	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2016	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2185	*/	2017	*/
2186
2187	int	2018	int
2188	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2019	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2189	{	2020	{
2190	int
2191	i;
2192
2193	for (i = 0; i < SIZEOFFREE; i++)	2021	for (int i = 0; i < SIZEOFFREE; i++)
2194	{
2195	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2022	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2196	return i;	2023	return i;
2197	}	2024
2198	return -1;	2025	return -1;
2199	}	2026	}
2200		2027
2201	/*	2028	/*
2202	* The function permute(arr, begin, end) randomly reorders the array	2029	* The function permute(arr, begin, end) randomly reorders the array
2203	* arr[begin..end-1].	2030	* arr[begin..end-1].
		2031	* now uses a fisher-yates shuffle, old permute was broken
2204	*/	2032	*/
2205	static void	2033	static void
2206	permute (int *arr, int begin, int end)	2034	permute (int *arr, int begin, int end)
2207	{	2035	{
2208	int	2036	arr += begin;
2209	i,
2210	j,
2211	tmp,
2212	len;
2213
2214	len = end - begin;	2037	end -= begin;
2215	for (i = begin; i < end; i++)
2216	{
2217	j = begin + RANDOM () % len;
2218		2038
2219	tmp = arr[i];	2039	while (--end)
2220	arr[i] = arr[j];	2040	swap (arr [end], arr [RANDOM () % (end + 1)]);
2221	arr[j] = tmp;
2222	}
2223	}	2041	}
2224		2042
2225	/* new function to make monster searching more efficient, and effective!	2043	/* new function to make monster searching more efficient, and effective!
2226	* This basically returns a randomized array (in the passed pointer) of	2044	* This basically returns a randomized array (in the passed pointer) of
2227	* the spaces to find monsters. In this way, it won't always look for	2045	* the spaces to find monsters. In this way, it won't always look for
…		…
2230	* the 3x3 area will be searched, just not in a predictable order.	2048	* the 3x3 area will be searched, just not in a predictable order.
2231	*/	2049	*/
2232	void	2050	void
2233	get_search_arr (int *search_arr)	2051	get_search_arr (int *search_arr)
2234	{	2052	{
2235	int	2053	int i;
2236	i;
2237		2054
2238	for (i = 0; i < SIZEOFFREE; i++)	2055	for (i = 0; i < SIZEOFFREE; i++)
2239	{
2240	search_arr[i] = i;	2056	search_arr[i] = i;
2241	}
2242		2057
2243	permute (search_arr, 1, SIZEOFFREE1 + 1);	2058	permute (search_arr, 1, SIZEOFFREE1 + 1);
2244	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2059	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2245	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2060	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2246	}	2061	}
…		…
2255	* Perhaps incorrectly, but I'm making the assumption that exclude	2070	* Perhaps incorrectly, but I'm making the assumption that exclude
2256	* is actually want is going to try and move there. We need this info	2071	* is actually want is going to try and move there. We need this info
2257	* because we have to know what movement the thing looking to move	2072	* because we have to know what movement the thing looking to move
2258	* there is capable of.	2073	* there is capable of.
2259	*/	2074	*/
2260
2261	int	2075	int
2262	find_dir (maptile *m, int x, int y, object *exclude)	2076	find_dir (maptile *m, int x, int y, object *exclude)
2263	{	2077	{
2264	int
2265	i,
2266	max = SIZEOFFREE, mflags;	2078	int i, max = SIZEOFFREE, mflags;
2267		2079
2268	sint16 nx, ny;	2080	sint16 nx, ny;
2269	object *	2081	object *tmp;
2270	tmp;
2271	maptile *	2082	maptile *mp;
2272	mp;
2273		2083
2274	MoveType blocked, move_type;	2084	MoveType blocked, move_type;
2275		2085
2276	if (exclude && exclude->head)	2086	if (exclude && exclude->head)
2277	{	2087	{
…		…
2289	mp = m;	2099	mp = m;
2290	nx = x + freearr_x[i];	2100	nx = x + freearr_x[i];
2291	ny = y + freearr_y[i];	2101	ny = y + freearr_y[i];
2292		2102
2293	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2103	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2104
2294	if (mflags & P_OUT_OF_MAP)	2105	if (mflags & P_OUT_OF_MAP)
2295	{
2296	max = maxfree[i];	2106	max = maxfree[i];
2297	}
2298	else	2107	else
2299	{	2108	{
2300	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2109	mapspace &ms = mp->at (nx, ny);
		2110
		2111	blocked = ms.move_block;
2301		2112
2302	if ((move_type & blocked) == move_type)	2113	if ((move_type & blocked) == move_type)
2303	{
2304	max = maxfree[i];	2114	max = maxfree[i];
2305	}
2306	else if (mflags & P_IS_ALIVE)	2115	else if (mflags & P_IS_ALIVE)
2307	{	2116	{
2308	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2117	for (tmp = ms.bot; tmp; tmp = tmp->above)
2309	{	2118	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2310	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2119	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2311	{
2312	break;	2120	break;
2313	}	2121
2314	}
2315	if (tmp)	2122	if (tmp)
2316	{
2317	return freedir[i];	2123	return freedir[i];
2318	}
2319	}	2124	}
2320	}	2125	}
2321	}	2126	}
		2127
2322	return 0;	2128	return 0;
2323	}	2129	}
2324		2130
2325	/*	2131	/*
2326	* distance(object 1, object 2) will return the square of the	2132	* distance(object 1, object 2) will return the square of the
2327	* distance between the two given objects.	2133	* distance between the two given objects.
2328	*/	2134	*/
2329
2330	int	2135	int
2331	distance (const object *ob1, const object *ob2)	2136	distance (const object *ob1, const object *ob2)
2332	{	2137	{
2333	int
2334	i;
2335
2336	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2138	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2337	return i;
2338	}	2139	}
2339		2140
2340	/*	2141	/*
2341	* find_dir_2(delta-x,delta-y) will return a direction in which	2142	* find_dir_2(delta-x,delta-y) will return a direction in which
2342	* an object which has subtracted the x and y coordinates of another	2143	* an object which has subtracted the x and y coordinates of another
2343	* object, needs to travel toward it.	2144	* object, needs to travel toward it.
2344	*/	2145	*/
2345
2346	int	2146	int
2347	find_dir_2 (int x, int y)	2147	find_dir_2 (int x, int y)
2348	{	2148	{
2349	int	2149	int q;
2350	q;
2351		2150
2352	if (y)	2151	if (y)
2353	q = x * 100 / y;	2152	q = x * 100 / y;
2354	else if (x)	2153	else if (x)
2355	q = -300 * x;	2154	q = -300 * x;
…		…
2390	int	2189	int
2391	absdir (int d)	2190	absdir (int d)
2392	{	2191	{
2393	while (d < 1)	2192	while (d < 1)
2394	d += 8;	2193	d += 8;
		2194
2395	while (d > 8)	2195	while (d > 8)
2396	d -= 8;	2196	d -= 8;
		2197
2397	return d;	2198	return d;
2398	}	2199	}
2399		2200
2400	/*	2201	/*
2401	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2202	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2403	*/	2204	*/
2404		2205
2405	int	2206	int
2406	dirdiff (int dir1, int dir2)	2207	dirdiff (int dir1, int dir2)
2407	{	2208	{
2408	int	2209	int d;
2409	d;
2410		2210
2411	d = abs (dir1 - dir2);	2211	d = abs (dir1 - dir2);
2412	if (d > 4)	2212	if (d > 4)
2413	d = 8 - d;	2213	d = 8 - d;
		2214
2414	return d;	2215	return d;
2415	}	2216	}
2416		2217
2417	/* peterm:	2218	/* peterm:
2418	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2219	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2421	* This basically means that if direction is 15, then it could either go	2222	* This basically means that if direction is 15, then it could either go
2422	* direction 4, 14, or 16 to get back to where we are.	2223	* direction 4, 14, or 16 to get back to where we are.
2423	* Moved from spell_util.c to object.c with the other related direction	2224	* Moved from spell_util.c to object.c with the other related direction
2424	* functions.	2225	* functions.
2425	*/	2226	*/
2426
2427	int
2428	reduction_dir[SIZEOFFREE][3] = {	2227	int reduction_dir[SIZEOFFREE][3] = {
2429	{0, 0, 0}, /* 0 */	2228	{0, 0, 0}, /* 0 */
2430	{0, 0, 0}, /* 1 */	2229	{0, 0, 0}, /* 1 */
2431	{0, 0, 0}, /* 2 */	2230	{0, 0, 0}, /* 2 */
2432	{0, 0, 0}, /* 3 */	2231	{0, 0, 0}, /* 3 */
2433	{0, 0, 0}, /* 4 */	2232	{0, 0, 0}, /* 4 */
…		…
2481	* find a path to that monster that we found. If not,	2280	* find a path to that monster that we found. If not,
2482	* we don't bother going toward it. Returns 1 if we	2281	* we don't bother going toward it. Returns 1 if we
2483	* can see a direct way to get it	2282	* can see a direct way to get it
2484	* Modified to be map tile aware -.MSW	2283	* Modified to be map tile aware -.MSW
2485	*/	2284	*/
2486
2487
2488	int	2285	int
2489	can_see_monsterP (maptile *m, int x, int y, int dir)	2286	can_see_monsterP (maptile *m, int x, int y, int dir)
2490	{	2287	{
2491	sint16 dx, dy;	2288	sint16 dx, dy;
2492	int
2493	mflags;	2289	int mflags;
2494		2290
2495	if (dir < 0)	2291	if (dir < 0)
2496	return 0; /* exit condition: invalid direction */	2292	return 0; /* exit condition: invalid direction */
2497		2293
2498	dx = x + freearr_x[dir];	2294	dx = x + freearr_x[dir];
…		…
2511	return 0;	2307	return 0;
2512		2308
2513	/* yes, can see. */	2309	/* yes, can see. */
2514	if (dir < 9)	2310	if (dir < 9)
2515	return 1;	2311	return 1;
		2312
2516	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2313	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2517	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2314	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2315	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2518	}	2316	}
2519
2520
2521		2317
2522	/*	2318	/*
2523	* can_pick(picker, item): finds out if an object is possible to be	2319	* can_pick(picker, item): finds out if an object is possible to be
2524	* picked up by the picker. Returnes 1 if it can be	2320	* picked up by the picker. Returnes 1 if it can be
2525	* picked up, otherwise 0.	2321	* picked up, otherwise 0.
…		…
2536	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2332	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2537	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2333	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2538	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2334	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2539	}	2335	}
2540		2336
2541
2542	/*	2337	/*
2543	* create clone from object to another	2338	* create clone from object to another
2544	*/	2339	*/
2545	object *	2340	object *
2546	object_create_clone (object *asrc)	2341	object_create_clone (object *asrc)
2547	{	2342	{
2548	object *
2549	dst = NULL, *tmp, *src, *part, *prev, *item;	2343	object *dst = 0, *tmp, *src, *part, *prev, *item;
2550		2344
2551	if (!asrc)	2345	if (!asrc)
2552	return NULL;	2346	return 0;
		2347
2553	src = asrc;	2348	src = asrc;
2554	if (src->head)	2349	if (src->head)
2555	src = src->head;	2350	src = src->head;
2556		2351
2557	prev = NULL;	2352	prev = 0;
2558	for (part = src; part; part = part->more)	2353	for (part = src; part; part = part->more)
2559	{	2354	{
2560	tmp = get_object ();	2355	tmp = part->clone ();
2561	copy_object (part, tmp);
2562	tmp->x -= src->x;	2356	tmp->x -= src->x;
2563	tmp->y -= src->y;	2357	tmp->y -= src->y;
		2358
2564	if (!part->head)	2359	if (!part->head)
2565	{	2360	{
2566	dst = tmp;	2361	dst = tmp;
2567	tmp->head = NULL;	2362	tmp->head = 0;
2568	}	2363	}
2569	else	2364	else
2570	{
2571	tmp->head = dst;	2365	tmp->head = dst;
2572	}	2366
2573	tmp->more = NULL;	2367	tmp->more = 0;
		2368
2574	if (prev)	2369	if (prev)
2575	prev->more = tmp;	2370	prev->more = tmp;
		2371
2576	prev = tmp;	2372	prev = tmp;
2577	}	2373	}
2578		2374
2579	for (item = src->inv; item; item = item->below)	2375	for (item = src->inv; item; item = item->below)
2580	insert_ob_in_ob (object_create_clone (item), dst);	2376	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2586	/* Basically, we save the content of the string to a temp file, then call */	2382	/* Basically, we save the content of the string to a temp file, then call */
2587	/* load_object on it. I admit it is a highly inefficient way to make things, */	2383	/* load_object on it. I admit it is a highly inefficient way to make things, */
2588	/* but it was simple to make and allows reusing the load_object function. */	2384	/* but it was simple to make and allows reusing the load_object function. */
2589	/* Remember not to use load_object_str in a time-critical situation. */	2385	/* Remember not to use load_object_str in a time-critical situation. */
2590	/* Also remember that multiparts objects are not supported for now. */	2386	/* Also remember that multiparts objects are not supported for now. */
2591
2592	object *	2387	object *
2593	load_object_str (const char *obstr)	2388	load_object_str (const char *obstr)
2594	{	2389	{
2595	object *op;	2390	object *op;
2596	char filename[MAX_BUF];	2391	char filename[MAX_BUF];
…		…
2606	}	2401	}
2607		2402
2608	fprintf (tempfile, obstr);	2403	fprintf (tempfile, obstr);
2609	fclose (tempfile);	2404	fclose (tempfile);
2610		2405
2611	op = get_object ();	2406	op = object::create ();
2612		2407
2613	object_thawer thawer (filename);	2408	object_thawer thawer (filename);
2614		2409
2615	if (thawer)	2410	if (thawer)
2616	load_object (thawer, op, 0);	2411	load_object (thawer, op, 0);
…		…
2626	* returns NULL if no match.	2421	* returns NULL if no match.
2627	*/	2422	*/
2628	object *	2423	object *
2629	find_obj_by_type_subtype (const object *who, int type, int subtype)	2424	find_obj_by_type_subtype (const object *who, int type, int subtype)
2630	{	2425	{
2631	object *tmp;
2632
2633	for (tmp = who->inv; tmp; tmp = tmp->below)	2426	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2634	if (tmp->type == type && tmp->subtype == subtype)	2427	if (tmp->type == type && tmp->subtype == subtype)
2635	return tmp;	2428	return tmp;
2636		2429
2637	return NULL;	2430	return 0;
2638	}	2431	}
2639		2432
2640	/* If ob has a field named key, return the link from the list,	2433	/* If ob has a field named key, return the link from the list,
2641	* otherwise return NULL.	2434	* otherwise return NULL.
2642	*	2435	*
…		…
2644	* do the desired thing.	2437	* do the desired thing.
2645	*/	2438	*/
2646	key_value *	2439	key_value *
2647	get_ob_key_link (const object *ob, const char *key)	2440	get_ob_key_link (const object *ob, const char *key)
2648	{	2441	{
2649	key_value *link;
2650
2651	for (link = ob->key_values; link != NULL; link = link->next)	2442	for (key_value *link = ob->key_values; link; link = link->next)
2652	if (link->key == key)	2443	if (link->key == key)
2653	return link;	2444	return link;
2654		2445
2655	return NULL;	2446	return 0;
2656	}	2447	}
2657		2448
2658	/*	2449	/*
2659	* Returns the value of op has an extra_field for key, or NULL.	2450	* Returns the value of op has an extra_field for key, or NULL.
2660	*	2451	*
…		…
2700	* Returns TRUE on success.	2491	* Returns TRUE on success.
2701	*/	2492	*/
2702	int	2493	int
2703	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2494	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2704	{	2495	{
2705	key_value *
2706	field = NULL, *last = NULL;	2496	key_value *field = NULL, *last = NULL;
2707		2497
2708	for (field = op->key_values; field != NULL; field = field->next)	2498	for (field = op->key_values; field != NULL; field = field->next)
2709	{	2499	{
2710	if (field->key != canonical_key)	2500	if (field->key != canonical_key)
2711	{	2501	{
…		…
2739	/* IF we get here, key doesn't exist */	2529	/* IF we get here, key doesn't exist */
2740		2530
2741	/* No field, we'll have to add it. */	2531	/* No field, we'll have to add it. */
2742		2532
2743	if (!add_key)	2533	if (!add_key)
2744	{
2745	return FALSE;	2534	return FALSE;
2746	}	2535
2747	/* There isn't any good reason to store a null	2536	/* There isn't any good reason to store a null
2748	* value in the key/value list. If the archetype has	2537	* value in the key/value list. If the archetype has
2749	* this key, then we should also have it, so shouldn't	2538	* this key, then we should also have it, so shouldn't
2750	* be here. If user wants to store empty strings,	2539	* be here. If user wants to store empty strings,
2751	* should pass in ""	2540	* should pass in ""

Diff Legend

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