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.38 by root, Wed Sep 13 01:09:24 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 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;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
37		40
38	object *objects; /* Pointer to the list of used objects */
39	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 */
40		42
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	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,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	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
43	};	45	};
…		…
50	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	55	};
54		56
		57	static void
		58	write_uuid (void)
		59	{
		60	char filename1[MAX_BUF], filename2[MAX_BUF];
		61
		62	sprintf (filename1, "%s/uuid", settings.localdir);
		63	sprintf (filename2, "%s/uuid~", settings.localdir);
		64
		65	FILE *fp;
		66
		67	if (!(fp = fopen (filename2, "w")))
		68	{
		69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		70	return;
		71	}
		72
		73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		74	fclose (fp);
		75	rename (filename2, filename1);
		76	}
		77
		78	static void
		79	read_uuid (void)
		80	{
		81	char filename[MAX_BUF];
		82
		83	sprintf (filename, "%s/uuid", settings.localdir);
		84
		85	FILE *fp;
		86
		87	if (!(fp = fopen (filename, "r")))
		88	{
		89	if (errno == ENOENT)
		90	{
		91	LOG (llevInfo, "RESET uid to 1\n");
		92	uuid.seq = 0;
		93	write_uuid ();
		94	return;
		95	}
		96
		97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		98	_exit (1);
		99	}
		100
		101	int version;
		102	unsigned long long uid;
		103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		104	{
		105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		106	_exit (1);
		107	}
		108
		109	uuid.seq = uid;
		110	write_uuid ();
		111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		112	fclose (fp);
		113	}
		114
		115	UUID
		116	gen_uuid ()
		117	{
		118	UUID uid;
		119
		120	uid.seq = ++uuid.seq;
		121
		122	if (!(uuid.seq & (UUID_SKIP - 1)))
		123	write_uuid ();
		124
		125	return uid;
		126	}
		127
		128	void
		129	init_uuid ()
		130	{
		131	read_uuid ();
		132	}
		133
