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.44 by root, Thu Sep 14 17:29:27 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	}
…		…
596		509
597	if (settings.casting_time)	510	if (settings.casting_time)
598	casting_time = -1;	511	casting_time = -1;
599	}	512	}
600		513
601	void object::clone (object *destination)
602	{
603	*(object_copy *)destination = *this;
604	*(object_pod *)destination = *this;
605
606	if (self || cb)
607	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
608	}
609
610	/*	514	/*
611	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
612	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
613	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
614	* 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,
615	* 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
616	* will point at garbage.	520	* will point at garbage.
617	*/	521	*/
618	void	522	void
619	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
620	{	524	{
621	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
622	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
623		527
624	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));
625		533
626	if (is_freed)	534	if (is_freed)
627	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
628	if (is_removed)	537	if (is_removed)
629	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
630		539
631	if (op2->speed < 0)	540	if (speed < 0)
632	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
633		542
634	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
635	if (op2->key_values)	544	if (key_values)
636	{	545	{
637	key_value *tail = 0;	546	key_value *tail = 0;
638	key_value *i;	547	key_value *i;
639		548
640	op->key_values = 0;	549	dst->key_values = 0;
641		550
642	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
643	{	552	{
644	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
645		554
646	new_link->next = 0;	555	new_link->next = 0;
647	new_link->key = i->key;	556	new_link->key = i->key;
648	new_link->value = i->value;	557	new_link->value = i->value;
649		558
650	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
651	if (!op->key_values)	560	if (!dst->key_values)
652	{	561	{
653	op->key_values = new_link;	562	dst->key_values = new_link;
654	tail = new_link;	563	tail = new_link;
655	}	564	}
656	else	565	else
657	{	566	{
658	tail->next = new_link;	567	tail->next = new_link;
659	tail = new_link;	568	tail = new_link;
660	}	569	}
661	}	570	}
662	}	571	}
663		572
664	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;
665	}	582	}
666		583
667	/*	584	/*
668	* 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
669	* 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
…		…
874	update_now = 1;	791	update_now = 1;
875		792
876	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
877	update_now = 1;	794	update_now = 1;
878	}	795	}
		796
879	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
880	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
881	* that is being removed.	799	* that is being removed.
882	*/	800	*/
883	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
895		813
896	if (op->more != NULL)	814	if (op->more != NULL)
897	update_object (op->more, action);	815	update_object (op->more, action);
898	}	816	}
899		817
900	static unordered_vector<object *> mortals;	818	object::vector object::mortals;
		819	object::vector object::objects; // not yet used
		820	object *object::first;
