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.42 by root, Thu Sep 14 01:19:47 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;
		819	object::vector object::objects; // not yet used
		820	object *object::first;
923		821
924	void object::free_mortals ()	822	void object::free_mortals ()
925	{	823	{
926	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
927	if ((*i)->refcnt)	825	if ((*i)->refcnt)
928	++i; // further delay freeing	826	++i; // further delay freeing
929	else	827	else
930	{	828	{
931	delete *i;	829	delete *i;
932	mortals.erase (i);	830	mortals.erase (i);
933	}	831	}
934
935	static int lastmortals = 0;//D
936
937	if (mortals.size() != lastmortals)//D
938	{
939	lastmortals = mortals.size ();//D
940	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
941	}
942	}	832	}
943		833
944	object::object ()	834	object::object ()
945	{	835	{
946	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
947		837
948	expmul = 1.0;	838	expmul = 1.0;
949	face = blank_face;	839	face = blank_face;
950	attacked_by_count = -1;
951	}	840	}
952		841
953	object::~object ()	842	object::~object ()
954	{	843	{
955	free_key_values (this);	844	free_key_values (this);
…		…
959	{	848	{
960	count = ++ob_count;	849	count = ++ob_count;
961	uuid = gen_uuid ();	850	uuid = gen_uuid ();
962		851
963	prev = 0;	852	prev = 0;
964	next = objects;	853	next = object::first;
965		854
966	if (objects)	855	if (object::first)
967	objects->prev = this;	856	object::first->prev = this;
968		857
969	objects = this;	858	object::first = this;
970	}	859	}
971		860
972	void object::unlink ()	861	void object::unlink ()
973	{	862	{
974	//count = 0;//D
975	if (!prev && !next) return;//D
976
977	if (this == objects)	863	if (this == object::first)
978	objects = next;	864	object::first = next;
979		865
980	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
981	if (prev) prev->next = next;	867	if (prev) prev->next = next;
982	if (next) next->prev = prev;	868	if (next) next->prev = prev;
983		869
…		…
997	* 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
998	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
999	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
1000	* this function to succeed.	886	* this function to succeed.
1001	*	887	*
1002	* 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
1003	* inventory to the ground.	889	* inventory to the ground.
1004	*/	890	*/
1005	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
1006	{	892	{
1007	if (QUERY_FLAG (this, FLAG_FREED))	893	if (QUERY_FLAG (this, FLAG_FREED))
1008	return;	894	return;
1009		895
1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1011	remove_friendly_object (this);	897	remove_friendly_object (this);
1012		898
1013	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
1014	remove_ob (this);	900	remove ();
1015		901
1016	SET_FLAG (this, FLAG_FREED);	902	SET_FLAG (this, FLAG_FREED);
1017		903
1018	if (more)	904	if (more)
1019	{	905	{
1020	more->free (free_inventory);	906	more->destroy (destroy_inventory);
1021	more = 0;	907	more = 0;
1022	}	908	}
1023		909
1024	if (inv)	910	if (inv)
1025	{	911	{
1026	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
1027	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
1028	* drop on that space.	914	* drop on that space.
1029	*/	915	*/
1030	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)
1031	{	917	{
1032	object *op = inv;	918	object *op = inv;
1033		919
1034	while (op)	920	while (op)
1035	{	921	{
1036	object *tmp = op->below;	922	object *tmp = op->below;
1037	op->free (free_inventory);	923	op->destroy (destroy_inventory);
1038	op = tmp;	924	op = tmp;
1039	}	925	}
1040	}	926	}
1041	else	927	else
1042	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
…		…
1044		930
1045	while (op)	931	while (op)
1046	{	932	{
1047	object *tmp = op->below;	933	object *tmp = op->below;
1048		934
1049	remove_ob (op);	935	op->remove ();
1050		936
1051	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1052	|| 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))
1053	free_object (op);	939	op->destroy ();
1054	else	940	else
1055	{	941	{
1056	op->x = x;	942	op->x = x;
1057	op->y = y;	943	op->y = y;
1058	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 */
…		…
1061	op = tmp;	947	op = tmp;
1062	}	948	}
1063	}	949	}
1064	}	950	}
1065		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
1066	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;
1067		979
1068	/* Remove object from the active list */	980	/* Remove object from the active list */
1069	speed = 0;	981	speed = 0;
1070	update_ob_speed (this);	982	update_ob_speed (this);
1071		983
…		…
1076		988
1077	/*	989	/*
1078	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1079	* 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)).
1080	*/	992	*/
1081
1082	void	993	void
1083	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1084	{	995	{
1085	while (op != NULL)	996	while (op != NULL)
1086	{	997	{
1087	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1088	{
1089	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1090	}	1000
1091	op->carrying -= weight;	1001	op->carrying -= weight;
1092	op = op->env;	1002	op = op->env;
1093	}	1003	}
1094	}	1004	}
1095		1005
1096	/* remove_ob(op):	1006	/* op->remove ():
1097	* 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
1098	* 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
1099	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1100	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1101	* the previous environment.	1011	* the previous environment.
1102	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1103	*/	1013	*/
1104
1105	void	1014	void
1106	remove_ob (object *op)	1015	object::remove ()
1107	{	1016	{
		1017	object *tmp, *last = 0;
1108	object *	1018	object *otmp;
1109	tmp, *
1110	last = NULL;
1111	object *
1112	otmp;
1113		1019
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	1020	int check_walk_off;
1118	mapstruct *
1119	m;
1120		1021
1121	sint16
1122	x,
1123	y;
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1126	return;	1023	return;
1127		1024
1128	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
1129		1026
1130	if (op->more != NULL)	1027	if (more)
1131	remove_ob (op->more);	1028	more->remove ();
1132		1029
1133	/*	1030	/*
1134	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1135	* inventory.	1032	* inventory.
1136	*/	1033	*/
1137	if (op->env != NULL)	1034	if (env)
1138	{	1035	{
1139	if (op->nrof)	1036	if (nrof)
1140	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1141	else	1038	else
1142	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1143		1040
1144	/* 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
1145	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1146	* to save cpu time.	1043	* to save cpu time.
1147	*/	1044	*/
1148	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))
1149	fix_player (otmp);	1046	fix_player (otmp);
1150		1047
1151	if (op->above != NULL)	1048	if (above != NULL)
1152	op->above->below = op->below;	1049	above->below = below;
1153	else	1050	else
1154	op->env->inv = op->below;	1051	env->inv = below;
1155		1052
1156	if (op->below != NULL)	1053	if (below != NULL)
1157	op->below->above = op->above;	1054	below->above = above;
1158		1055
1159	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1160	* 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
1161	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1162	*/	1059	*/
1163	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1164	op->map = op->env->map;	1061	map = env->map;
1165	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1166	op->env = NULL;	1063	env = 0;
1167	}	1064	}
1168	else if (op->map)	1065	else if (map)
1169	{	1066	{
1170	x = op->x;
1171	y = op->y;
1172	m = get_map_from_coord (op->map, &x, &y);
1173
1174	if (!m)
1175	{
1176	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1177	op->map->path, op->x, op->y);
1178	/* in old days, we used to set x and y to 0 and continue.
1179	* it seems if we get into this case, something is probablye
1180	* screwed up and should be fixed.
1181	*/
1182	abort ();
1183	}
1184
1185	if (op->map != m)
1186	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1187	op->map->path, m->path, op->x, op->y, x, y);
1188
1189	/* 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
1190	* lots of logic for things we no longer care about	1068	* lots of logic for things we no longer care about
1191	*/	1069	*/
1192		1070
1193	/* link the object above us */	1071	/* link the object above us */
1194	if (op->above)	1072	if (above)
1195	op->above->below = op->below;	1073	above->below = below;
1196	else	1074	else
1197	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 */
1198		1076
1199	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1200	if (op->below)	1078	if (below)
1201	op->below->above = op->above;	1079	below->above = above;
1202	else	1080	else
1203	{	1081	{
1204	/* 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
1205	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1206	* evident	1084	* evident
1207	*/	1085	*/
1208	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1209	{	1087	{
1210	dump_object (op);	1088	char *dump = dump_object (this);
1211	LOG (llevError,	1089	LOG (llevError,
1212	"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);
1213	dump_object (GET_MAP_OB (m, x, y));	1092	dump = dump_object (GET_MAP_OB (map, x, y));
1214	LOG (llevError, "%s\n", errmsg);	1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1215	}	1095	}
1216		1096
1217	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1218	}	1098	}
1219		1099
1220	op->above = 0;	1100	above = 0;
1221	op->below = 0;	1101	below = 0;
1222		1102
1223	if (op->map->in_memory == MAP_SAVING)	1103	if (map->in_memory == MAP_SAVING)
1224	return;	1104	return;
1225		1105
1226	tag = op->count;
1227	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1228		1107
1229	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)
1230	{	1109	{
1231	/* 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
1232	* being removed.	1111	* being removed.
1233	*/	1112	*/
1234		1113
1235	if (tmp->type == PLAYER && tmp != op)	1114	if (tmp->type == PLAYER && tmp != this)
1236	{	1115	{
1237	/* If a container that the player is currently using somehow gets	1116	/* If a container that the player is currently using somehow gets
1238	* removed (most likely destroyed), update the player view	1117	* removed (most likely destroyed), update the player view
1239	* appropriately.	1118	* appropriately.
1240	*/	1119	*/
1241	if (tmp->container == op)	1120	if (tmp->container == this)
1242	{	1121	{
1243	CLEAR_FLAG (op, FLAG_APPLIED);	1122	CLEAR_FLAG (this, FLAG_APPLIED);
1244	tmp->container = NULL;	1123	tmp->container = 0;
1245	}	1124	}
1246		1125
1247	tmp->contr->socket.update_look = 1;	1126	tmp->contr->socket->floorbox_update ();
1248	}	1127	}
1249		1128
1250	/* See if player moving off should effect something */	1129	/* See if player moving off should effect something */
1251	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))
1252	{	1133	{
1253	move_apply (tmp, op, NULL);	1134	move_apply (tmp, this, 0);
1254		1135
1255	if (was_destroyed (op, tag))	1136	if (destroyed ())
1256	{
1257	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 ());
1258	}
1259	}	1138	}
1260		1139
1261	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1262		1141
1263	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1264	tmp->above = NULL;	1143	tmp->above = 0;
1265		1144
1266	last = tmp;	1145	last = tmp;
1267	}	1146	}
1268		1147
1269	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1270	if (last == NULL)	1149	if (!last)
1271	{	1150	{
1272	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1273	* 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
1274	* 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
1275	* be correct anyways.	1154	* be correct anyways.
1276	*/	1155	*/
1277	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1278	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1279	}	1158	}
1280	else	1159	else
1281	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1282		1161
1283	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1284	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
1285	}	1164	}
1286	}	1165	}
1287		1166
1288	/*	1167	/*
1289	* merge_ob(op,top):	1168	* merge_ob(op,top):
…		…
1304		1183
1305	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1306	{	1185	{
1307	if (top == op)	1186	if (top == op)
1308	continue;	1187	continue;
1309	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1310	{	1190	{
1311	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1312		1192
1313	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1314	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1315	remove_ob (op);	1195	op->destroy ();
1316	free_object (op);
1317	return top;	1196	return top;
1318	}	1197	}
1319	}	1198	}
1320		1199
1321	return NULL;	1200	return 0;
1322	}	1201	}
1323		1202
1324	/*	1203	/*
1325	* 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
1326	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1327	*/	1206	*/
1328	object *	1207	object *
1329	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)
1330	{	1209	{
1331	object *tmp;	1210	object *tmp;
1332		1211
1333	if (op->head)	1212	if (op->head)
1334	op = op->head;	1213	op = op->head;
…		…
1362	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1363	* just 'op' otherwise	1242	* just 'op' otherwise
1364	*/	1243	*/
1365		1244
1366	object *	1245	object *
1367	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)
1368	{	1247	{
1369	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1370	sint16 x, y;	1249	sint16 x, y;
1371		1250
1372	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1375	return NULL;	1254	return NULL;
1376	}	1255	}
1377		1256
1378	if (m == NULL)	1257	if (m == NULL)
1379	{	1258	{
1380	dump_object (op);	1259	char *dump = dump_object (op);
1381	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);
1382	return op;	1262	return op;
1383	}	1263	}
1384		1264
1385	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1386	{	1266	{
1387	dump_object (op);	1267	char *dump = dump_object (op);
1388	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);
1389	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1390	/* 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
1391	* 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
1392	* improperly inserted.	1272	* improperly inserted.
1393	*/	1273	*/
1394	abort ();	1274	abort ();
1395	#endif	1275	#endif
		1276	free (dump);
1396	return op;	1277	return op;
1397	}	1278	}
1398		1279
1399	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1400	{	1281	{
1401	dump_object (op);	1282	char *dump = dump_object (op);
1402	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);
1403	return op;	1285	return op;
1404	}	1286	}
1405		1287
1406	if (op->more != NULL)	1288	if (op->more != NULL)
1407	{	1289	{
…		…
1445		1327
1446	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1447	*/	1329	*/
1448	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1449	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)
1450	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1451	{	1333	{
1452	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1453	remove_ob (tmp);	1335	tmp->destroy ();
1454	free_object (tmp);
1455	}	1336	}
1456		1337
1457	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 */
1458	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1459		1340
…		…
1587	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1588	*/	1469	*/
1589	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1590	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)
1591	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1592	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1593		1474
1594	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1595	* 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
1596	* 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
1597	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1605		1486
1606	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1607	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1608		1489
1609	/* 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,
1610	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1611	*	1492	*
1612	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1613	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1614	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1615	* update_object().	1496	* update_object().
…		…
1645	tmp1;	1526	tmp1;
1646		1527
1647	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1648		1529
1649	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)
1650	{
1651	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1652	{	1532	tmp->destroy ();
1653	remove_ob (tmp);
1654	free_object (tmp);
1655	}
1656	}
1657		1533
1658	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1659		1535
1660	tmp1->x = op->x;	1536	tmp1->x = op->x;
1661	tmp1->y = op->y;	1537	tmp1->y = op->y;
1662	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1663	}	1539	}
…		…
1671	*/	1547	*/
1672		1548
1673	object *	1549	object *
1674	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1675	{	1551	{
1676	object *	1552	object *newob;
1677	newob;
1678	int
1679	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1680		1554
1681	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1682	{	1556	{
1683	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);
1684	return NULL;	1558	return NULL;
1685	}	1559	}
1686		1560
1687	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
1688		1562
1689	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1690	{	1564	orig_ob->destroy (1);
1691	if (!is_removed)
1692	remove_ob (orig_ob);
1693	free_object2 (orig_ob, 1);
1694	}
1695	else if (!is_removed)	1565	else if (!is_removed)
1696	{	1566	{
1697	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1698	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1699	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)
…		…
1729	if (i > op->nrof)	1599	if (i > op->nrof)
1730	i = op->nrof;	1600	i = op->nrof;
1731		1601
1732	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1733	op->nrof -= i;	1603	op->nrof -= i;
1734	else if (op->env != NULL)	1604	else if (op->env)
1735	{	1605	{
1736	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1737	* therein?	1607	* therein?
1738	*/	1608	*/
1739	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1740	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1741	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1742	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1743	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1744	* and then searching the map for a player.	1614	* and then searching the map for a player.
1745	*/	1615	*/
1746	if (!tmp)	1616	if (!tmp)
1747	{	1617	{
1748	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1749	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1750	break;	1622	break;
1751	if (pl)	1623	}
1752	tmp = pl->ob;
1753	else
1754	tmp = NULL;
1755	}	1624	}
1756		1625
1757	if (i < op->nrof)	1626	if (i < op->nrof)
1758	{	1627	{
1759	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1760	op->nrof -= i;	1629	op->nrof -= i;
1761	if (tmp)	1630	if (tmp)
1762	{
1763	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1764	}
1765	}	1632	}
1766	else	1633	else
1767	{	1634	{
1768	remove_ob (op);	1635	op->remove ();
1769	op->nrof = 0;	1636	op->nrof = 0;
1770	if (tmp)	1637	if (tmp)
1771	{
1772	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1773	}
1774	}	1639	}
1775	}	1640	}
1776	else	1641	else
1777	{	1642	{
1778	object *above = op->above;	1643	object *above = op->above;
1779		1644
1780	if (i < op->nrof)	1645	if (i < op->nrof)
1781	op->nrof -= i;	1646	op->nrof -= i;
1782	else	1647	else
1783	{	1648	{
1784	remove_ob (op);	1649	op->remove ();
1785	op->nrof = 0;	1650	op->nrof = 0;
1786	}	1651	}
1787		1652
1788	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1789	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1790	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1791	{	1656	{
1792	if (op->nrof)	1657	if (op->nrof)
1793	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1794	else	1659	else
…		…
1798		1663
1799	if (op->nrof)	1664	if (op->nrof)
1800	return op;	1665	return op;
1801	else	1666	else
1802	{	1667	{
1803	free_object (op);	1668	op->destroy ();
1804	return NULL;	1669	return 0;
1805	}	1670	}
1806	}	1671	}
1807		1672
1808	/*	1673	/*
1809	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1821	op->carrying += weight;	1686	op->carrying += weight;
1822	op = op->env;	1687	op = op->env;
1823	}	1688	}
1824	}	1689	}
1825		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
1826	/*	1711	/*
1827	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1828	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1829	* inside the object environment.	1714	* inside the object environment.
1830	*	1715	*
1831	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1832	* the inventory at the last position or next to other objects of the same
1833	* type.
1834	* Frank: Now sorted by type, archetype and magic!
1835	*
1836	* 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
1837	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1838	*/	1718	*/
1839		1719
1840	object *	1720	object *
1841	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1842	{	1722	{
1843	object *	1723	object *tmp, *otmp;
1844	tmp, *
1845	otmp;
1846		1724
1847	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1848	{	1726	op->remove ();
1849	dump_object (op);
1850	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1851	return op;
1852	}
1853
1854	if (where == NULL)
1855	{
1856	dump_object (op);
1857	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1858	return op;
1859	}
1860
1861	if (where->head)
1862	{
1863	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1864	where = where->head;
1865	}
1866		1727
1867	if (op->more)	1728	if (op->more)
1868	{	1729	{
1869	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);
1870	return op;	1731	return op;
…		…
1872		1733
1873	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1874	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1875	if (op->nrof)	1736	if (op->nrof)
1876	{	1737	{
1877	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1878	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1879	{	1740	{
1880	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1881	(client needs the original object) */	1742	(client needs the original object) */
1882	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1883	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1884	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1885	*/	1746	*/
1886	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1887	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1888	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1889	op = tmp;	1750	op = tmp;
1890	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1892	break;	1753	break;
1893	}	1754	}
1894		1755
1895	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1896	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1897	* (if it was possible to merge). calling remove_ob will subtract	1758	* (if it was possible to merge). calling remove_ob will subtract
1898	* 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
1899	* the linking below	1760	* the linking below
1900	*/	1761	*/
1901	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1902	}	1763	}
1903	else	1764	else
1904	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1905		1766
1906	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1907	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1908	{
1909	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1910	fix_player (otmp);	1770	fix_player (otmp);
1911	}
1912		1771
1913	op->map = NULL;	1772	op->map = 0;
1914	op->env = where;	1773	op->env = this;
1915	op->above = NULL;	1774	op->above = 0;
1916	op->below = NULL;	1775	op->below = 0;
1917	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1918		1777
1919	/* 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 */
1920	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1921	{	1780	{
1922	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1923	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);
1924	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1925	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1926	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1927	}	1786	}
1928		1787
1929	/* 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.
1930	* It sure simplifies this function...	1789	* It sure simplifies this function...
1931	*/	1790	*/
1932	if (where->inv == NULL)	1791	if (!inv)
1933	where->inv = op;	1792	inv = op;
1934	else	1793	else
1935	{	1794	{
1936	op->below = where->inv;	1795	op->below = inv;
1937	op->below->above = op;	1796	op->below->above = op;
1938	where->inv = op;	1797	inv = op;
1939	}	1798	}
		1799
1940	return op;	1800	return op;
1941	}	1801	}
1942		1802
1943	/*	1803	/*
1944	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1962	*/	1822	*/
1963		1823
1964	int	1824	int
1965	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1966	{	1826	{
1967	object *	1827	object *tmp;
1968	tmp;	1828	maptile *m = op->map;
1969	tag_t
1970	tag;
1971	mapstruct *
1972	m = op->map;
1973	int
1974	x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1975		1830
1976	MoveType	1831	MoveType move_on, move_slow, move_block;
1977	move_on,
1978	move_slow,
1979	move_block;
1980		1832
1981	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1982	return 0;	1834	return 0;
1983
1984	tag = op->count;
1985		1835
1986	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);
1987	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);
1988	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);
1989		1839
…		…
2050	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2051	((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))
2052	{	1902	{
2053	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
2054		1904
2055	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
2056	return 1;	1906	return 1;
2057		1907
2058	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
2059	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
2060	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2072	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2073	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2074	*/	1924	*/
2075		1925
2076	object *	1926	object *
2077	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2078	{	1928	{
2079	object *	1929	object *
2080	tmp;	1930	tmp;
2081		1931
2082	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2095	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2096	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2097	*/	1947	*/
2098		1948
2099	object *	1949	object *
2100	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2101	{	1951	{
2102	object *	1952	object *
2103	tmp;	1953	tmp;
2104		1954
2105	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2245	* 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
2246	* customized, changed states, etc.	2096	* customized, changed states, etc.
2247	*/	2097	*/
2248		2098
2249	int	2099	int
2250	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)
2251	{	2101	{
2252	int	2102	int
2253	i,	2103	i,
2254	index = 0, flag;	2104	index = 0, flag;
2255	static int	2105	static int
…		…
2267	* 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
2268	* 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
2269	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2270	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2271	*/	2121	*/
2272	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2273	stop = maxfree[i];	2123	stop = maxfree[i];
2274	}	2124	}
		2125
2275	if (!index)	2126	if (!index)
2276	return -1;	2127	return -1;
		2128
2277	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2278	}	2130	}
2279		2131
2280	/*	2132	/*
2281	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2282	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2283	* 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.
2284	* 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.
2285	*/	2137	*/
2286		2138
2287	int	2139	int
2288	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)
2289	{	2141	{
2290	int	2142	int
2291	i;	2143	i;
2292		2144
2293	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2357	* 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
2358	* there is capable of.	2210	* there is capable of.
2359	*/	2211	*/
2360		2212
2361	int	2213	int
2362	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2363	{	2215	{
2364	int	2216	int
2365	i,	2217	i,
2366	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2367		2219
2368	sint16 nx, ny;	2220	sint16 nx, ny;
2369	object *	2221	object *
2370	tmp;	2222	tmp;
2371	mapstruct *	2223	maptile *
2372	mp;	2224	mp;
2373		2225
2374	MoveType blocked, move_type;	2226	MoveType blocked, move_type;
2375		2227
2376	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
…		…
2584	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2585	*/	2437	*/
2586		2438
2587		2439
2588	int	2440	int
2589	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2590	{	2442	{
2591	sint16 dx, dy;	2443	sint16 dx, dy;
2592	int	2444	int
2593	mflags;	2445	mflags;
2594		2446
…		…
2643	* create clone from object to another	2495	* create clone from object to another
2644	*/	2496	*/
2645	object *	2497	object *
2646	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2647	{	2499	{
2648	object *
2649	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2650		2501
2651	if (!asrc)	2502	if (!asrc)
2652	return NULL;	2503	return 0;
		2504
2653	src = asrc;	2505	src = asrc;
2654	if (src->head)	2506	if (src->head)
2655	src = src->head;	2507	src = src->head;
2656		2508
2657	prev = NULL;	2509	prev = 0;
2658	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2659	{	2511	{
2660	tmp = get_object ();	2512	tmp = part->clone ();
2661	copy_object (part, tmp);
2662	tmp->x -= src->x;	2513	tmp->x -= src->x;
2663	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2664	if (!part->head)	2516	if (!part->head)
2665	{	2517	{
2666	dst = tmp;	2518	dst = tmp;
2667	tmp->head = NULL;	2519	tmp->head = 0;
2668	}	2520	}
2669	else	2521	else
2670	{	2522	{
2671	tmp->head = dst;	2523	tmp->head = dst;
2672	}	2524	}
		2525
2673	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2674	if (prev)	2528	if (prev)
2675	prev->more = tmp;	2529	prev->more = tmp;
		2530
2676	prev = tmp;	2531	prev = tmp;
2677	}	2532	}
2678		2533
2679	/*** copy inventory ***/
2680	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2681	{
2682	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2683	}
2684		2536
2685	return dst;	2537	return dst;
2686	}	2538	}
2687		2539
2688	/* return true if the object was destroyed, 0 otherwise */
2689	int
2690	was_destroyed (const object *op, tag_t old_tag)
2691	{
2692	/* checking for FLAG_FREED isn't necessary, but makes this function more
2693	* robust */
2694	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2695	}
2696
2697	/* GROS - Creates an object using a string representing its content. */	2540	/* GROS - Creates an object using a string representing its content. */
2698
2699	/* 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 */
2700
2701	/* 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, */
2702
2703	/* 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. */
2704
2705	/* 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. */
2706
2707	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2708		2546
2709	object *	2547	object *
2710	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2711	{	2549	{
2712	object *	2550	object *op;
2713	op;
2714	char
2715	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2716		2552
2717	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2718		2554
2719	FILE *
2720	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2721		2556
2722	if (tempfile == NULL)	2557	if (tempfile == NULL)
2723	{	2558	{
2724	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2725	return NULL;	2560	return NULL;
2726	}	2561	}
2727		2562
2728	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2729	fclose (tempfile);	2564	fclose (tempfile);
2730		2565
2731	op = get_object ();	2566	op = object::create ();
2732		2567
2733	object_thawer thawer (filename);	2568	object_thawer thawer (filename);
2734		2569
2735	if (thawer)	2570	if (thawer)
2736	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
…		…
2746	* returns NULL if no match.	2581	* returns NULL if no match.
2747	*/	2582	*/
2748	object *	2583	object *
2749	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)
2750	{	2585	{
2751	object *	2586	object *tmp;
2752	tmp;
2753		2587
2754	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2755	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2756	return tmp;	2590	return tmp;
2757		2591
…		…
2765	* do the desired thing.	2599	* do the desired thing.
2766	*/	2600	*/
2767	key_value *	2601	key_value *
2768	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2769	{	2603	{
2770	key_value *	2604	key_value *link;
2771	link;
2772		2605
2773	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2774	{
2775	if (link->key == key)	2607	if (link->key == key)
2776	{
2777	return link;	2608	return link;
2778	}
2779	}
2780		2609
2781	return NULL;	2610	return NULL;
2782	}	2611	}
2783		2612
2784	/*	2613	/*

Diff Legend

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