55	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56	static int	135	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	137	{
59	key_value *wants_field;	138	key_value *wants_field;
…		…
106	*	185	*
107	* 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
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
110	*	189	*
111	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
112	*	191	*
113	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
114	* check weight	193	* check weight
115	*/	194	*/
116		195
117	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	197	{
119	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
120	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)
121	return 0;	204	return 0;
122		205
123	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* 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
127	* 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
128	* used to store nrof).	209	* used to store nrof).
129	*/	210	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
141		222
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		225
145		226
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
147	* being locked in inventory should prevent merging.	228	|| ob1->arch != ob2->arch
148	* 0x4 in flags3 is CLIENT_SENT
149	*/
150	if ((ob1->arch != ob2->arch) ||
151	(ob1->flags[0] != ob2->flags[0]) ||
152	(ob1->flags[1] != ob2->flags[1]) ||
153	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
175	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
176	return 0;	252	return 0;
177		253
178	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	255	* check all objects in the inventory.
180	*/	256	*/
…		…
183	/* if one object has inventory but the other doesn't, not equiv */	259	/* if one object has inventory but the other doesn't, not equiv */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	261	return 0;
186		262
187	/* Now check to see if the two inventory objects could merge */	263	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	265	return 0;
190		266
191	/* inventory ok - still need to check rest of this object to see	267	/* inventory ok - still need to check rest of this object to see
192	* if it is valid.	268	* if it is valid.
193	*/	269	*/
…		…
297	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	373	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
298	* Some error messages.	374	* Some error messages.
299	* The result of the dump is stored in the static global errmsg array.	375	* The result of the dump is stored in the static global errmsg array.
300	*/	376	*/
301		377
302	void	378	char *
303	dump_object2 (object *op)
304	{
305	errmsg[0] = 0;
306	return;
307	//TODO//D#d#
308	#if 0
309	char *cp;
310
311	/* object *tmp;*/
312
313	if (op->arch != NULL)
314	{
315	strcat (errmsg, "arch ");
316	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
317	strcat (errmsg, "\n");
318	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
319	strcat (errmsg, cp);
320	# if 0
321	/* Don't dump player diffs - they are too long, mostly meaningless, and
322	* will overflow the buffer.
323	* Changed so that we don't dump inventory either. This may
324	* also overflow the buffer.
325	*/
326	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
327	strcat (errmsg, cp);
328	for (tmp = op->inv; tmp; tmp = tmp->below)
329	dump_object2 (tmp);
330	# endif
331	strcat (errmsg, "end\n");
332	}
333	else
334	{
335	strcat (errmsg, "Object ");
336	if (op->name == NULL)
337	strcat (errmsg, "(null)");
338	else
339	strcat (errmsg, op->name);
340	strcat (errmsg, "\n");
341	# if 0
342	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
343	strcat (errmsg, cp);
344	for (tmp = op->inv; tmp; tmp = tmp->below)
345	dump_object2 (tmp);
346	# endif
347	strcat (errmsg, "end\n");
348	}
349	#endif
350	}
351
352	/*
353	* Dumps an object. Returns output in the static global errmsg array.
354	*/
355
356	void
357	dump_object (object *op)	379	dump_object (object *op)
358	{	380	{
359	if (op == NULL)	381	if (!op)
360	{	382	return strdup ("[NULLOBJ]");
361	strcpy (errmsg, "[NULL pointer]");
362	return;
363	}
364	errmsg[0] = '\0';
365	dump_object2 (op);
366	}
367		383
368	void	384	object_freezer freezer;
369	dump_all_objects (void)	385	save_object (freezer, op, 3);
370	{	386	return freezer.as_string ();
371	object *op;
372
373	for (op = objects; op != NULL; op = op->next)
374	{
375	dump_object (op);
376	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
377	}
378	}	387	}
379		388
380	/*	389	/*
381	* get_nearest_part(multi-object, object 2) returns the part of the	390	* get_nearest_part(multi-object, object 2) returns the part of the
382	* multi-object 1 which is closest to the second object.	391	* multi-object 1 which is closest to the second object.
…		…
402	*/	411	*/
403		412
404	object *	413	object *
405	find_object (tag_t i)	414	find_object (tag_t i)
406	{	415	{
407	object *op;	416	for (object *op = object::first; op; op = op->next)
408
409	for (op = objects; op != NULL; op = op->next)
410	if (op->count == i)	417	if (op->count == i)
411	break;	418	return op;
		419
412	return op;	420	return 0;
413	}	421	}
414		422
415	/*	423	/*
416	* Returns the first object which has a name equal to the argument.	424	* Returns the first object which has a name equal to the argument.
417	* Used only by the patch command, but not all that useful.	425	* Used only by the patch command, but not all that useful.
…		…
422	find_object_name (const char *str)	430	find_object_name (const char *str)
423	{	431	{
424	shstr_cmp str_ (str);	432	shstr_cmp str_ (str);
425	object *op;	433	object *op;
426		434
427	for (op = objects; op != NULL; op = op->next)	435	for (op = object::first; op != NULL; op = op->next)
428	if (op->name == str_)	436	if (op->name == str_)
429	break;	437	break;
430		438
431	return op;	439	return op;
432	}	440	}
433		441
434	void	442	void
435	free_all_object_data ()	443	free_all_object_data ()
436	{	444	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	445	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}
439
440	/*
441	* Returns the object which this object marks as being the owner.
442	* A id-scheme is used to avoid pointing to objects which have been
443	* freed and are now reused. If this is detected, the owner is
444	* set to NULL, and NULL is returned.
445	* Changed 2004-02-12 - if the player is setting at the play again
446	* prompt, he is removed, and we don't want to treat him as an owner of
447	* anything, so check removed flag. I don't expect that this should break
448	* anything - once an object is removed, it is basically dead anyways.
449	*/
450	object *
451	object::get_owner ()
452	{
453	if (!owner
454	|| QUERY_FLAG (owner, FLAG_FREED)
455	|| QUERY_FLAG (owner, FLAG_REMOVED))
456	owner = 0;
457
458	return owner;
459	}	446	}
460		447
461	/*	448	/*
462	* Sets the owner and sets the skill and exp pointers to owner's current	449	* Sets the owner and sets the skill and exp pointers to owner's current
463	* skill and experience objects.	450	* skill and experience objects.
…		…
533		520
534	/* What is not cleared is next, prev, and count */	521	/* What is not cleared is next, prev, and count */
535		522
536	expmul = 1.0;	523	expmul = 1.0;
537	face = blank_face;	524	face = blank_face;
538	attacked_by_count = -1;
539		525
540	if (settings.casting_time)	526	if (settings.casting_time)
541	casting_time = -1;	527	casting_time = -1;
542	}	528	}
543		529
544	void object::clone (object *destination)
545	{
546	*(object_copy *)destination = *this;
547	*(object_pod *)destination = *this;
548
549	if (self || cb)
550	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
551	}
552
553	/*	530	/*
554	* copy object first frees everything allocated by the second object,	531	* copy_to first frees everything allocated by the dst object,
555	* and then copies the contends of the first object into the second	532	* and then copies the contents of itself into the second
556	* object, allocating what needs to be allocated. Basically, any	533	* object, allocating what needs to be allocated. Basically, any
557	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	534	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
558	* if the first object is freed, the pointers in the new object	535	* if the first object is freed, the pointers in the new object
559	* will point at garbage.	536	* will point at garbage.
560	*/	537	*/
561	void	538	void
562	copy_object (object *op2, object *op)	539	object::copy_to (object *dst)
563	{	540	{
564	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	541	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
565	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	542	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
566		543
567	op2->clone (op);	544	*(object_copy *)dst = *this;
		545	*(object_pod *)dst = *this;
		546
		547	if (self || cb)
		548	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
568		549
569	if (is_freed)	550	if (is_freed)
570	SET_FLAG (op, FLAG_FREED);	551	SET_FLAG (dst, FLAG_FREED);
		552
571	if (is_removed)	553	if (is_removed)
572	SET_FLAG (op, FLAG_REMOVED);	554	SET_FLAG (dst, FLAG_REMOVED);
573		555
574	if (op2->speed < 0)	556	if (speed < 0)
575	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	557	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
576		558
577	/* Copy over key_values, if any. */	559	/* Copy over key_values, if any. */
578	if (op2->key_values)	560	if (key_values)
579	{	561	{
580	key_value *tail = 0;	562	key_value *tail = 0;
581	key_value *i;	563	key_value *i;
582		564
583	op->key_values = 0;	565	dst->key_values = 0;
584		566
585	for (i = op2->key_values; i; i = i->next)	567	for (i = key_values; i; i = i->next)
586	{	568	{
587	key_value *new_link = new key_value;	569	key_value *new_link = new key_value;
588		570
589	new_link->next = 0;	571	new_link->next = 0;
590	new_link->key = i->key;	572	new_link->key = i->key;
591	new_link->value = i->value;	573	new_link->value = i->value;
592		574
593	/* Try and be clever here, too. */	575	/* Try and be clever here, too. */
594	if (!op->key_values)	576	if (!dst->key_values)
595	{	577	{
596	op->key_values = new_link;	578	dst->key_values = new_link;
597	tail = new_link;	579	tail = new_link;
598	}	580	}
599	else	581	else
600	{	582	{
601	tail->next = new_link;	583	tail->next = new_link;
602	tail = new_link;	584	tail = new_link;
603	}	585	}
604	}	586	}
605	}	587	}
606		588
607	update_ob_speed (op);	589	update_ob_speed (dst);
		590	}
		591
		592	object *
		593	object::clone ()
		594	{
		595	object *neu = create ();
		596	copy_to (neu);
		597	return neu;
608	}	598	}
609		599
610	/*	600	/*
611	* If an object with the IS_TURNABLE() flag needs to be turned due	601	* If an object with the IS_TURNABLE() flag needs to be turned due
612	* to the closest player being on the other side, this function can	602	* to the closest player being on the other side, this function can
…		…
817	update_now = 1;	807	update_now = 1;
818		808
819	if ((move_slow | op->move_slow) != move_slow)	809	if ((move_slow | op->move_slow) != move_slow)
820	update_now = 1;	810	update_now = 1;
821	}	811	}
		812
822	/* if the object is being removed, we can't make intelligent	813	/* if the object is being removed, we can't make intelligent
823	* decisions, because remove_ob can't really pass the object	814	* decisions, because remove_ob can't really pass the object
824	* that is being removed.	815	* that is being removed.
825	*/	816	*/
826	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	817	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
…		…
838		829
839	if (op->more != NULL)	830	if (op->more != NULL)
840	update_object (op->more, action);	831	update_object (op->more, action);
841	}	832	}
842		833
843	static unordered_vector<object *> mortals;	834	object::vector object::mortals;
844	static std::vector<object *, slice_allocator <object *> > freed;	835	object::vector object::objects; // not yet used
		836	object *object::first;
