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.40 by root, Thu Sep 14 00:07:15 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
35		34
		35	#include <bitset>
		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
37	static UUID uuid;	38	static UUID uuid;
38	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
39		40
40	object *objects; /* Pointer to the list of used objects */
41	object *active_objects; /* List of active objects that need to be processed */	41	object *active_objects; /* List of active objects that need to be processed */
42		42
43	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,	43	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,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	45	};
…		…
106	_exit (1);	106	_exit (1);
107	}	107	}
108		108
109	uuid.seq = uid;	109	uuid.seq = uid;
110	write_uuid ();	110	write_uuid ();
111	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112	fclose (fp);	112	fclose (fp);
113	}	113	}
114		114
115	UUID	115	UUID
116	gen_uuid ()	116	gen_uuid ()
…		…
185	*	185	*
186	* 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
187	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
188	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
189	*	189	*
190	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
191	*	191	*
192	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
193	* check weight	193	* check weight
194	*/	194	*/
195		195
196	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	197	{
198	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
199	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)
200	return 0;	204	return 0;
201		205
202	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
203	return 0;
204
205	/* 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
206	* 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
207	* used to store nrof).	209	* used to store nrof).
208	*/	210	*/
209	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
219	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
220		222
221	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223		225
224		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
226	* being locked in inventory should prevent merging.
227	* 0x4 in flags3 is CLIENT_SENT
228	*/
229	if ((ob1->arch != ob2->arch) ||
230	(ob1->flags[0] != ob2->flags[0]) ||
231	(ob1->flags[1] != ob2->flags[1]) ||
232	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
235	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
236	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
237	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
238	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
241	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
242	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
243	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
244	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
245	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
246	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
247	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
248	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
249	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
250	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
251	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
252	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
253	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
254	(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)
255	return 0;	251	return 0;
256		252
257	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
258	* check all objects in the inventory.	254	* check all objects in the inventory.
259	*/	255	*/
…		…
262	/* 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 */
263	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
264	return 0;	260	return 0;
265		261
266	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
267	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
268	return 0;	264	return 0;
269		265
270	/* 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
271	* if it is valid.	267	* if it is valid.
272	*/	268	*/
…		…
356	op = op->env;	352	op = op->env;
357	return op;	353	return op;
358	}	354	}
359		355
360	/*	356	/*
361	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
362	* a better check. We basically keeping traversing up until we can't
363	* or find a player.
364	*/
365
366	object *
367	is_player_inv (object *op)
368	{
369	for (; op != NULL && op->type != PLAYER; op = op->env)
370	if (op->env == op)
371	op->env = NULL;
372	return op;
373	}
374
375	/*
376	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377	* Some error messages.	358	* Some error messages.
378	* 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.
379	*/	360	*/
380		361
381	void	362	char *
382	dump_object2 (object *op)
383	{
384	errmsg[0] = 0;
385	return;
386	//TODO//D#d#
387	#if 0
388	char *cp;
389
390	/* object *tmp;*/
391
392	if (op->arch != NULL)
393	{
394	strcat (errmsg, "arch ");
395	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
396	strcat (errmsg, "\n");
397	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
398	strcat (errmsg, cp);
399	# if 0
400	/* Don't dump player diffs - they are too long, mostly meaningless, and
401	* will overflow the buffer.
402	* Changed so that we don't dump inventory either. This may
403	* also overflow the buffer.
404	*/
405	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
406	strcat (errmsg, cp);
407	for (tmp = op->inv; tmp; tmp = tmp->below)
408	dump_object2 (tmp);
409	# endif
410	strcat (errmsg, "end\n");
411	}
412	else
413	{
414	strcat (errmsg, "Object ");
415	if (op->name == NULL)
416	strcat (errmsg, "(null)");
417	else
418	strcat (errmsg, op->name);
419	strcat (errmsg, "\n");
420	# if 0
421	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
422	strcat (errmsg, cp);
423	for (tmp = op->inv; tmp; tmp = tmp->below)
424	dump_object2 (tmp);
425	# endif
426	strcat (errmsg, "end\n");
427	}
428	#endif
429	}
430
431	/*
432	* Dumps an object. Returns output in the static global errmsg array.
433	*/
434
435	void
436	dump_object (object *op)	363	dump_object (object *op)
437	{	364	{
438	if (op == NULL)	365	if (!op)
439	{	366	return strdup ("[NULLOBJ]");
440	strcpy (errmsg, "[NULL pointer]");
441	return;
442	}
443	errmsg[0] = '\0';
444	dump_object2 (op);
445	}
446		367
447	void	368	object_freezer freezer;
448	dump_all_objects (void)	369	save_object (freezer, op, 3);
449	{	370	return freezer.as_string ();
450	object *op;
451
452	for (op = objects; op != NULL; op = op->next)
453	{
454	dump_object (op);
455	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
456	}
457	}	371	}
458		372
459	/*	373	/*
460	* 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
461	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
481	*/	395	*/
482		396
483	object *	397	object *
484	find_object (tag_t i)	398	find_object (tag_t i)
485	{	399	{
486	object *op;	400	for (object *op = object::first; op; op = op->next)
487
488	for (op = objects; op != NULL; op = op->next)
489	if (op->count == i)	401	if (op->count == i)
490	break;	402	return op;
		403
491	return op;	404	return 0;
492	}	405	}
493		406
494	/*	407	/*
495	* 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.
496	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
501	find_object_name (const char *str)	414	find_object_name (const char *str)
502	{	415	{
503	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
504	object *op;	417	object *op;
505		418
506	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
507	if (op->name == str_)	420	if (op->name == str_)
508	break;	421	break;
509		422
510	return op;	423	return op;
511	}	424	}
512		425
513	void	426	void
514	free_all_object_data ()	427	free_all_object_data ()
515	{	428	{
516	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
517	}
518
519	/*
520	* Returns the object which this object marks as being the owner.
521	* A id-scheme is used to avoid pointing to objects which have been
522	* freed and are now reused. If this is detected, the owner is
523	* set to NULL, and NULL is returned.
524	* Changed 2004-02-12 - if the player is setting at the play again
525	* prompt, he is removed, and we don't want to treat him as an owner of
526	* anything, so check removed flag. I don't expect that this should break
527	* anything - once an object is removed, it is basically dead anyways.
528	*/
529	object *
530	object::get_owner ()
531	{
532	if (!owner
533	|| QUERY_FLAG (owner, FLAG_FREED)
534	|| QUERY_FLAG (owner, FLAG_REMOVED))
535	owner = 0;
536
537	return owner;
538	}	430	}
539		431
540	/*	432	/*
541	* Sets the owner and sets the skill and exp pointers to owner's current	433	* Sets the owner and sets the skill and exp pointers to owner's current
542	* skill and experience objects.	434	* skill and experience objects.
…		…
612		504
613	/* What is not cleared is next, prev, and count */	505	/* What is not cleared is next, prev, and count */
614		506
615	expmul = 1.0;	507	expmul = 1.0;
616	face = blank_face;	508	face = blank_face;
617	attacked_by_count = -1;
618		509
619	if (settings.casting_time)	510	if (settings.casting_time)
620	casting_time = -1;	511	casting_time = -1;
621	}	512	}
622		513
623	void object::clone (object *destination)
624	{
625	*(object_copy *)destination = *this;
626	*(object_pod *)destination = *this;
627
628	if (self || cb)
629	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
630	}
631
632	/*	514	/*
633	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
634	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
635	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
636	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
637	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
638	* will point at garbage.	520	* will point at garbage.
639	*/	521	*/
640	void	522	void
641	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
642	{	524	{
643	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
644	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
645		527
646	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
647		533
648	if (is_freed)	534	if (is_freed)
649	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
650	if (is_removed)	537	if (is_removed)
651	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
652		539
653	if (op2->speed < 0)	540	if (speed < 0)
654	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
655		542
656	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
657	if (op2->key_values)	544	if (key_values)
658	{	545	{
659	key_value *tail = 0;	546	key_value *tail = 0;
660	key_value *i;	547	key_value *i;
661		548
662	op->key_values = 0;	549	dst->key_values = 0;
663		550
664	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
665	{	552	{
666	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
667		554
668	new_link->next = 0;	555	new_link->next = 0;
669	new_link->key = i->key;	556	new_link->key = i->key;
670	new_link->value = i->value;	557	new_link->value = i->value;
671		558
672	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
673	if (!op->key_values)	560	if (!dst->key_values)
674	{	561	{
675	op->key_values = new_link;	562	dst->key_values = new_link;
676	tail = new_link;	563	tail = new_link;
677	}	564	}
678	else	565	else
679	{	566	{
680	tail->next = new_link;	567	tail->next = new_link;
681	tail = new_link;	568	tail = new_link;
682	}	569	}
683	}	570	}
684	}	571	}
685		572
686	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
687	}	582	}
688		583
689	/*	584	/*
690	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
691	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
896	update_now = 1;	791	update_now = 1;
897		792
898	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
899	update_now = 1;	794	update_now = 1;
900	}	795	}
		796
901	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
902	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
903	* that is being removed.	799	* that is being removed.
904	*/	800	*/
905	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
917		813
918	if (op->more != NULL)	814	if (op->more != NULL)
919	update_object (op->more, action);	815	update_object (op->more, action);
920	}	816	}
921		817
922	static unordered_vector<object *> mortals;	818	object::vector object::mortals;
923	static std::vector<object *, slice_allocator <object *> > freed;	819	object::vector object::objects; // not yet used
		820	object *object::first;