901		821
902	void object::free_mortals ()	822	void object::free_mortals ()
903	{	823	{
904	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
905	if ((*i)->refcnt)	825	if ((*i)->refcnt)
906	++i; // further delay freeing	826	++i; // further delay freeing
907	else	827	else
908	{	828	{
909	delete *i;	829	delete *i;
910	mortals.erase (i);	830	mortals.erase (i);
911	}	831	}
912
913	static int lastmortals = 0;//D
914
915	if (mortals.size() != lastmortals)//D
916	{
917	lastmortals = mortals.size ();//D
918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
919	}
920	}	832	}
921		833
922	object::object ()	834	object::object ()
923	{	835	{
924	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
…		…
936	{	848	{
937	count = ++ob_count;	849	count = ++ob_count;
938	uuid = gen_uuid ();	850	uuid = gen_uuid ();
939		851
940	prev = 0;	852	prev = 0;
941	next = objects;	853	next = object::first;
942		854
943	if (objects)	855	if (object::first)
944	objects->prev = this;	856	object::first->prev = this;
945		857
946	objects = this;	858	object::first = this;
947	}	859	}
948		860
949	void object::unlink ()	861	void object::unlink ()
950	{	862	{
951	//count = 0;//D
952	if (!prev && !next) return;//D
953
954	if (this == objects)	863	if (this == object::first)
955	objects = next;	864	object::first = next;
956		865
957	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
958	if (prev) prev->next = next;	867	if (prev) prev->next = next;
959	if (next) next->prev = prev;	868	if (next) next->prev = prev;
960		869
…		…
974	* 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
975	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
976	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
977	* this function to succeed.	886	* this function to succeed.
978	*	887	*
979	* 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
980	* inventory to the ground.	889	* inventory to the ground.
981	*/	890	*/
982	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
983	{	892	{
984	if (QUERY_FLAG (this, FLAG_FREED))	893	if (QUERY_FLAG (this, FLAG_FREED))
985	return;	894	return;
986		895
987	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
988	remove_friendly_object (this);	897	remove_friendly_object (this);
989		898
990	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
991	remove_ob (this);	900	remove ();
992		901
993	SET_FLAG (this, FLAG_FREED);	902	SET_FLAG (this, FLAG_FREED);
994		903
995	if (more)	904	if (more)
996	{	905	{
997	more->free (free_inventory);	906	more->destroy (destroy_inventory);
998	more = 0;	907	more = 0;
999	}	908	}
1000		909
1001	if (inv)	910	if (inv)
1002	{	911	{
1003	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
1004	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
1005	* drop on that space.	914	* drop on that space.
1006	*/	915	*/
1007	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)
1008	{	917	{
1009	object *op = inv;	918	object *op = inv;
1010		919
1011	while (op)	920	while (op)
1012	{	921	{
1013	object *tmp = op->below;	922	object *tmp = op->below;
1014	op->free (free_inventory);	923	op->destroy (destroy_inventory);
1015	op = tmp;	924	op = tmp;
1016	}	925	}
1017	}	926	}
1018	else	927	else
1019	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
…		…
1021		930
1022	while (op)	931	while (op)
1023	{	932	{
1024	object *tmp = op->below;	933	object *tmp = op->below;
1025		934
1026	remove_ob (op);	935	op->remove ();
1027		936
1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1029	|| 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))
1030	free_object (op);	939	op->destroy ();
1031	else	940	else
1032	{	941	{
1033	op->x = x;	942	op->x = x;
1034	op->y = y;	943	op->y = y;
1035	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 */
…		…
1038	op = tmp;	947	op = tmp;
1039	}	948	}
1040	}	949	}
1041	}	950	}
1042		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
1043	// clear those pointers that likely might have circular references to us	972	// clear those pointers that likely might have circular references to us
1044	owner = 0;	973	owner = 0;
1045	enemy = 0;	974	enemy = 0;
1046	attacked_by = 0;	975	attacked_by = 0;
1047		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
		979
1048	/* Remove object from the active list */	980	/* Remove object from the active list */
1049	speed = 0;	981	speed = 0;
1050	update_ob_speed (this);	982	update_ob_speed (this);
1051		983
1052	unlink ();	984	unlink ();
…		…
1056		988
1057	/*	989	/*
1058	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1059	* 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)).
1060	*/	992	*/
1061
1062	void	993	void
1063	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1064	{	995	{
1065	while (op != NULL)	996	while (op != NULL)
1066	{	997	{
1067	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1068	{
1069	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1070	}	1000
1071	op->carrying -= weight;	1001	op->carrying -= weight;
1072	op = op->env;	1002	op = op->env;
1073	}	1003	}
1074	}	1004	}
1075		1005
1076	/* remove_ob(op):	1006	/* op->remove ():
1077	* 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
1078	* 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
1079	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1080	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1081	* the previous environment.	1011	* the previous environment.
1082	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1083	*/	1013	*/
1084
1085	void	1014	void
1086	remove_ob (object *op)	1015	object::remove ()
1087	{	1016	{
		1017	object *tmp, *last = 0;
1088	object *	1018	object *otmp;
1089	tmp, *
1090	last = NULL;
1091	object *
1092	otmp;
1093		1019
1094	tag_t
1095	tag;
1096	int
1097	check_walk_off;	1020	int check_walk_off;
1098	mapstruct *
1099	m;
1100		1021
1101	sint16
1102	x,
1103	y;
1104
1105	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1106	return;	1023	return;
1107		1024
1108	SET_FLAG (op, FLAG_REMOVED);	1025	SET_FLAG (this, FLAG_REMOVED);
1109		1026
1110	if (op->more != NULL)	1027	if (more)
1111	remove_ob (op->more);	1028	more->remove ();
1112		1029
1113	/*	1030	/*
1114	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1115	* inventory.	1032	* inventory.
1116	*/	1033	*/
1117	if (op->env != NULL)	1034	if (env)
1118	{	1035	{
1119	if (op->nrof)	1036	if (nrof)
1120	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1121	else	1038	else
1122	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1123		1040
1124	/* 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
1125	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1126	* to save cpu time.	1043	* to save cpu time.
1127	*/	1044	*/
1128	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))
1129	fix_player (otmp);	1046	fix_player (otmp);
1130		1047
1131	if (op->above != NULL)	1048	if (above != NULL)
1132	op->above->below = op->below;	1049	above->below = below;
1133	else	1050	else
1134	op->env->inv = op->below;	1051	env->inv = below;
1135		1052
1136	if (op->below != NULL)	1053	if (below != NULL)
1137	op->below->above = op->above;	1054	below->above = above;
1138		1055
1139	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1140	* 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
1141	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1142	*/	1059	*/
1143	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1144	op->map = op->env->map;	1061	map = env->map;
1145	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1146	op->env = NULL;	1063	env = 0;
1147	}	1064	}
1148	else if (op->map)	1065	else if (map)
1149	{	1066	{
1150	x = op->x;
1151	y = op->y;
1152	m = get_map_from_coord (op->map, &x, &y);
1153
1154	if (!m)
1155	{
1156	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1157	op->map->path, op->x, op->y);
1158	/* in old days, we used to set x and y to 0 and continue.
1159	* it seems if we get into this case, something is probablye
1160	* screwed up and should be fixed.
1161	*/
1162	abort ();
1163	}
1164
1165	if (op->map != m)
1166	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1167	op->map->path, m->path, op->x, op->y, x, y);
1168
1169	/* 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
1170	* lots of logic for things we no longer care about	1068	* lots of logic for things we no longer care about
1171	*/	1069	*/
1172		1070
1173	/* link the object above us */	1071	/* link the object above us */
1174	if (op->above)	1072	if (above)
1175	op->above->below = op->below;	1073	above->below = below;
1176	else	1074	else
1177	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 */
1178		1076
1179	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1180	if (op->below)	1078	if (below)
1181	op->below->above = op->above;	1079	below->above = above;
1182	else	1080	else
1183	{	1081	{
1184	/* 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
1185	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1186	* evident	1084	* evident
1187	*/	1085	*/
1188	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1189	{	1087	{
1190	dump_object (op);	1088	char *dump = dump_object (this);
1191	LOG (llevError,	1089	LOG (llevError,
1192	"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);
1193	dump_object (GET_MAP_OB (m, x, y));	1092	dump = dump_object (GET_MAP_OB (map, x, y));
1194	LOG (llevError, "%s\n", errmsg);	1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1195	}	1095	}
1196		1096
1197	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1198	}	1098	}
1199		1099
1200	op->above = 0;	1100	above = 0;
1201	op->below = 0;	1101	below = 0;
1202		1102
1203	if (op->map->in_memory == MAP_SAVING)	1103	if (map->in_memory == MAP_SAVING)
1204	return;	1104	return;
1205		1105
1206	tag = op->count;
1207	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1208		1107
1209	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)
1210	{	1109	{
1211	/* 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
1212	* being removed.	1111	* being removed.
1213	*/	1112	*/
1214		1113
1215	if (tmp->type == PLAYER && tmp != op)	1114	if (tmp->type == PLAYER && tmp != this)
1216	{	1115	{
1217	/* If a container that the player is currently using somehow gets	1116	/* If a container that the player is currently using somehow gets
1218	* removed (most likely destroyed), update the player view	1117	* removed (most likely destroyed), update the player view
1219	* appropriately.	1118	* appropriately.
1220	*/	1119	*/
1221	if (tmp->container == op)	1120	if (tmp->container == this)
1222	{	1121	{
1223	CLEAR_FLAG (op, FLAG_APPLIED);	1122	CLEAR_FLAG (this, FLAG_APPLIED);
1224	tmp->container = NULL;	1123	tmp->container = 0;
1225	}	1124	}
1226		1125
1227	tmp->contr->socket.update_look = 1;	1126	tmp->contr->socket->floorbox_update ();
1228	}	1127	}
1229		1128
1230	/* See if player moving off should effect something */	1129	/* See if player moving off should effect something */
1231	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))
1232	{	1133	{
1233	move_apply (tmp, op, NULL);	1134	move_apply (tmp, this, 0);
1234		1135
1235	if (was_destroyed (op, tag))	1136	if (destroyed ())
1236	{
1237	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 ());
1238	}
1239	}	1138	}
1240		1139
1241	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1242		1141
1243	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1244	tmp->above = NULL;	1143	tmp->above = 0;
1245		1144
1246	last = tmp;	1145	last = tmp;
1247	}	1146	}
1248		1147
1249	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1250	if (last == NULL)	1149	if (!last)
1251	{	1150	{
1252	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1253	* 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
1254	* 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
1255	* be correct anyways.	1154	* be correct anyways.
1256	*/	1155	*/
1257	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1258	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1259	}	1158	}
1260	else	1159	else
1261	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1262		1161
1263	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1264	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
1265	}	1164	}
1266	}	1165	}
1267		1166
1268	/*	1167	/*
1269	* merge_ob(op,top):	1168	* merge_ob(op,top):
…		…
1284		1183
1285	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1286	{	1185	{
1287	if (top == op)	1186	if (top == op)
1288	continue;	1187	continue;
1289	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1290	{	1190	{
1291	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1292		1192
1293	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1294	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1295	remove_ob (op);	1195	op->destroy ();
1296	free_object (op);
1297	return top;	1196	return top;
1298	}	1197	}
1299	}	1198	}
1300		1199
1301	return NULL;	1200	return 0;
1302	}	1201	}
1303		1202
1304	/*	1203	/*
1305	* 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
1306	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1307	*/	1206	*/
1308	object *	1207	object *
1309	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)
1310	{	1209	{
1311	object *tmp;	1210	object *tmp;
1312		1211
1313	if (op->head)	1212	if (op->head)
1314	op = op->head;	1213	op = op->head;
…		…
1342	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1343	* just 'op' otherwise	1242	* just 'op' otherwise
1344	*/	1243	*/
1345		1244
1346	object *	1245	object *
1347	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)
1348	{	1247	{
1349	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1350	sint16 x, y;	1249	sint16 x, y;
1351		1250
1352	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1355	return NULL;	1254	return NULL;
1356	}	1255	}
1357		1256
1358	if (m == NULL)	1257	if (m == NULL)
1359	{	1258	{
1360	dump_object (op);	1259	char *dump = dump_object (op);
1361	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);
1362	return op;	1262	return op;
1363	}	1263	}
1364		1264
1365	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1366	{	1266	{
1367	dump_object (op);	1267	char *dump = dump_object (op);
1368	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);
1369	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1370	/* 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
1371	* 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
1372	* improperly inserted.	1272	* improperly inserted.
1373	*/	1273	*/
1374	abort ();	1274	abort ();
1375	#endif	1275	#endif
		1276	free (dump);
1376	return op;	1277	return op;
1377	}	1278	}
1378		1279
1379	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1380	{	1281	{
1381	dump_object (op);	1282	char *dump = dump_object (op);
1382	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);
1383	return op;	1285	return op;
1384	}	1286	}
1385		1287
1386	if (op->more != NULL)	1288	if (op->more != NULL)
1387	{	1289	{
…		…
1425		1327
1426	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1427	*/	1329	*/
1428	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1429	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)
1430	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1431	{	1333	{
1432	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1433	remove_ob (tmp);	1335	tmp->destroy ();
1434	free_object (tmp);
1435	}	1336	}
1436		1337
1437	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 */
1438	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1439		1340
…		…
1567	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1568	*/	1469	*/
1569	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1570	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)
1571	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1572	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1573		1474
1574	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1575	* 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
1576	* 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
1577	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1585		1486
1586	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1587	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1588		1489
1589	/* 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,
1590	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1591	*	1492	*
1592	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1593	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1594	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1595	* update_object().	1496	* update_object().
…		…
1625	tmp1;	1526	tmp1;
1626		1527
1627	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1628		1529
1629	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)
1630	{
1631	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1632	{	1532	tmp->destroy ();
1633	remove_ob (tmp);
1634	free_object (tmp);
1635	}
1636	}
1637		1533
1638	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1639		1535
1640	tmp1->x = op->x;	1536	tmp1->x = op->x;
1641	tmp1->y = op->y;	1537	tmp1->y = op->y;
1642	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1643	}	1539	}
…		…
1651	*/	1547	*/
1652		1548
1653	object *	1549	object *
1654	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1655	{	1551	{
1656	object *	1552	object *newob;
1657	newob;
1658	int
1659	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1660		1554
1661	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1662	{	1556	{
1663	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);
1664	return NULL;	1558	return NULL;
1665	}	1559	}
1666		1560
1667	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
1668		1562
1669	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1670	{	1564	orig_ob->destroy (1);
1671	if (!is_removed)
1672	remove_ob (orig_ob);
1673	free_object2 (orig_ob, 1);
1674	}
1675	else if (!is_removed)	1565	else if (!is_removed)
1676	{	1566	{
1677	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1678	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1679	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)
…		…
1709	if (i > op->nrof)	1599	if (i > op->nrof)
1710	i = op->nrof;	1600	i = op->nrof;
1711		1601
1712	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1713	op->nrof -= i;	1603	op->nrof -= i;
1714	else if (op->env != NULL)	1604	else if (op->env)
1715	{	1605	{
1716	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1717	* therein?	1607	* therein?
1718	*/	1608	*/
1719	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1720	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1721	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1722	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1723	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1724	* and then searching the map for a player.	1614	* and then searching the map for a player.
1725	*/	1615	*/
1726	if (!tmp)	1616	if (!tmp)
1727	{	1617	{
1728	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1729	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1730	break;	1622	break;
1731	if (pl)	1623	}
1732	tmp = pl->ob;
1733	else
1734	tmp = NULL;
1735	}	1624	}
1736		1625
1737	if (i < op->nrof)	1626	if (i < op->nrof)
1738	{	1627	{
1739	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1740	op->nrof -= i;	1629	op->nrof -= i;
1741	if (tmp)	1630	if (tmp)
1742	{
1743	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1744	}
1745	}	1632	}
1746	else	1633	else
1747	{	1634	{
1748	remove_ob (op);	1635	op->remove ();
1749	op->nrof = 0;	1636	op->nrof = 0;
1750	if (tmp)	1637	if (tmp)
1751	{
1752	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1753	}
1754	}	1639	}
1755	}	1640	}
1756	else	1641	else
1757	{	1642	{
1758	object *above = op->above;	1643	object *above = op->above;
1759		1644
1760	if (i < op->nrof)	1645	if (i < op->nrof)
1761	op->nrof -= i;	1646	op->nrof -= i;
1762	else	1647	else
1763	{	1648	{
1764	remove_ob (op);	1649	op->remove ();
1765	op->nrof = 0;	1650	op->nrof = 0;
1766	}	1651	}
1767		1652
1768	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1769	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1770	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1771	{	1656	{
1772	if (op->nrof)	1657	if (op->nrof)
1773	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1774	else	1659	else
…		…
1778		1663
1779	if (op->nrof)	1664	if (op->nrof)
1780	return op;	1665	return op;
1781	else	1666	else
1782	{	1667	{
1783	free_object (op);	1668	op->destroy ();
1784	return NULL;	1669	return 0;
1785	}	1670	}
1786	}	1671	}
1787		1672
1788	/*	1673	/*
1789	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1801	op->carrying += weight;	1686	op->carrying += weight;
1802	op = op->env;	1687	op = op->env;
1803	}	1688	}
1804	}	1689	}
1805		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
1806	/*	1711	/*
1807	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1808	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1809	* inside the object environment.	1714	* inside the object environment.
1810	*	1715	*
1811	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1812	* the inventory at the last position or next to other objects of the same
1813	* type.
1814	* Frank: Now sorted by type, archetype and magic!
1815	*
1816	* 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
1817	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1818	*/	1718	*/
1819		1719
1820	object *	1720	object *
1821	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1822	{	1722	{
1823	object *	1723	object *tmp, *otmp;
1824	tmp, *
1825	otmp;
1826		1724
1827	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1828	{	1726	op->remove ();
1829	dump_object (op);
1830	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1831	return op;
1832	}
1833
1834	if (where == NULL)
1835	{
1836	dump_object (op);
1837	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1838	return op;
1839	}
1840
1841	if (where->head)
1842	{
1843	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1844	where = where->head;
1845	}
1846		1727
1847	if (op->more)	1728	if (op->more)
1848	{	1729	{
1849	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);
1850	return op;	1731	return op;
…		…
1852		1733
1853	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1854	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1855	if (op->nrof)	1736	if (op->nrof)
1856	{	1737	{
1857	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1858	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1859	{	1740	{
1860	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1861	(client needs the original object) */	1742	(client needs the original object) */
1862	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1863	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1864	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1865	*/	1746	*/
1866	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1867	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1868	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1869	op = tmp;	1750	op = tmp;
1870	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1871	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1872	break;	1753	break;
1873	}	1754	}
1874		1755
1875	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1876	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1877	* (if it was possible to merge). calling remove_ob will subtract	1758	* (if it was possible to merge). calling remove_ob will subtract
1878	* 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
1879	* the linking below	1760	* the linking below
1880	*/	1761	*/
1881	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1882	}	1763	}
1883	else	1764	else
1884	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1885		1766
1886	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1887	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1888	{
1889	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1890	fix_player (otmp);	1770	fix_player (otmp);
1891	}
1892		1771
1893	op->map = NULL;	1772	op->map = 0;
1894	op->env = where;	1773	op->env = this;
1895	op->above = NULL;	1774	op->above = 0;
1896	op->below = NULL;	1775	op->below = 0;
1897	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1898		1777
1899	/* 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 */
1900	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1901	{	1780	{
1902	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1903	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);
1904	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1905	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1906	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1907	}	1786	}
1908		1787
1909	/* 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.
1910	* It sure simplifies this function...	1789	* It sure simplifies this function...
1911	*/	1790	*/
1912	if (where->inv == NULL)	1791	if (!inv)
1913	where->inv = op;	1792	inv = op;
1914	else	1793	else
1915	{	1794	{
1916	op->below = where->inv;	1795	op->below = inv;
1917	op->below->above = op;	1796	op->below->above = op;
1918	where->inv = op;	1797	inv = op;
1919	}	1798	}
		1799
1920	return op;	1800	return op;
1921	}	1801	}
1922		1802
1923	/*	1803	/*
1924	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1942	*/	1822	*/
1943		1823
1944	int	1824	int
1945	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1946	{	1826	{
1947	object *	1827	object *tmp;
1948	tmp;	1828	maptile *m = op->map;
1949	tag_t
1950	tag;
1951	mapstruct *
1952	m = op->map;
1953	int
1954	x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1955		1830
1956	MoveType	1831	MoveType move_on, move_slow, move_block;
1957	move_on,
1958	move_slow,
1959	move_block;
1960		1832
1961	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1962	return 0;	1834	return 0;
1963
1964	tag = op->count;
1965		1835
1966	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);
1967	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);
1968	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);
1969		1839
…		…
2030	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2031	((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))
2032	{	1902	{
2033	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
2034		1904
2035	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
2036	return 1;	1906	return 1;
2037		1907
2038	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
2039	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
2040	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2052	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2053	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2054	*/	1924	*/
2055		1925
2056	object *	1926	object *
2057	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2058	{	1928	{
2059	object *	1929	object *
2060	tmp;	1930	tmp;
2061		1931
2062	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2075	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2076	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2077	*/	1947	*/
2078		1948
2079	object *	1949	object *
2080	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2081	{	1951	{
2082	object *	1952	object *
2083	tmp;	1953	tmp;
2084		1954
2085	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2225	* 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
2226	* customized, changed states, etc.	2096	* customized, changed states, etc.
2227	*/	2097	*/
2228		2098
2229	int	2099	int
2230	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)
2231	{	2101	{
2232	int	2102	int
2233	i,	2103	i,
2234	index = 0, flag;	2104	index = 0, flag;
2235	static int	2105	static int
…		…
2247	* 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
2248	* 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
2249	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2250	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2251	*/	2121	*/
2252	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2253	stop = maxfree[i];	2123	stop = maxfree[i];
2254	}	2124	}
		2125
2255	if (!index)	2126	if (!index)
2256	return -1;	2127	return -1;
		2128
2257	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2258	}	2130	}
2259		2131
2260	/*	2132	/*
2261	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2262	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2263	* 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.
2264	* 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.
2265	*/	2137	*/
2266		2138
2267	int	2139	int
2268	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)
2269	{	2141	{
2270	int	2142	int
2271	i;	2143	i;
2272		2144
2273	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2337	* 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
2338	* there is capable of.	2210	* there is capable of.
2339	*/	2211	*/
2340		2212
2341	int	2213	int
2342	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2343	{	2215	{
2344	int	2216	int
2345	i,	2217	i,
2346	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2347		2219
2348	sint16 nx, ny;	2220	sint16 nx, ny;
2349	object *	2221	object *
2350	tmp;	2222	tmp;
2351	mapstruct *	2223	maptile *
2352	mp;	2224	mp;
2353		2225
2354	MoveType blocked, move_type;	2226	MoveType blocked, move_type;
2355		2227
2356	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
…		…
2564	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2565	*/	2437	*/
2566		2438
2567		2439
2568	int	2440	int
2569	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2570	{	2442	{
2571	sint16 dx, dy;	2443	sint16 dx, dy;
2572	int	2444	int
2573	mflags;	2445	mflags;
2574		2446
…		…
2623	* create clone from object to another	2495	* create clone from object to another
2624	*/	2496	*/
2625	object *	2497	object *
2626	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2627	{	2499	{
2628	object *
2629	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2630		2501
2631	if (!asrc)	2502	if (!asrc)
2632	return NULL;	2503	return 0;
		2504
2633	src = asrc;	2505	src = asrc;
2634	if (src->head)	2506	if (src->head)
2635	src = src->head;	2507	src = src->head;
2636		2508
2637	prev = NULL;	2509	prev = 0;
2638	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2639	{	2511	{
2640	tmp = get_object ();	2512	tmp = part->clone ();
2641	copy_object (part, tmp);
2642	tmp->x -= src->x;	2513	tmp->x -= src->x;
2643	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2644	if (!part->head)	2516	if (!part->head)
2645	{	2517	{
2646	dst = tmp;	2518	dst = tmp;
2647	tmp->head = NULL;	2519	tmp->head = 0;
2648	}	2520	}
2649	else	2521	else
2650	{	2522	{
2651	tmp->head = dst;	2523	tmp->head = dst;
2652	}	2524	}
		2525
2653	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2654	if (prev)	2528	if (prev)
2655	prev->more = tmp;	2529	prev->more = tmp;
		2530
2656	prev = tmp;	2531	prev = tmp;
2657	}	2532	}
2658		2533
2659	/*** copy inventory ***/
2660	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2661	{
2662	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2663	}
2664		2536
2665	return dst;	2537	return dst;
2666	}	2538	}
2667		2539
2668	/* return true if the object was destroyed, 0 otherwise */
2669	int
2670	was_destroyed (const object *op, tag_t old_tag)
2671	{
2672	/* checking for FLAG_FREED isn't necessary, but makes this function more
2673	* robust */
2674	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2675	}
2676
2677	/* GROS - Creates an object using a string representing its content. */	2540	/* GROS - Creates an object using a string representing its content. */
2678
2679	/* 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 */
2680
2681	/* 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, */
2682
2683	/* 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. */
2684
2685	/* 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. */
2686
2687	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2688		2546
2689	object *	2547	object *
2690	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2691	{	2549	{
2692	object *	2550	object *op;
2693	op;
2694	char
2695	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2696		2552
2697	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2698		2554
2699	FILE *
2700	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2701		2556
2702	if (tempfile == NULL)	2557	if (tempfile == NULL)
2703	{	2558	{
2704	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2705	return NULL;	2560	return NULL;
2706	}	2561	}
2707		2562
2708	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2709	fclose (tempfile);	2564	fclose (tempfile);
2710		2565
2711	op = get_object ();	2566	op = object::create ();
2712		2567
2713	object_thawer thawer (filename);	2568	object_thawer thawer (filename);
2714		2569
2715	if (thawer)	2570	if (thawer)
2716	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
…		…
2726	* returns NULL if no match.	2581	* returns NULL if no match.
2727	*/	2582	*/
2728	object *	2583	object *
2729	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)
2730	{	2585	{
2731	object *	2586	object *tmp;
2732	tmp;
2733		2587
2734	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2735	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2736	return tmp;	2590	return tmp;
2737		2591
…		…
2745	* do the desired thing.	2599	* do the desired thing.
2746	*/	2600	*/
2747	key_value *	2601	key_value *
2748	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2749	{	2603	{
2750	key_value *	2604	key_value *link;
2751	link;
2752		2605
2753	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2754	{
2755	if (link->key == key)	2607	if (link->key == key)
2756	{
2757	return link;	2608	return link;
2758	}
2759	}
2760		2609
2761	return NULL;	2610	return NULL;
2762	}	2611	}
2763		2612
2764	/*	2613	/*

Diff Legend

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