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

Diff Legend

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