924		821
925	void object::free_mortals ()	822	void object::free_mortals ()
926	{	823	{
927	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
928	if ((*i)->refcnt)	825	if ((*i)->refcnt)
929	++i; // further delay freeing	826	++i; // further delay freeing
930	else	827	else
931	{	828	{
932	//freed.push_back (*i);//D
933	delete *i;	829	delete *i;
934	mortals.erase (i);	830	mortals.erase (i);
935	}	831	}
936
937	if (mortals.size() && 0)//D
938	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
939	}	832	}
940		833
941	object::object ()	834	object::object ()
942	{	835	{
943	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
944		837
945	expmul = 1.0;	838	expmul = 1.0;
946	face = blank_face;	839	face = blank_face;
947	attacked_by_count = -1;
948	}	840	}
949		841
950	object::~object ()	842	object::~object ()
951	{	843	{
952	free_key_values (this);	844	free_key_values (this);
953	}	845	}
954		846
955	void object::link ()	847	void object::link ()
956	{	848	{
957	count = ++ob_count;	849	count = ++ob_count;
		850	uuid = gen_uuid ();
958		851
959	prev = 0;	852	prev = 0;
960	next = objects;	853	next = object::first;
961		854
962	if (objects)	855	if (object::first)
963	objects->prev = this;	856	object::first->prev = this;
964		857
965	objects = this;	858	object::first = this;
966	}	859	}
967		860
968	void object::unlink ()	861	void object::unlink ()
969	{	862	{
970	count = 0;
971	uuid = gen_uuid ();
972
973	if (this == objects)	863	if (this == object::first)
974	objects = next;	864	object::first = next;
975		865
976	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
977	if (prev)
978	{
979	prev->next = next;	867	if (prev) prev->next = next;
		868	if (next) next->prev = prev;
		869
980	prev = 0;	870	prev = 0;
981	}
982
983	if (next)
984	{
985	next->prev = prev;
986	next = 0;	871	next = 0;
987	}
988	}	872	}
989		873
990	object *object::create ()	874	object *object::create ()
991	{	875	{
992	object *op;
993
994	if (freed.empty ())
995	op = new object;	876	object *op = new object;
996	else
997	{
998	// highly annoying, but the only way to get it stable right now
999	op = freed.back ();
1000	freed.pop_back ();
1001	op->~object ();
1002	new ((void *) op) object;
1003	}
1004
1005	op->link ();	877	op->link ();
1006	return op;	878	return op;
1007	}	879	}
1008		880
1009	/*	881	/*
…		…
1011	* it from the list of used objects, and puts it on the list of	883	* it from the list of used objects, and puts it on the list of
1012	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
1013	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
1014	* this function to succeed.	886	* this function to succeed.
1015	*	887	*
1016	* If free_inventory is set, free inventory as well. Else drop items in	888	* If destroy_inventory is set, free inventory as well. Else drop items in
1017	* inventory to the ground.	889	* inventory to the ground.
1018	*/	890	*/
1019	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
1020	{	892	{
1021	if (QUERY_FLAG (this, FLAG_FREED))	893	if (QUERY_FLAG (this, FLAG_FREED))
1022	return;	894	return;
1023		895
1024	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1025	remove_friendly_object (this);	897	remove_friendly_object (this);
1026		898
1027	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
1028	remove_ob (this);	900	remove ();
1029		901
1030	SET_FLAG (this, FLAG_FREED);	902	SET_FLAG (this, FLAG_FREED);
1031		903
1032	if (more)	904	if (more)
1033	{	905	{
1034	more->free (free_inventory);	906	more->destroy (destroy_inventory);
1035	more = 0;	907	more = 0;
1036	}	908	}
1037		909
1038	if (inv)	910	if (inv)
1039	{	911	{
1040	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
1041	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
1042	* drop on that space.	914	* drop on that space.
1043	*/	915	*/
1044	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1045	{	917	{
1046	object *op = inv;	918	object *op = inv;
1047		919
1048	while (op)	920	while (op)
1049	{	921	{
1050	object *tmp = op->below;	922	object *tmp = op->below;
1051	op->free (free_inventory);	923	op->destroy (destroy_inventory);
1052	op = tmp;	924	op = tmp;
1053	}	925	}
1054	}	926	}
1055	else	927	else
1056	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
…		…
1058		930
1059	while (op)	931	while (op)
1060	{	932	{
1061	object *tmp = op->below;	933	object *tmp = op->below;
1062		934
1063	remove_ob (op);	935	op->remove ();
1064		936
1065	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1066	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1067	free_object (op);	939	op->destroy ();
1068	else	940	else
1069	{	941	{
1070	op->x = x;	942	op->x = x;
1071	op->y = y;	943	op->y = y;
1072	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1075	op = tmp;	947	op = tmp;
1076	}	948	}
1077	}	949	}
1078	}	950	}
1079		951
		952	// hack to ensure that freed objects still have a valid map
		953	{
		954	static maptile *freed_map; // freed objects are moved here to avoid crashes
		955
		956	if (!freed_map)
		957	{
		958	freed_map = new maptile;
		959
		960	freed_map->name = "/internal/freed_objects_map";
		961	freed_map->width = 3;
		962	freed_map->height = 3;
		963
		964	freed_map->allocate ();
		965	}
		966
		967	map = freed_map;
		968	x = 1;
		969	y = 1;
		970	}
		971
		972	// clear those pointers that likely might have circular references to us
1080	owner = 0;	973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
1081		979
1082	/* Remove object from the active list */	980	/* Remove object from the active list */
1083	speed = 0;	981	speed = 0;
1084	update_ob_speed (this);	982	update_ob_speed (this);
1085		983
…		…
1090		988
1091	/*	989	/*
1092	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1093	* weight of an object (and what is carried by it's environment(s)).	991	* weight of an object (and what is carried by it's environment(s)).
1094	*/	992	*/
1095
1096	void	993	void
1097	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1098	{	995	{
1099	while (op != NULL)	996	while (op != NULL)
1100	{	997	{
1101	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1102	{
1103	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1104	}	1000
1105	op->carrying -= weight;	1001	op->carrying -= weight;
1106	op = op->env;	1002	op = op->env;
1107	}	1003	}
1108	}	1004	}
1109		1005
1110	/* remove_ob(op):	1006	/* op->remove ():
1111	* This function removes the object op from the linked list of objects	1007	* This function removes the object op from the linked list of objects
1112	* which it is currently tied to. When this function is done, the	1008	* which it is currently tied to. When this function is done, the
1113	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1114	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1115	* the previous environment.	1011	* the previous environment.
1116	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1117	*/	1013	*/
1118
1119	void	1014	void
1120	remove_ob (object *op)	1015	object::remove ()
1121	{	1016	{
		1017	object *tmp, *last = 0;
1122	object *	1018	object *otmp;
1123	tmp, *
1124	last = NULL;
1125	object *
1126	otmp;
1127		1019
1128	tag_t
1129	tag;
1130	int
1131	check_walk_off;	1020	int check_walk_off;
1132	mapstruct *
1133	m;
1134		1021
1135	sint16
1136	x,
1137	y;
1138
1139	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1140	return;	1023	return;
1141		1024
1142	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
1143		1026
1144	if (op->more != NULL)	1027	if (more)
1145	remove_ob (op->more);	1028	more->remove ();
1146		1029
1147	/*	1030	/*
1148	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1149	* inventory.	1032	* inventory.
1150	*/	1033	*/
1151	if (op->env != NULL)	1034	if (env)
1152	{	1035	{
1153	if (op->nrof)	1036	if (nrof)
1154	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1155	else	1038	else
1156	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1157		1040
1158	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1159	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1160	* to save cpu time.	1043	* to save cpu time.
1161	*/	1044	*/
1162	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163	fix_player (otmp);	1046	fix_player (otmp);
1164		1047
1165	if (op->above != NULL)	1048	if (above != NULL)
1166	op->above->below = op->below;	1049	above->below = below;
1167	else	1050	else
1168	op->env->inv = op->below;	1051	env->inv = below;
1169		1052
1170	if (op->below != NULL)	1053	if (below != NULL)
1171	op->below->above = op->above;	1054	below->above = above;
1172		1055
1173	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1174	* the map, but we don't actually do that - it is up	1057	* the map, but we don't actually do that - it is up
1175	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1176	*/	1059	*/
1177	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1178	op->map = op->env->map;	1061	map = env->map;
1179	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1180	op->env = NULL;	1063	env = 0;
1181	}	1064	}
1182	else if (op->map)	1065	else if (map)
1183	{	1066	{
1184	x = op->x;
1185	y = op->y;
1186	m = get_map_from_coord (op->map, &x, &y);
1187
1188	if (!m)
1189	{
1190	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1191	op->map->path, op->x, op->y);
1192	/* in old days, we used to set x and y to 0 and continue.
1193	* it seems if we get into this case, something is probablye
1194	* screwed up and should be fixed.
1195	*/
1196	abort ();
1197	}
1198
1199	if (op->map != m)
1200	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1201	op->map->path, m->path, op->x, op->y, x, y);
1202
1203	/* Re did the following section of code - it looks like it had	1067	/* Re did the following section of code - it looks like it had
1204	* lots of logic for things we no longer care about	1068	* lots of logic for things we no longer care about
1205	*/	1069	*/
1206		1070
1207	/* link the object above us */	1071	/* link the object above us */
1208	if (op->above)	1072	if (above)
1209	op->above->below = op->below;	1073	above->below = below;
1210	else	1074	else
1211	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1212		1076
1213	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1214	if (op->below)	1078	if (below)
1215	op->below->above = op->above;	1079	below->above = above;
1216	else	1080	else
1217	{	1081	{
1218	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1219	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1220	* evident	1084	* evident
1221	*/	1085	*/
1222	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1223	{	1087	{
1224	dump_object (op);	1088	char *dump = dump_object (this);
1225	LOG (llevError,	1089	LOG (llevError,
1226	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1090	"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);
		1091	free (dump);
1227	dump_object (GET_MAP_OB (m, x, y));	1092	dump = dump_object (GET_MAP_OB (map, x, y));
1228	LOG (llevError, "%s\n", errmsg);	1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1229	}	1095	}
1230		1096
1231	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1232	}	1098	}
1233		1099
1234	op->above = 0;	1100	above = 0;
1235	op->below = 0;	1101	below = 0;
1236		1102
1237	if (op->map->in_memory == MAP_SAVING)	1103	if (map->in_memory == MAP_SAVING)
1238	return;	1104	return;
1239		1105
1240	tag = op->count;
1241	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1242		1107
1243	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1244	{	1109	{
1245	/* No point updating the players look faces if he is the object	1110	/* No point updating the players look faces if he is the object
1246	* being removed.	1111	* being removed.
1247	*/	1112	*/
1248		1113
1249	if (tmp->type == PLAYER && tmp != op)	1114	if (tmp->type == PLAYER && tmp != this)
1250	{	1115	{
1251	/* If a container that the player is currently using somehow gets	1116	/* If a container that the player is currently using somehow gets
1252	* removed (most likely destroyed), update the player view	1117	* removed (most likely destroyed), update the player view
1253	* appropriately.	1118	* appropriately.
1254	*/	1119	*/
1255	if (tmp->container == op)	1120	if (tmp->container == this)
1256	{	1121	{
1257	CLEAR_FLAG (op, FLAG_APPLIED);	1122	CLEAR_FLAG (this, FLAG_APPLIED);
1258	tmp->container = NULL;	1123	tmp->container = 0;
1259	}	1124	}
1260		1125
1261	tmp->contr->socket.update_look = 1;	1126	tmp->contr->socket->floorbox_update ();
1262	}	1127	}
1263		1128
1264	/* See if player moving off should effect something */	1129	/* See if player moving off should effect something */
1265	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1130	if (check_walk_off
		1131	&& ((move_type & tmp->move_off)
		1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1266	{	1133	{
1267	move_apply (tmp, op, NULL);	1134	move_apply (tmp, this, 0);
1268		1135
1269	if (was_destroyed (op, tag))	1136	if (destroyed ())
1270	{
1271	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1272	}
1273	}	1138	}
1274		1139
1275	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1276		1141
1277	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1278	tmp->above = NULL;	1143	tmp->above = 0;
1279		1144
1280	last = tmp;	1145	last = tmp;
1281	}	1146	}
1282		1147
1283	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1149	if (!last)
1285	{	1150	{
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't	1153	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.	1154	* be correct anyways.
1290	*/	1155	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1293	}	1158	}
1294	else	1159	else
1295	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1296		1161
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1298	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
1299	}	1164	}
1300	}	1165	}
1301		1166
1302	/*	1167	/*
1303	* merge_ob(op,top):	1168	* merge_ob(op,top):
…		…
1318		1183
1319	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1320	{	1185	{
1321	if (top == op)	1186	if (top == op)
1322	continue;	1187	continue;
1323	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1324	{	1190	{
1325	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1326		1192
1327	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1328	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1329	remove_ob (op);	1195	op->destroy ();
1330	free_object (op);
1331	return top;	1196	return top;
1332	}	1197	}
1333	}	1198	}
1334		1199
1335	return NULL;	1200	return 0;
1336	}	1201	}
1337		1202
1338	/*	1203	/*
1339	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1340	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1341	*/	1206	*/
1342	object *	1207	object *
1343	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1344	{	1209	{
1345	object *tmp;	1210	object *tmp;
1346		1211
1347	if (op->head)	1212	if (op->head)
1348	op = op->head;	1213	op = op->head;
…		…
1376	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1377	* just 'op' otherwise	1242	* just 'op' otherwise
1378	*/	1243	*/
1379		1244
1380	object *	1245	object *
1381	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1382	{	1247	{
1383	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1384	sint16 x, y;	1249	sint16 x, y;
1385		1250
1386	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1389	return NULL;	1254	return NULL;
1390	}	1255	}
1391		1256
1392	if (m == NULL)	1257	if (m == NULL)
1393	{	1258	{
1394	dump_object (op);	1259	char *dump = dump_object (op);
1395	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1261	free (dump);
1396	return op;	1262	return op;
1397	}	1263	}
1398		1264
1399	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1400	{	1266	{
1401	dump_object (op);	1267	char *dump = dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1404	/* Better to catch this here, as otherwise the next use of this object	1270	/* Better to catch this here, as otherwise the next use of this object
1405	* is likely to cause a crash. Better to find out where it is getting	1271	* is likely to cause a crash. Better to find out where it is getting
1406	* improperly inserted.	1272	* improperly inserted.
1407	*/	1273	*/
1408	abort ();	1274	abort ();
1409	#endif	1275	#endif
		1276	free (dump);
1410	return op;	1277	return op;
1411	}	1278	}
1412		1279
1413	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1414	{	1281	{
1415	dump_object (op);	1282	char *dump = dump_object (op);
1416	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1284	free (dump);
1417	return op;	1285	return op;
1418	}	1286	}
1419		1287
1420	if (op->more != NULL)	1288	if (op->more != NULL)
1421	{	1289	{
…		…
1459		1327
1460	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1461	*/	1329	*/
1462	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1465	{	1333	{
1466	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1335	tmp->destroy ();
1468	free_object (tmp);
1469	}	1336	}
1470		1337
1471	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1472	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1473		1340
…		…
1601	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1602	*/	1469	*/
1603	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1604	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1605	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1606	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1607		1474
1608	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1609	* visible to others on this map. But update_all_los is really	1476	* visible to others on this map. But update_all_los is really
1610	* an inefficient way to do this, as it means los for all players	1477	* an inefficient way to do this, as it means los for all players
1611	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1619		1486
1620	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1621	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1622		1489
1623	/* Don't know if moving this to the end will break anything. However,	1490	/* Don't know if moving this to the end will break anything. However,
1624	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1625	*	1492	*
1626	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1627	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1628	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1629	* update_object().	1496	* update_object().
…		…
1659	tmp1;	1526	tmp1;
1660		1527
1661	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1662		1529
1663	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1530	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1664	{
1665	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1666	{	1532	tmp->destroy ();
1667	remove_ob (tmp);
1668	free_object (tmp);
1669	}
1670	}
1671		1533
1672	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1673		1535
1674	tmp1->x = op->x;	1536	tmp1->x = op->x;
1675	tmp1->y = op->y;	1537	tmp1->y = op->y;
1676	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1677	}	1539	}
…		…
1685	*/	1547	*/
1686		1548
1687	object *	1549	object *
1688	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1689	{	1551	{
1690	object *	1552	object *newob;
1691	newob;
1692	int
1693	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1694		1554
1695	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1696	{	1556	{
1697	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1557	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1698	return NULL;	1558	return NULL;
1699	}	1559	}
1700		1560
1701	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
1702		1562
1703	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1704	{	1564	orig_ob->destroy (1);
1705	if (!is_removed)
1706	remove_ob (orig_ob);
1707	free_object2 (orig_ob, 1);
1708	}
1709	else if (!is_removed)	1565	else if (!is_removed)
1710	{	1566	{
1711	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1712	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1713	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1569	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1743	if (i > op->nrof)	1599	if (i > op->nrof)
1744	i = op->nrof;	1600	i = op->nrof;
1745		1601
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	op->nrof -= i;	1603	op->nrof -= i;
1748	else if (op->env != NULL)	1604	else if (op->env)
1749	{	1605	{
1750	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1751	* therein?	1607	* therein?
1752	*/	1608	*/
1753	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1754	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1755	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1756	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1757	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1758	* and then searching the map for a player.	1614	* and then searching the map for a player.
1759	*/	1615	*/
1760	if (!tmp)	1616	if (!tmp)
1761	{	1617	{
1762	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1763	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1764	break;	1622	break;
1765	if (pl)	1623	}
1766	tmp = pl->ob;
1767	else
1768	tmp = NULL;
1769	}	1624	}
1770		1625
1771	if (i < op->nrof)	1626	if (i < op->nrof)
1772	{	1627	{
1773	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1774	op->nrof -= i;	1629	op->nrof -= i;
1775	if (tmp)	1630	if (tmp)
1776	{
1777	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1778	}
1779	}	1632	}
1780	else	1633	else
1781	{	1634	{
1782	remove_ob (op);	1635	op->remove ();
1783	op->nrof = 0;	1636	op->nrof = 0;
1784	if (tmp)	1637	if (tmp)
1785	{
1786	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1787	}
1788	}	1639	}
1789	}	1640	}
1790	else	1641	else
1791	{	1642	{
1792	object *above = op->above;	1643	object *above = op->above;
1793		1644
1794	if (i < op->nrof)	1645	if (i < op->nrof)
1795	op->nrof -= i;	1646	op->nrof -= i;
1796	else	1647	else
1797	{	1648	{
1798	remove_ob (op);	1649	op->remove ();
1799	op->nrof = 0;	1650	op->nrof = 0;
1800	}	1651	}
1801		1652
1802	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1803	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1804	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1805	{	1656	{
1806	if (op->nrof)	1657	if (op->nrof)
1807	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1808	else	1659	else
…		…
1812		1663
1813	if (op->nrof)	1664	if (op->nrof)
1814	return op;	1665	return op;
1815	else	1666	else
1816	{	1667	{
1817	free_object (op);	1668	op->destroy ();
1818	return NULL;	1669	return 0;
1819	}	1670	}
1820	}	1671	}
1821		1672
1822	/*	1673	/*
1823	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1835	op->carrying += weight;	1686	op->carrying += weight;
1836	op = op->env;	1687	op = op->env;
1837	}	1688	}
1838	}	1689	}
1839		1690
		1691	object *
		1692	insert_ob_in_ob (object *op, object *where)
		1693	{
		1694	if (!where)
		1695	{
		1696	char *dump = dump_object (op);
		1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1698	free (dump);
		1699	return op;
		1700	}
		1701
		1702	if (where->head)
		1703	{
		1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1705	where = where->head;
		1706	}
		1707
		1708	return where->insert (op);
		1709	}
		1710
1840	/*	1711	/*
1841	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1842	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1843	* inside the object environment.	1714	* inside the object environment.
1844	*	1715	*
1845	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1846	* the inventory at the last position or next to other objects of the same
1847	* type.
1848	* Frank: Now sorted by type, archetype and magic!
1849	*
1850	* The function returns now pointer to inserted item, and return value can	1716	* The function returns now pointer to inserted item, and return value can
1851	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1852	*/	1718	*/
1853		1719
1854	object *	1720	object *
1855	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1856	{	1722	{
1857	object *	1723	object *tmp, *otmp;
1858	tmp, *
1859	otmp;
1860		1724
1861	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1862	{	1726	op->remove ();
1863	dump_object (op);
1864	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1865	return op;
1866	}
1867
1868	if (where == NULL)
1869	{
1870	dump_object (op);
1871	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1872	return op;
1873	}
1874
1875	if (where->head)
1876	{
1877	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1878	where = where->head;
1879	}
1880		1727
1881	if (op->more)	1728	if (op->more)
1882	{	1729	{
1883	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1730	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1884	return op;	1731	return op;
…		…
1886		1733
1887	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1888	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1889	if (op->nrof)	1736	if (op->nrof)
1890	{	1737	{
1891	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1892	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1893	{	1740	{
1894	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1895	(client needs the original object) */	1742	(client needs the original object) */
1896	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1897	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1898	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1899	*/	1746	*/
1900	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1901	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1902	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1903	op = tmp;	1750	op = tmp;
1904	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1905	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1906	break;	1753	break;
1907	}	1754	}
1908		1755
1909	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1910	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1911	* (if it was possible to merge). calling remove_ob will subtract	1758	* (if it was possible to merge). calling remove_ob will subtract
1912	* the weight, so we need to add it in again, since we actually do	1759	* the weight, so we need to add it in again, since we actually do
1913	* the linking below	1760	* the linking below
1914	*/	1761	*/
1915	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1916	}	1763	}
1917	else	1764	else
1918	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1919		1766
1920	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1921	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1922	{
1923	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1924	fix_player (otmp);	1770	fix_player (otmp);
1925	}
1926		1771
1927	op->map = NULL;	1772	op->map = 0;
1928	op->env = where;	1773	op->env = this;
1929	op->above = NULL;	1774	op->above = 0;
1930	op->below = NULL;	1775	op->below = 0;
1931	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1932		1777
1933	/* reset the light list and los of the players on the map */	1778	/* reset the light list and los of the players on the map */
1934	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1935	{	1780	{
1936	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1937	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1938	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1939	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1940	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1941	}	1786	}
1942		1787
1943	/* Client has no idea of ordering so lets not bother ordering it here.	1788	/* Client has no idea of ordering so lets not bother ordering it here.
1944	* It sure simplifies this function...	1789	* It sure simplifies this function...
1945	*/	1790	*/
1946	if (where->inv == NULL)	1791	if (!inv)
1947	where->inv = op;	1792	inv = op;
1948	else	1793	else
1949	{	1794	{
1950	op->below = where->inv;	1795	op->below = inv;
1951	op->below->above = op;	1796	op->below->above = op;
1952	where->inv = op;	1797	inv = op;
1953	}	1798	}
		1799
1954	return op;	1800	return op;
1955	}	1801	}
1956		1802
1957	/*	1803	/*
1958	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1976	*/	1822	*/
1977		1823
1978	int	1824	int
1979	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1980	{	1826	{
1981	object *	1827	object *tmp;
1982	tmp;	1828	maptile *m = op->map;
1983	tag_t
1984	tag;
1985	mapstruct *
1986	m = op->map;
1987	int
1988	x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1989		1830
1990	MoveType	1831	MoveType move_on, move_slow, move_block;
1991	move_on,
1992	move_slow,
1993	move_block;
1994		1832
1995	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1996	return 0;	1834	return 0;
1997
1998	tag = op->count;
1999		1835
2000	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1836	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2001	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1837	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2002	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1838	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2003		1839
…		…
2064	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2065	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1901	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2066	{	1902	{
2067	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
2068		1904
2069	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
2070	return 1;	1906	return 1;
2071		1907
2072	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
2073	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
2074	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2086	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2087	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2088	*/	1924	*/
2089		1925
2090	object *	1926	object *
2091	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2092	{	1928	{
2093	object *	1929	object *
2094	tmp;	1930	tmp;
2095		1931
2096	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2109	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2110	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2111	*/	1947	*/
2112		1948
2113	object *	1949	object *
2114	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2115	{	1951	{
2116	object *	1952	object *
2117	tmp;	1953	tmp;
2118		1954
2119	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2259	* the archetype because that isn't correct if the monster has been	2095	* the archetype because that isn't correct if the monster has been
2260	* customized, changed states, etc.	2096	* customized, changed states, etc.
2261	*/	2097	*/
2262		2098
2263	int	2099	int
2264	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2265	{	2101	{
2266	int	2102	int
2267	i,	2103	i,
2268	index = 0, flag;	2104	index = 0, flag;
2269	static int	2105	static int
…		…
2281	* if the space being examined only has a wall to the north and empty	2117	* if the space being examined only has a wall to the north and empty
2282	* spaces in all the other directions, this will reduce the search space	2118	* spaces in all the other directions, this will reduce the search space
2283	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2284	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2285	*/	2121	*/
2286	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2287	stop = maxfree[i];	2123	stop = maxfree[i];
2288	}	2124	}
		2125
2289	if (!index)	2126	if (!index)
2290	return -1;	2127	return -1;
		2128
2291	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2292	}	2130	}
2293		2131
2294	/*	2132	/*
2295	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2296	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2297	* But it will return the first available spot, not a random choice.	2135	* But it will return the first available spot, not a random choice.
2298	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2299	*/	2137	*/
2300		2138
2301	int	2139	int
2302	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2303	{	2141	{
2304	int	2142	int
2305	i;	2143	i;
2306		2144
2307	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2371	* because we have to know what movement the thing looking to move	2209	* because we have to know what movement the thing looking to move
2372	* there is capable of.	2210	* there is capable of.
2373	*/	2211	*/
2374		2212
2375	int	2213	int
2376	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2377	{	2215	{
2378	int	2216	int
2379	i,	2217	i,
2380	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2381		2219
2382	sint16 nx, ny;	2220	sint16 nx, ny;
2383	object *	2221	object *
2384	tmp;	2222	tmp;
2385	mapstruct *	2223	maptile *
2386	mp;	2224	mp;
2387		2225
2388	MoveType blocked, move_type;	2226	MoveType blocked, move_type;
2389		2227
2390	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
…		…
2598	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2599	*/	2437	*/
2600		2438
2601		2439
2602	int	2440	int
2603	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2604	{	2442	{
2605	sint16 dx, dy;	2443	sint16 dx, dy;
2606	int	2444	int
2607	mflags;	2445	mflags;
2608		2446
…		…
2657	* create clone from object to another	2495	* create clone from object to another
2658	*/	2496	*/
2659	object *	2497	object *
2660	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2661	{	2499	{
2662	object *
2663	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2664		2501
2665	if (!asrc)	2502	if (!asrc)
2666	return NULL;	2503	return 0;
		2504
2667	src = asrc;	2505	src = asrc;
2668	if (src->head)	2506	if (src->head)
2669	src = src->head;	2507	src = src->head;
2670		2508
2671	prev = NULL;	2509	prev = 0;
2672	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2673	{	2511	{
2674	tmp = get_object ();	2512	tmp = part->clone ();
2675	copy_object (part, tmp);
2676	tmp->x -= src->x;	2513	tmp->x -= src->x;
2677	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2678	if (!part->head)	2516	if (!part->head)
2679	{	2517	{
2680	dst = tmp;	2518	dst = tmp;
2681	tmp->head = NULL;	2519	tmp->head = 0;
2682	}	2520	}
2683	else	2521	else
2684	{	2522	{
2685	tmp->head = dst;	2523	tmp->head = dst;
2686	}	2524	}
		2525
2687	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2688	if (prev)	2528	if (prev)
2689	prev->more = tmp;	2529	prev->more = tmp;
		2530
2690	prev = tmp;	2531	prev = tmp;
2691	}	2532	}
2692		2533
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2536
2699	return dst;	2537	return dst;
2700	}	2538	}
2701		2539
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */	2540	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* Basically, we save the content of the string to a temp file, then call */	2541	/* Basically, we save the content of the string to a temp file, then call */
2714
2715	/* load_object on it. I admit it is a highly inefficient way to make things, */	2542	/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717	/* but it was simple to make and allows reusing the load_object function. */	2543	/* but it was simple to make and allows reusing the load_object function. */
2718
2719	/* Remember not to use load_object_str in a time-critical situation. */	2544	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2722		2546
2723	object *	2547	object *
2724	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2725	{	2549	{
2726	object *	2550	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2730		2552
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2554
2733	FILE *
2734	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2735		2556
2736	if (tempfile == NULL)	2557	if (tempfile == NULL)
2737	{	2558	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2560	return NULL;
2740	};	2561	}
		2562
2741	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2564	fclose (tempfile);
2743		2565
2744	op = get_object ();	2566	op = object::create ();
2745		2567
2746	object_thawer thawer (filename);	2568	object_thawer thawer (filename);
2747		2569
2748	if (thawer)	2570	if (thawer)
2749	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
…		…
2759	* returns NULL if no match.	2581	* returns NULL if no match.
2760	*/	2582	*/
2761	object *	2583	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2584	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2585	{
2764	object *	2586	object *tmp;
2765	tmp;
2766		2587
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2590	return tmp;
2770		2591
…		…
2778	* do the desired thing.	2599	* do the desired thing.
2779	*/	2600	*/
2780	key_value *	2601	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2782	{	2603	{
2783	key_value *	2604	key_value *link;
2784	link;
2785		2605
2786	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2607	if (link->key == key)
2789	{
2790	return link;	2608	return link;
2791	}
2792	}
2793		2609
2794	return NULL;	2610	return NULL;
2795	}	2611	}
2796		2612
2797	/*	2613	/*

Diff Legend

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