845		837
846	void object::free_mortals ()	838	void object::free_mortals ()
847	{	839	{
848	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)	840	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
849	if ((*i)->refcnt)	841	if ((*i)->refcnt)
850	++i; // further delay freeing	842	++i; // further delay freeing
851	else	843	else
852	{	844	{
853	freed.push_back (*i);//D
854	//delete *i;	845	delete *i;
855	mortals.erase (i);	846	mortals.erase (i);
856	}	847	}
857
858	if (mortals.size() && 0)//D
859	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
860	}	848	}
861		849
862	object::object ()	850	object::object ()
863	{	851	{
864	SET_FLAG (this, FLAG_REMOVED);	852	SET_FLAG (this, FLAG_REMOVED);
865		853
866	expmul = 1.0;	854	expmul = 1.0;
867	face = blank_face;	855	face = blank_face;
868	attacked_by_count = -1;
869	}	856	}
870		857
871	object::~object ()	858	object::~object ()
872	{	859	{
873	free_key_values (this);	860	free_key_values (this);
874	}	861	}
875		862
876	void object::link ()	863	void object::link ()
877	{	864	{
878	count = ++ob_count;	865	count = ++ob_count;
		866	uuid = gen_uuid ();
879		867
880	prev = 0;	868	prev = 0;
881	next = objects;	869	next = object::first;
882		870
883	if (objects)	871	if (object::first)
884	objects->prev = this;	872	object::first->prev = this;
885		873
886	objects = this;	874	object::first = this;
887	}	875	}
888		876
889	void object::unlink ()	877	void object::unlink ()
890	{	878	{
891	count = 0;
892
893	if (this == objects)	879	if (this == object::first)
894	objects = next;	880	object::first = next;
895		881
896	/* Remove this object from the list of used objects */	882	/* Remove this object from the list of used objects */
897	if (prev)
898	{
899	prev->next = next;	883	if (prev) prev->next = next;
		884	if (next) next->prev = prev;
		885
900	prev = 0;	886	prev = 0;
901	}
902
903	if (next)
904	{
905	next->prev = prev;
906	next = 0;	887	next = 0;
907	}
908	}	888	}
909		889
910	object *object::create ()	890	object *object::create ()
911	{	891	{
912	object *op;
913
914	if (freed.empty ())
915	op = new object;	892	object *op = new object;
916	else
917	{
918	// highly annoying, but the only way to get it stable right now
919	op = freed.back ();
920	freed.pop_back ();
921	op->~object ();
922	new ((void *) op) object;
923	}
924
925	op->link ();	893	op->link ();
926	return op;	894	return op;
927	}	895	}
928		896
929	/*	897	/*
…		…
931	* it from the list of used objects, and puts it on the list of	899	* it from the list of used objects, and puts it on the list of
932	* free objects. The IS_FREED() flag is set in the object.	900	* free objects. The IS_FREED() flag is set in the object.
933	* The object must have been removed by remove_ob() first for	901	* The object must have been removed by remove_ob() first for
934	* this function to succeed.	902	* this function to succeed.
935	*	903	*
936	* If free_inventory is set, free inventory as well. Else drop items in	904	* If destroy_inventory is set, free inventory as well. Else drop items in
937	* inventory to the ground.	905	* inventory to the ground.
938	*/	906	*/
939	void object::free (bool free_inventory)	907	void object::destroy (bool destroy_inventory)
940	{	908	{
941	if (QUERY_FLAG (this, FLAG_FREED))	909	if (QUERY_FLAG (this, FLAG_FREED))
942	return;	910	return;
943		911
944	if (QUERY_FLAG (this, FLAG_FRIENDLY))	912	if (QUERY_FLAG (this, FLAG_FRIENDLY))
945	remove_friendly_object (this);	913	remove_friendly_object (this);
946		914
947	if (!QUERY_FLAG (this, FLAG_REMOVED))	915	if (!QUERY_FLAG (this, FLAG_REMOVED))
948	remove_ob (this);	916	remove ();
949		917
950	SET_FLAG (this, FLAG_FREED);	918	SET_FLAG (this, FLAG_FREED);
951		919
952	if (more)	920	if (more)
953	{	921	{
954	more->free (free_inventory);	922	more->destroy (destroy_inventory);
955	more = 0;	923	more = 0;
956	}	924	}
957		925
958	if (inv)	926	if (inv)
959	{	927	{
960	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
961	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
962	* drop on that space.	930	* drop on that space.
963	*/	931	*/
964	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	932	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
965	{	933	{
966	object *op = inv;	934	object *op = inv;
967		935
968	while (op)	936	while (op)
969	{	937	{
970	object *tmp = op->below;	938	object *tmp = op->below;
971	op->free (free_inventory);	939	op->destroy (destroy_inventory);
972	op = tmp;	940	op = tmp;
973	}	941	}
974	}	942	}
975	else	943	else
976	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
…		…
978		946
979	while (op)	947	while (op)
980	{	948	{
981	object *tmp = op->below;	949	object *tmp = op->below;
982		950
983	remove_ob (op);	951	op->remove ();
984		952
985	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	953	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
986	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	954	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
987	free_object (op);	955	op->destroy ();
988	else	956	else
989	{	957	{
990	op->x = x;	958	op->x = x;
991	op->y = y;	959	op->y = y;
992	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	960	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
995	op = tmp;	963	op = tmp;
996	}	964	}
997	}	965	}
998	}	966	}
999		967
		968	// hack to ensure that freed objects still have a valid map
		969	{
		970	static maptile *freed_map; // freed objects are moved here to avoid crashes
		971
		972	if (!freed_map)
		973	{
		974	freed_map = new maptile;
		975
		976	freed_map->name = "/internal/freed_objects_map";
		977	freed_map->width = 3;
		978	freed_map->height = 3;
		979
		980	freed_map->allocate ();
		981	}
		982
		983	map = freed_map;
		984	x = 1;
		985	y = 1;
		986	}
		987
		988	// clear those pointers that likely might have circular references to us
1000	owner = 0;	989	owner = 0;
		990	enemy = 0;
		991	attacked_by = 0;
		992
		993	// only relevant for players(?), but make sure of it anyways
		994	contr = 0;
1001		995
1002	/* Remove object from the active list */	996	/* Remove object from the active list */
1003	speed = 0;	997	speed = 0;
1004	update_ob_speed (this);	998	update_ob_speed (this);
1005		999
…		…
1010		1004
1011	/*	1005	/*
1012	* sub_weight() recursively (outwards) subtracts a number from the	1006	* sub_weight() recursively (outwards) subtracts a number from the
1013	* weight of an object (and what is carried by it's environment(s)).	1007	* weight of an object (and what is carried by it's environment(s)).
1014	*/	1008	*/
1015
1016	void	1009	void
1017	sub_weight (object *op, signed long weight)	1010	sub_weight (object *op, signed long weight)
1018	{	1011	{
1019	while (op != NULL)	1012	while (op != NULL)
1020	{	1013	{
1021	if (op->type == CONTAINER)	1014	if (op->type == CONTAINER)
1022	{
1023	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1015	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1024	}	1016
1025	op->carrying -= weight;	1017	op->carrying -= weight;
1026	op = op->env;	1018	op = op->env;
1027	}	1019	}
1028	}	1020	}
1029		1021
1030	/* remove_ob(op):	1022	/* op->remove ():
1031	* This function removes the object op from the linked list of objects	1023	* This function removes the object op from the linked list of objects
1032	* which it is currently tied to. When this function is done, the	1024	* which it is currently tied to. When this function is done, the
1033	* object will have no environment. If the object previously had an	1025	* object will have no environment. If the object previously had an
1034	* environment, the x and y coordinates will be updated to	1026	* environment, the x and y coordinates will be updated to
1035	* the previous environment.	1027	* the previous environment.
1036	* Beware: This function is called from the editor as well!	1028	* Beware: This function is called from the editor as well!
1037	*/	1029	*/
1038
1039	void	1030	void
1040	remove_ob (object *op)	1031	object::remove ()
1041	{	1032	{
		1033	object *tmp, *last = 0;
1042	object *	1034	object *otmp;
1043	tmp, *
1044	last = NULL;
1045	object *
1046	otmp;
1047		1035
1048	tag_t
1049	tag;
1050	int
1051	check_walk_off;	1036	int check_walk_off;
1052	mapstruct *
1053	m;
1054		1037
1055	sint16
1056	x,
1057	y;
1058
1059	if (QUERY_FLAG (op, FLAG_REMOVED))	1038	if (QUERY_FLAG (this, FLAG_REMOVED))
1060	return;	1039	return;
1061		1040
1062	SET_FLAG (op, FLAG_REMOVED);	1041	SET_FLAG (this, FLAG_REMOVED);
1063		1042
1064	if (op->more != NULL)	1043	if (more)
1065	remove_ob (op->more);	1044	more->remove ();
1066		1045
1067	/*	1046	/*
1068	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
1069	* inventory.	1048	* inventory.
1070	*/	1049	*/
1071	if (op->env != NULL)	1050	if (env)
1072	{	1051	{
1073	if (op->nrof)	1052	if (nrof)
1074	sub_weight (op->env, op->weight * op->nrof);	1053	sub_weight (env, weight * nrof);
1075	else	1054	else
1076	sub_weight (op->env, op->weight + op->carrying);	1055	sub_weight (env, weight + carrying);
1077		1056
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1057	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1058	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1059	* to save cpu time.
1081	*/	1060	*/
1082	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1061	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1083	fix_player (otmp);	1062	fix_player (otmp);
1084		1063
1085	if (op->above != NULL)	1064	if (above != NULL)
1086	op->above->below = op->below;	1065	above->below = below;
1087	else	1066	else
1088	op->env->inv = op->below;	1067	env->inv = below;
1089		1068
1090	if (op->below != NULL)	1069	if (below != NULL)
1091	op->below->above = op->above;	1070	below->above = above;
1092		1071
1093	/* we set up values so that it could be inserted into	1072	/* we set up values so that it could be inserted into
1094	* the map, but we don't actually do that - it is up	1073	* the map, but we don't actually do that - it is up
1095	* to the caller to decide what we want to do.	1074	* to the caller to decide what we want to do.
1096	*/	1075	*/
1097	op->x = op->env->x, op->y = op->env->y;	1076	x = env->x, y = env->y;
1098	op->map = op->env->map;	1077	map = env->map;
1099	op->above = NULL, op->below = NULL;	1078	above = 0, below = 0;
1100	op->env = NULL;	1079	env = 0;
1101	}	1080	}
1102	else if (op->map)	1081	else if (map)
1103	{	1082	{
1104	x = op->x;
1105	y = op->y;
1106	m = get_map_from_coord (op->map, &x, &y);
1107
1108	if (!m)
1109	{
1110	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1111	op->map->path, op->x, op->y);
1112	/* in old days, we used to set x and y to 0 and continue.
1113	* it seems if we get into this case, something is probablye
1114	* screwed up and should be fixed.
1115	*/
1116	abort ();
1117	}
1118
1119	if (op->map != m)
1120	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1121	op->map->path, m->path, op->x, op->y, x, y);
1122
1123	/* Re did the following section of code - it looks like it had	1083	/* Re did the following section of code - it looks like it had
1124	* lots of logic for things we no longer care about	1084	* lots of logic for things we no longer care about
1125	*/	1085	*/
1126		1086
1127	/* link the object above us */	1087	/* link the object above us */
1128	if (op->above)	1088	if (above)
1129	op->above->below = op->below;	1089	above->below = below;
1130	else	1090	else
1131	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1091	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1132		1092
1133	/* Relink the object below us, if there is one */	1093	/* Relink the object below us, if there is one */
1134	if (op->below)	1094	if (below)
1135	op->below->above = op->above;	1095	below->above = above;
1136	else	1096	else
1137	{	1097	{
1138	/* Nothing below, which means we need to relink map object for this space	1098	/* Nothing below, which means we need to relink map object for this space
1139	* use translated coordinates in case some oddness with map tiling is	1099	* use translated coordinates in case some oddness with map tiling is
1140	* evident	1100	* evident
1141	*/	1101	*/
1142	if (GET_MAP_OB (m, x, y) != op)	1102	if (GET_MAP_OB (map, x, y) != this)
1143	{	1103	{
1144	dump_object (op);	1104	char *dump = dump_object (this);
1145	LOG (llevError,	1105	LOG (llevError,
1146	"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);	1106	"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);
		1107	free (dump);
1147	dump_object (GET_MAP_OB (m, x, y));	1108	dump = dump_object (GET_MAP_OB (map, x, y));
1148	LOG (llevError, "%s\n", errmsg);	1109	LOG (llevError, "%s\n", dump);
		1110	free (dump);
1149	}	1111	}
1150		1112
1151	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1113	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1152	}	1114	}
1153		1115
1154	op->above = 0;	1116	above = 0;
1155	op->below = 0;	1117	below = 0;
1156		1118
1157	if (op->map->in_memory == MAP_SAVING)	1119	if (map->in_memory == MAP_SAVING)
1158	return;	1120	return;
1159		1121
1160	tag = op->count;
1161	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1122	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1162		1123
1163	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1124	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1164	{	1125	{
1165	/* No point updating the players look faces if he is the object	1126	/* No point updating the players look faces if he is the object
1166	* being removed.	1127	* being removed.
1167	*/	1128	*/
1168		1129
1169	if (tmp->type == PLAYER && tmp != op)	1130	if (tmp->type == PLAYER && tmp != this)
1170	{	1131	{
1171	/* If a container that the player is currently using somehow gets	1132	/* If a container that the player is currently using somehow gets
1172	* removed (most likely destroyed), update the player view	1133	* removed (most likely destroyed), update the player view
1173	* appropriately.	1134	* appropriately.
1174	*/	1135	*/
1175	if (tmp->container == op)	1136	if (tmp->container == this)
1176	{	1137	{
1177	CLEAR_FLAG (op, FLAG_APPLIED);	1138	CLEAR_FLAG (this, FLAG_APPLIED);
1178	tmp->container = NULL;	1139	tmp->container = 0;
1179	}	1140	}
1180		1141
1181	tmp->contr->socket.update_look = 1;	1142	tmp->contr->socket->update_look = 1;
1182	}	1143	}
1183		1144
1184	/* See if player moving off should effect something */	1145	/* See if player moving off should effect something */
1185	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1146	if (check_walk_off
		1147	&& ((move_type & tmp->move_off)
		1148	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1186	{	1149	{
1187	move_apply (tmp, op, NULL);	1150	move_apply (tmp, this, 0);
1188		1151
1189	if (was_destroyed (op, tag))	1152	if (destroyed ())
1190	{
1191	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1153	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1192	}
1193	}	1154	}
1194		1155
1195	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1156	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1196		1157
1197	if (tmp->above == tmp)	1158	if (tmp->above == tmp)
1198	tmp->above = NULL;	1159	tmp->above = 0;
1199		1160
1200	last = tmp;	1161	last = tmp;
1201	}	1162	}
1202		1163
1203	/* last == NULL of there are no objects on this space */	1164	/* last == NULL of there are no objects on this space */
1204	if (last == NULL)	1165	if (!last)
1205	{	1166	{
1206	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1167	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1207	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1168	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1208	* those out anyways, and if there are any flags set right now, they won't	1169	* those out anyways, and if there are any flags set right now, they won't
1209	* be correct anyways.	1170	* be correct anyways.
1210	*/	1171	*/
1211	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1172	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1212	update_position (op->map, op->x, op->y);	1173	update_position (map, x, y);
1213	}	1174	}
1214	else	1175	else
1215	update_object (last, UP_OBJ_REMOVE);	1176	update_object (last, UP_OBJ_REMOVE);
1216		1177
1217	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1178	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1218	update_all_los (op->map, op->x, op->y);	1179	update_all_los (map, x, y);
1219	}	1180	}
1220	}	1181	}
1221		1182
1222	/*	1183	/*
1223	* merge_ob(op,top):	1184	* merge_ob(op,top):
…		…
1238		1199
1239	for (; top != NULL; top = top->below)	1200	for (; top != NULL; top = top->below)
1240	{	1201	{
1241	if (top == op)	1202	if (top == op)
1242	continue;	1203	continue;
1243	if (CAN_MERGE (op, top))	1204
		1205	if (object::can_merge (op, top))
1244	{	1206	{
1245	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1246		1208
1247	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1248	op->weight = 0; /* Don't want any adjustements now */	1210	op->weight = 0; /* Don't want any adjustements now */
1249	remove_ob (op);	1211	op->destroy ();
1250	free_object (op);
1251	return top;	1212	return top;
1252	}	1213	}
1253	}	1214	}
1254		1215
1255	return NULL;	1216	return 0;
1256	}	1217	}
1257		1218
1258	/*	1219	/*
1259	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1220	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1260	* job preparing multi-part monsters	1221	* job preparing multi-part monsters
1261	*/	1222	*/
1262	object *	1223	object *
1263	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1264	{	1225	{
1265	object *tmp;	1226	object *tmp;
1266		1227
1267	if (op->head)	1228	if (op->head)
1268	op = op->head;	1229	op = op->head;
…		…
1296	* NULL if 'op' was destroyed	1257	* NULL if 'op' was destroyed
1297	* just 'op' otherwise	1258	* just 'op' otherwise
1298	*/	1259	*/
1299		1260
1300	object *	1261	object *
1301	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1262	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1302	{	1263	{
1303	object *tmp, *top, *floor = NULL;	1264	object *tmp, *top, *floor = NULL;
1304	sint16 x, y;	1265	sint16 x, y;
1305		1266
1306	if (QUERY_FLAG (op, FLAG_FREED))	1267	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1309	return NULL;	1270	return NULL;
1310	}	1271	}
1311		1272
1312	if (m == NULL)	1273	if (m == NULL)
1313	{	1274	{
1314	dump_object (op);	1275	char *dump = dump_object (op);
1315	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1276	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1277	free (dump);
1316	return op;	1278	return op;
1317	}	1279	}
1318		1280
1319	if (out_of_map (m, op->x, op->y))	1281	if (out_of_map (m, op->x, op->y))
1320	{	1282	{
1321	dump_object (op);	1283	char *dump = dump_object (op);
1322	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1284	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1323	#ifdef MANY_CORES	1285	#ifdef MANY_CORES
1324	/* Better to catch this here, as otherwise the next use of this object	1286	/* Better to catch this here, as otherwise the next use of this object
1325	* is likely to cause a crash. Better to find out where it is getting	1287	* is likely to cause a crash. Better to find out where it is getting
1326	* improperly inserted.	1288	* improperly inserted.
1327	*/	1289	*/
1328	abort ();	1290	abort ();
1329	#endif	1291	#endif
		1292	free (dump);
1330	return op;	1293	return op;
1331	}	1294	}
1332		1295
1333	if (!QUERY_FLAG (op, FLAG_REMOVED))	1296	if (!QUERY_FLAG (op, FLAG_REMOVED))
1334	{	1297	{
1335	dump_object (op);	1298	char *dump = dump_object (op);
1336	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1299	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1300	free (dump);
1337	return op;	1301	return op;
1338	}	1302	}
1339		1303
1340	if (op->more != NULL)	1304	if (op->more != NULL)
1341	{	1305	{
…		…
1379		1343
1380	/* this has to be done after we translate the coordinates.	1344	/* this has to be done after we translate the coordinates.
1381	*/	1345	*/
1382	if (op->nrof && !(flag & INS_NO_MERGE))	1346	if (op->nrof && !(flag & INS_NO_MERGE))
1383	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1347	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1384	if (CAN_MERGE (op, tmp))	1348	if (object::can_merge (op, tmp))
1385	{	1349	{
1386	op->nrof += tmp->nrof;	1350	op->nrof += tmp->nrof;
1387	remove_ob (tmp);	1351	tmp->destroy ();
1388	free_object (tmp);
1389	}	1352	}
1390		1353
1391	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1354	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1392	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1355	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1393		1356
…		…
1521	* it, so save a few ticks and start from there.	1484	* it, so save a few ticks and start from there.
1522	*/	1485	*/
1523	if (!(flag & INS_MAP_LOAD))	1486	if (!(flag & INS_MAP_LOAD))
1524	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1487	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1525	if (tmp->type == PLAYER)	1488	if (tmp->type == PLAYER)
1526	tmp->contr->socket.update_look = 1;	1489	tmp->contr->socket->update_look = 1;
1527		1490
1528	/* If this object glows, it may affect lighting conditions that are	1491	/* If this object glows, it may affect lighting conditions that are
1529	* visible to others on this map. But update_all_los is really	1492	* visible to others on this map. But update_all_los is really
1530	* an inefficient way to do this, as it means los for all players	1493	* an inefficient way to do this, as it means los for all players
1531	* on the map will get recalculated. The players could very well	1494	* on the map will get recalculated. The players could very well
…		…
1579	tmp1;	1542	tmp1;
1580		1543
1581	/* first search for itself and remove any old instances */	1544	/* first search for itself and remove any old instances */
1582		1545
1583	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1546	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1584	{
1585	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1586	{	1548	tmp->destroy ();
1587	remove_ob (tmp);
1588	free_object (tmp);
1589	}
1590	}
1591		1549
1592	tmp1 = arch_to_object (find_archetype (arch_string));	1550	tmp1 = arch_to_object (archetype::find (arch_string));
1593		1551
1594	tmp1->x = op->x;	1552	tmp1->x = op->x;
1595	tmp1->y = op->y;	1553	tmp1->y = op->y;
1596	insert_ob_in_map (tmp1, op->map, op, 0);	1554	insert_ob_in_map (tmp1, op->map, op, 0);
1597	}	1555	}
…		…
1605	*/	1563	*/
1606		1564
1607	object *	1565	object *
1608	get_split_ob (object *orig_ob, uint32 nr)	1566	get_split_ob (object *orig_ob, uint32 nr)
1609	{	1567	{
1610	object *	1568	object *newob;
1611	newob;
1612	int
1613	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1569	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1614		1570
1615	if (orig_ob->nrof < nr)	1571	if (orig_ob->nrof < nr)
1616	{	1572	{
1617	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1573	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1618	return NULL;	1574	return NULL;
1619	}	1575	}
1620		1576
1621	newob = object_create_clone (orig_ob);	1577	newob = object_create_clone (orig_ob);
1622		1578
1623	if ((orig_ob->nrof -= nr) < 1)	1579	if ((orig_ob->nrof -= nr) < 1)
1624	{	1580	orig_ob->destroy (1);
1625	if (!is_removed)
1626	remove_ob (orig_ob);
1627	free_object2 (orig_ob, 1);
1628	}
1629	else if (!is_removed)	1581	else if (!is_removed)
1630	{	1582	{
1631	if (orig_ob->env != NULL)	1583	if (orig_ob->env != NULL)
1632	sub_weight (orig_ob->env, orig_ob->weight * nr);	1584	sub_weight (orig_ob->env, orig_ob->weight * nr);
1633	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1585	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1697	esrv_send_item (tmp, op);	1649	esrv_send_item (tmp, op);
1698	}	1650	}
1699	}	1651	}
1700	else	1652	else
1701	{	1653	{
1702	remove_ob (op);	1654	op->remove ();
1703	op->nrof = 0;	1655	op->nrof = 0;
1704	if (tmp)	1656	if (tmp)
1705	{	1657	{
1706	esrv_del_item (tmp->contr, op->count);	1658	esrv_del_item (tmp->contr, op->count);
1707	}	1659	}
…		…
1713		1665
1714	if (i < op->nrof)	1666	if (i < op->nrof)
1715	op->nrof -= i;	1667	op->nrof -= i;
1716	else	1668	else
1717	{	1669	{
1718	remove_ob (op);	1670	op->remove ();
1719	op->nrof = 0;	1671	op->nrof = 0;
1720	}	1672	}
1721		1673
1722	/* Since we just removed op, op->above is null */	1674	/* Since we just removed op, op->above is null */
1723	for (tmp = above; tmp != NULL; tmp = tmp->above)	1675	for (tmp = above; tmp != NULL; tmp = tmp->above)
…		…
1732		1684
1733	if (op->nrof)	1685	if (op->nrof)
1734	return op;	1686	return op;
1735	else	1687	else
1736	{	1688	{
1737	free_object (op);	1689	op->destroy ();
1738	return NULL;	1690	return NULL;
1739	}	1691	}
1740	}	1692	}
1741		1693
1742	/*	1694	/*
…		…
1755	op->carrying += weight;	1707	op->carrying += weight;
1756	op = op->env;	1708	op = op->env;
1757	}	1709	}
1758	}	1710	}
1759		1711
		1712	object *
		1713	insert_ob_in_ob (object *op, object *where)
		1714	{
		1715	if (!where)
		1716	{
		1717	char *dump = dump_object (op);
		1718	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1719	free (dump);
		1720	return op;
		1721	}
		1722
		1723	if (where->head)
		1724	{
		1725	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1726	where = where->head;
		1727	}
		1728
		1729	return where->insert (op);
		1730	}
		1731
1760	/*	1732	/*
1761	* insert_ob_in_ob(op,environment):	1733	* env->insert (op)
1762	* This function inserts the object op in the linked list	1734	* This function inserts the object op in the linked list
1763	* inside the object environment.	1735	* inside the object environment.
1764	*	1736	*
1765	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1766	* the inventory at the last position or next to other objects of the same
1767	* type.
1768	* Frank: Now sorted by type, archetype and magic!
1769	*
1770	* The function returns now pointer to inserted item, and return value can	1737	* The function returns now pointer to inserted item, and return value can
1771	* be != op, if items are merged. -Tero	1738	* be != op, if items are merged. -Tero
1772	*/	1739	*/
1773		1740
1774	object *	1741	object *
1775	insert_ob_in_ob (object *op, object *where)	1742	object::insert (object *op)
1776	{	1743	{
1777	object *	1744	object *tmp, *otmp;
1778	tmp, *
1779	otmp;
1780		1745
1781	if (!QUERY_FLAG (op, FLAG_REMOVED))	1746	if (!QUERY_FLAG (op, FLAG_REMOVED))
1782	{	1747	op->remove ();
1783	dump_object (op);
1784	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1785	return op;
1786	}
1787
1788	if (where == NULL)
1789	{
1790	dump_object (op);
1791	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1792	return op;
1793	}
1794
1795	if (where->head)
1796	{
1797	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1798	where = where->head;
1799	}
1800		1748
1801	if (op->more)	1749	if (op->more)
1802	{	1750	{
1803	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1751	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1804	return op;	1752	return op;
…		…
1806		1754
1807	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1755	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1808	CLEAR_FLAG (op, FLAG_REMOVED);	1756	CLEAR_FLAG (op, FLAG_REMOVED);
1809	if (op->nrof)	1757	if (op->nrof)
1810	{	1758	{
1811	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1759	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1812	if (CAN_MERGE (tmp, op))	1760	if (object::can_merge (tmp, op))
1813	{	1761	{
1814	/* return the original object and remove inserted object	1762	/* return the original object and remove inserted object
1815	(client needs the original object) */	1763	(client needs the original object) */
1816	tmp->nrof += op->nrof;	1764	tmp->nrof += op->nrof;
1817	/* Weight handling gets pretty funky. Since we are adding to	1765	/* Weight handling gets pretty funky. Since we are adding to
1818	* tmp->nrof, we need to increase the weight.	1766	* tmp->nrof, we need to increase the weight.
1819	*/	1767	*/
1820	add_weight (where, op->weight * op->nrof);	1768	add_weight (this, op->weight * op->nrof);
1821	SET_FLAG (op, FLAG_REMOVED);	1769	SET_FLAG (op, FLAG_REMOVED);
1822	free_object (op); /* free the inserted object */	1770	op->destroy (); /* free the inserted object */
1823	op = tmp;	1771	op = tmp;
1824	remove_ob (op); /* and fix old object's links */	1772	op->remove (); /* and fix old object's links */
1825	CLEAR_FLAG (op, FLAG_REMOVED);	1773	CLEAR_FLAG (op, FLAG_REMOVED);
1826	break;	1774	break;
1827	}	1775	}
1828		1776
1829	/* I assume combined objects have no inventory	1777	/* I assume combined objects have no inventory
1830	* We add the weight - this object could have just been removed	1778	* We add the weight - this object could have just been removed
1831	* (if it was possible to merge). calling remove_ob will subtract	1779	* (if it was possible to merge). calling remove_ob will subtract
1832	* the weight, so we need to add it in again, since we actually do	1780	* the weight, so we need to add it in again, since we actually do
1833	* the linking below	1781	* the linking below
1834	*/	1782	*/
1835	add_weight (where, op->weight * op->nrof);	1783	add_weight (this, op->weight * op->nrof);
1836	}	1784	}
1837	else	1785	else
1838	add_weight (where, (op->weight + op->carrying));	1786	add_weight (this, (op->weight + op->carrying));
1839		1787
1840	otmp = is_player_inv (where);	1788	otmp = is_player_inv (this);
1841	if (otmp && otmp->contr != NULL)	1789	if (otmp && otmp->contr)
1842	{
1843	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1790	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1844	fix_player (otmp);	1791	fix_player (otmp);
1845	}
1846		1792
1847	op->map = NULL;	1793	op->map = NULL;
1848	op->env = where;	1794	op->env = this;
1849	op->above = NULL;	1795	op->above = NULL;
1850	op->below = NULL;	1796	op->below = NULL;
1851	op->x = 0, op->y = 0;	1797	op->x = 0, op->y = 0;
1852		1798
1853	/* reset the light list and los of the players on the map */	1799	/* reset the light list and los of the players on the map */
1854	if ((op->glow_radius != 0) && where->map)	1800	if ((op->glow_radius != 0) && map)
1855	{	1801	{
1856	#ifdef DEBUG_LIGHTS	1802	#ifdef DEBUG_LIGHTS
1857	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1803	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1858	#endif /* DEBUG_LIGHTS */	1804	#endif /* DEBUG_LIGHTS */
1859	if (MAP_DARKNESS (where->map))	1805	if (MAP_DARKNESS (map))
1860	update_all_los (where->map, where->x, where->y);	1806	update_all_los (map, x, y);
1861	}	1807	}
1862		1808
1863	/* Client has no idea of ordering so lets not bother ordering it here.	1809	/* Client has no idea of ordering so lets not bother ordering it here.
1864	* It sure simplifies this function...	1810	* It sure simplifies this function...
1865	*/	1811	*/
1866	if (where->inv == NULL)	1812	if (!inv)
1867	where->inv = op;	1813	inv = op;
1868	else	1814	else
1869	{	1815	{
1870	op->below = where->inv;	1816	op->below = inv;
1871	op->below->above = op;	1817	op->below->above = op;
1872	where->inv = op;	1818	inv = op;
1873	}	1819	}
		1820
1874	return op;	1821	return op;
1875	}	1822	}
1876		1823
1877	/*	1824	/*
1878	* Checks if any objects has a move_type that matches objects	1825	* Checks if any objects has a move_type that matches objects
…		…
1896	*/	1843	*/
1897		1844
1898	int	1845	int
1899	check_move_on (object *op, object *originator)	1846	check_move_on (object *op, object *originator)
1900	{	1847	{
1901	object *	1848	object *tmp;
1902	tmp;	1849	maptile *m = op->map;
1903	tag_t
1904	tag;
1905	mapstruct *
1906	m = op->map;
1907	int
1908	x = op->x, y = op->y;	1850	int x = op->x, y = op->y;
1909		1851
1910	MoveType	1852	MoveType move_on, move_slow, move_block;
1911	move_on,
1912	move_slow,
1913	move_block;
1914		1853
1915	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1854	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1916	return 0;	1855	return 0;
1917
1918	tag = op->count;
1919		1856
1920	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1857	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1921	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1858	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1922	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1859	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1923		1860
…		…
1984	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1921	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1985	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1922	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1986	{	1923	{
1987	move_apply (tmp, op, originator);	1924	move_apply (tmp, op, originator);
1988		1925
1989	if (was_destroyed (op, tag))	1926	if (op->destroyed ())
1990	return 1;	1927	return 1;
1991		1928
1992	/* what the person/creature stepped onto has moved the object	1929	/* what the person/creature stepped onto has moved the object
1993	* someplace new. Don't process any further - if we did,	1930	* someplace new. Don't process any further - if we did,
1994	* have a feeling strange problems would result.	1931	* have a feeling strange problems would result.
…		…
2006	* a matching archetype at the given map and coordinates.	1943	* a matching archetype at the given map and coordinates.
2007	* The first matching object is returned, or NULL if none.	1944	* The first matching object is returned, or NULL if none.
2008	*/	1945	*/
2009		1946
2010	object *	1947	object *
2011	present_arch (const archetype *at, mapstruct *m, int x, int y)	1948	present_arch (const archetype *at, maptile *m, int x, int y)
2012	{	1949	{
2013	object *	1950	object *
2014	tmp;	1951	tmp;
2015		1952
2016	if (m == NULL || out_of_map (m, x, y))	1953	if (m == NULL || out_of_map (m, x, y))
…		…
2029	* a matching type variable at the given map and coordinates.	1966	* a matching type variable at the given map and coordinates.
2030	* The first matching object is returned, or NULL if none.	1967	* The first matching object is returned, or NULL if none.
2031	*/	1968	*/
2032		1969
2033	object *	1970	object *
2034	present (unsigned char type, mapstruct *m, int x, int y)	1971	present (unsigned char type, maptile *m, int x, int y)
2035	{	1972	{
2036	object *	1973	object *
2037	tmp;	1974	tmp;
2038		1975
2039	if (out_of_map (m, x, y))	1976	if (out_of_map (m, x, y))
…		…
2179	* the archetype because that isn't correct if the monster has been	2116	* the archetype because that isn't correct if the monster has been
2180	* customized, changed states, etc.	2117	* customized, changed states, etc.
2181	*/	2118	*/
2182		2119
2183	int	2120	int
2184	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2121	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2185	{	2122	{
2186	int	2123	int
2187	i,	2124	i,
2188	index = 0, flag;	2125	index = 0, flag;
2189	static int	2126	static int
…		…
2210	return -1;	2147	return -1;
2211	return altern[RANDOM () % index];	2148	return altern[RANDOM () % index];
2212	}	2149	}
2213		2150
2214	/*	2151	/*
2215	* find_first_free_spot(archetype, mapstruct, x, y) works like	2152	* find_first_free_spot(archetype, maptile, x, y) works like
2216	* find_free_spot(), but it will search max number of squares.	2153	* find_free_spot(), but it will search max number of squares.
2217	* But it will return the first available spot, not a random choice.	2154	* But it will return the first available spot, not a random choice.
2218	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2155	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2219	*/	2156	*/
2220		2157
2221	int	2158	int
2222	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2159	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2223	{	2160	{
2224	int	2161	int
2225	i;	2162	i;
2226		2163
2227	for (i = 0; i < SIZEOFFREE; i++)	2164	for (i = 0; i < SIZEOFFREE; i++)
…		…
2291	* because we have to know what movement the thing looking to move	2228	* because we have to know what movement the thing looking to move
2292	* there is capable of.	2229	* there is capable of.
2293	*/	2230	*/
2294		2231
2295	int	2232	int
2296	find_dir (mapstruct *m, int x, int y, object *exclude)	2233	find_dir (maptile *m, int x, int y, object *exclude)
2297	{	2234	{
2298	int	2235	int
2299	i,	2236	i,
2300	max = SIZEOFFREE, mflags;	2237	max = SIZEOFFREE, mflags;
2301		2238
2302	sint16 nx, ny;	2239	sint16 nx, ny;
2303	object *	2240	object *
2304	tmp;	2241	tmp;
2305	mapstruct *	2242	maptile *
2306	mp;	2243	mp;
2307		2244
2308	MoveType blocked, move_type;	2245	MoveType blocked, move_type;
2309		2246
2310	if (exclude && exclude->head)	2247	if (exclude && exclude->head)
…		…
2518	* Modified to be map tile aware -.MSW	2455	* Modified to be map tile aware -.MSW
2519	*/	2456	*/
2520		2457
2521		2458
2522	int	2459	int
2523	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2460	can_see_monsterP (maptile *m, int x, int y, int dir)
2524	{	2461	{
2525	sint16 dx, dy;	2462	sint16 dx, dy;
2526	int	2463	int
2527	mflags;	2464	mflags;
2528		2465
…		…
2577	* create clone from object to another	2514	* create clone from object to another
2578	*/	2515	*/
2579	object *	2516	object *
2580	object_create_clone (object *asrc)	2517	object_create_clone (object *asrc)
2581	{	2518	{
2582	object *
2583	dst = NULL, *tmp, *src, *part, *prev, *item;	2519	object *dst = 0, *tmp, *src, *part, *prev, *item;
2584		2520
2585	if (!asrc)	2521	if (!asrc)
2586	return NULL;	2522	return 0;
		2523
2587	src = asrc;	2524	src = asrc;
2588	if (src->head)	2525	if (src->head)
2589	src = src->head;	2526	src = src->head;
2590		2527
2591	prev = NULL;	2528	prev = 0;
2592	for (part = src; part; part = part->more)	2529	for (part = src; part; part = part->more)
2593	{	2530	{
2594	tmp = get_object ();	2531	tmp = part->clone ();
2595	copy_object (part, tmp);
2596	tmp->x -= src->x;	2532	tmp->x -= src->x;
2597	tmp->y -= src->y;	2533	tmp->y -= src->y;
		2534
2598	if (!part->head)	2535	if (!part->head)
2599	{	2536	{
2600	dst = tmp;	2537	dst = tmp;
2601	tmp->head = NULL;	2538	tmp->head = 0;
2602	}	2539	}
2603	else	2540	else
2604	{	2541	{
2605	tmp->head = dst;	2542	tmp->head = dst;
2606	}	2543	}
		2544
2607	tmp->more = NULL;	2545	tmp->more = 0;
		2546
2608	if (prev)	2547	if (prev)
2609	prev->more = tmp;	2548	prev->more = tmp;
		2549
2610	prev = tmp;	2550	prev = tmp;
2611	}	2551	}
2612		2552
2613	/*** copy inventory ***/
2614	for (item = src->inv; item; item = item->below)	2553	for (item = src->inv; item; item = item->below)
2615	{
2616	(void) insert_ob_in_ob (object_create_clone (item), dst);	2554	insert_ob_in_ob (object_create_clone (item), dst);
2617	}
2618		2555
2619	return dst;	2556	return dst;
2620	}	2557	}
2621		2558
2622	/* return true if the object was destroyed, 0 otherwise */
2623	int
2624	was_destroyed (const object *op, tag_t old_tag)
2625	{
2626	/* checking for FLAG_FREED isn't necessary, but makes this function more
2627	* robust */
2628	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2629	}
2630
2631	/* GROS - Creates an object using a string representing its content. */	2559	/* GROS - Creates an object using a string representing its content. */
2632
2633	/* Basically, we save the content of the string to a temp file, then call */	2560	/* Basically, we save the content of the string to a temp file, then call */
2634
2635	/* load_object on it. I admit it is a highly inefficient way to make things, */	2561	/* load_object on it. I admit it is a highly inefficient way to make things, */
2636
2637	/* but it was simple to make and allows reusing the load_object function. */	2562	/* but it was simple to make and allows reusing the load_object function. */
2638
2639	/* Remember not to use load_object_str in a time-critical situation. */	2563	/* Remember not to use load_object_str in a time-critical situation. */
2640
2641	/* Also remember that multiparts objects are not supported for now. */	2564	/* Also remember that multiparts objects are not supported for now. */
2642		2565
2643	object *	2566	object *
2644	load_object_str (const char *obstr)	2567	load_object_str (const char *obstr)
2645	{	2568	{
2646	object *	2569	object *op;
2647	op;
2648	char
2649	filename[MAX_BUF];	2570	char filename[MAX_BUF];
2650		2571
2651	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2572	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2652		2573
2653	FILE *
2654	tempfile = fopen (filename, "w");	2574	FILE *tempfile = fopen (filename, "w");
2655		2575
2656	if (tempfile == NULL)	2576	if (tempfile == NULL)
2657	{	2577	{
2658	LOG (llevError, "Error - Unable to access load object temp file\n");	2578	LOG (llevError, "Error - Unable to access load object temp file\n");
2659	return NULL;	2579	return NULL;
2660	};	2580	}
		2581
2661	fprintf (tempfile, obstr);	2582	fprintf (tempfile, obstr);
2662	fclose (tempfile);	2583	fclose (tempfile);
2663		2584
2664	op = get_object ();	2585	op = object::create ();
2665		2586
2666	object_thawer thawer (filename);	2587	object_thawer thawer (filename);
2667		2588
2668	if (thawer)	2589	if (thawer)
2669	load_object (thawer, op, 0);	2590	load_object (thawer, op, 0);
…		…
2679	* returns NULL if no match.	2600	* returns NULL if no match.
2680	*/	2601	*/
2681	object *	2602	object *
2682	find_obj_by_type_subtype (const object *who, int type, int subtype)	2603	find_obj_by_type_subtype (const object *who, int type, int subtype)
2683	{	2604	{
2684	object *	2605	object *tmp;
2685	tmp;
2686		2606
2687	for (tmp = who->inv; tmp; tmp = tmp->below)	2607	for (tmp = who->inv; tmp; tmp = tmp->below)
2688	if (tmp->type == type && tmp->subtype == subtype)	2608	if (tmp->type == type && tmp->subtype == subtype)
2689	return tmp;	2609	return tmp;
2690		2610
…		…
2698	* do the desired thing.	2618	* do the desired thing.
2699	*/	2619	*/
2700	key_value *	2620	key_value *
2701	get_ob_key_link (const object *ob, const char *key)	2621	get_ob_key_link (const object *ob, const char *key)
2702	{	2622	{
2703	key_value *	2623	key_value *link;
2704	link;
2705		2624
2706	for (link = ob->key_values; link != NULL; link = link->next)	2625	for (link = ob->key_values; link != NULL; link = link->next)
2707	{
2708	if (link->key == key)	2626	if (link->key == key)
2709	{
2710	return link;	2627	return link;
2711	}
2712	}
2713		2628
2714	return NULL;	2629	return NULL;
2715	}	2630	}
2716		2631
2717	/*	2632	/*

Diff Legend

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