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.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.71 by elmex, Tue Dec 19 13:41:45 2006 UTC

…		…
16		16
17	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
18	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	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>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
…		…
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
33	#include <skills.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	*/
…		…
207	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
208	return 0;	283	return 0;
209		284
210	switch (ob1->type)	285	switch (ob1->type)
211	{	286	{
212	case SCROLL:	287	case SCROLL:
213	if (ob1->level != ob2->level)	288	if (ob1->level != ob2->level)
214	return 0;	289	return 0;
215	break;	290	break;
216	}	291	}
217		292
218	if (ob1->key_values != NULL || ob2->key_values != NULL)	293	if (ob1->key_values != NULL || ob2->key_values != NULL)
219	{	294	{
220	/* At least one of these has key_values. */	295	/* At least one of these has key_values. */
…		…
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.
…		…
416	*/	426	*/
417		427
418	object *	428	object *
419	find_object_name (const char *str)	429	find_object_name (const char *str)
420	{	430	{
421	const char *name = shstr::find (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 == name)	435	if (op->name == str_)
426	break;	436	break;
427		437
428	return op;	438	return op;
429	}	439	}
430		440
…		…
433	{	443	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	444	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	445	}
436		446
437	/*	447	/*
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
448	object *
449	get_owner (object *op)
450	{
451	if (op->owner == NULL)
452	return NULL;
453
454	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455	return op->owner;
456
457	op->owner = NULL;
458	op->ownercount = 0;
459	return NULL;
460	}
461
462	void
463	clear_owner (object *op)
464	{
465	if (!op)
466	return;
467
468	if (op->owner && op->ownercount == op->owner->count)
469	op->owner->refcount--;
470
471	op->owner = NULL;
472	op->ownercount = 0;
473	}
474
475	/*
476	* 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
477	* skill and experience objects.	449	* skill and experience objects.
478	*/	450	*/
479	void	451	void
480	set_owner (object *op, object *owner)	452	object::set_owner (object *owner)
481	{	453	{
482	if (owner == NULL || op == NULL)	454	if (!owner)
483	return;	455	return;
484		456
485	/* next line added to allow objects which own objects */	457	/* next line added to allow objects which own objects */
486	/* Add a check for ownercounts in here, as I got into an endless loop	458	/* Add a check for ownercounts in here, as I got into an endless loop
487	* with the fireball owning a poison cloud which then owned the	459	* with the fireball owning a poison cloud which then owned the
488	* fireball. I believe that was caused by one of the objects getting	460	* fireball. I believe that was caused by one of the objects getting
489	* freed and then another object replacing it. Since the ownercounts	461	* freed and then another object replacing it. Since the ownercounts
490	* didn't match, this check is valid and I believe that cause is valid.	462	* didn't match, this check is valid and I believe that cause is valid.
491	*/	463	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	464	while (owner->owner)
493	owner = owner->owner;	465	owner = owner->owner;
494		466
495	/* IF the owner still has an owner, we did not resolve to a final owner.
496	* so lets not add to that.
497	*/
498	if (owner->owner)
499	return;
500
501	op->owner = owner;	467	this->owner = owner;
502
503	op->ownercount = owner->count;
504	owner->refcount++;
505	}
506
507	/* Set the owner to clone's current owner and set the skill and experience
508	* objects to clone's objects (typically those objects that where the owner's
509	* current skill and experience objects at the time when clone's owner was
510	* set - not the owner's current skill and experience objects).
511	*
512	* Use this function if player created an object (e.g. fire bullet, swarm
513	* spell), and this object creates further objects whose kills should be
514	* accounted for the player's original skill, even if player has changed
515	* skills meanwhile.
516	*/
517	void
518	copy_owner (object *op, object *clone)
519	{
520	object *owner = get_owner (clone);
521
522	if (owner == NULL)
523	{
524	/* players don't have owners - they own themselves. Update
525	* as appropriate.
526	*/
527	if (clone->type == PLAYER)
528	owner = clone;
529	else
530	return;
531	}
532
533	set_owner (op, owner);
534	}	468	}
535		469
536	/* Zero the key_values on op, decrementing the shared-string	470	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	471	* refcounts and freeing the links.
538	*/	472	*/
…		…
554	{	488	{
555	attachable_base::clear ();	489	attachable_base::clear ();
556		490
557	free_key_values (this);	491	free_key_values (this);
558		492
559	clear_owner (this);	493	owner = 0;
560
561	name = 0;	494	name = 0;
562	name_pl = 0;	495	name_pl = 0;
563	title = 0;	496	title = 0;
564	race = 0;	497	race = 0;
565	slaying = 0;	498	slaying = 0;
566	skill = 0;	499	skill = 0;
567	msg = 0;	500	msg = 0;
568	lore = 0;	501	lore = 0;
569	custom_name = 0;	502	custom_name = 0;
570	materialname = 0;	503	materialname = 0;
		504	contr = 0;
		505	below = 0;
		506	above = 0;
		507	inv = 0;
		508	container = 0;
		509	env = 0;
		510	more = 0;
		511	head = 0;
		512	map = 0;
		513	active_next = 0;
		514	active_prev = 0;
571		515
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573		517
574	SET_FLAG (this, FLAG_REMOVED);	518	SET_FLAG (this, FLAG_REMOVED);
575	}
576		519
577	void object::clone (object *destination)
578	{
579	*(object_copy *) destination = *this;
580	*(object_pod *) destination = *this;
581
582	if (self || cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
584	}
585
586	/*
587	* clear_object() frees everything allocated by an object, and also
588	* clears all variables and flags to default settings.
589	*/
590
591	void
592	clear_object (object *op)
593	{
594	op->clear ();
595
596	op->contr = NULL;
597	op->below = NULL;
598	op->above = NULL;
599	op->inv = NULL;
600	op->container = NULL;
601	op->env = NULL;
602	op->more = NULL;
603	op->head = NULL;
604	op->map = NULL;
605	op->refcount = 0;
606	op->active_next = NULL;
607	op->active_prev = NULL;
608	/* What is not cleared is next, prev, and count */	520	/* What is not cleared is next, prev, and count */
609		521
610	op->expmul = 1.0;	522	expmul = 1.0;
611	op->face = blank_face;	523	face = blank_face;
612	op->attacked_by_count = -1;
613		524
614	if (settings.casting_time)	525	if (settings.casting_time)
615	op->casting_time = -1;	526	casting_time = -1;
616	}	527	}
617		528
618	/*	529	/*
619	* copy object first frees everything allocated by the second object,	530	* copy_to first frees everything allocated by the dst object,
620	* and then copies the contends of the first object into the second	531	* and then copies the contents of itself into the second
621	* object, allocating what needs to be allocated. Basically, any	532	* object, allocating what needs to be allocated. Basically, any
622	* 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,
623	* 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
624	* will point at garbage.	535	* will point at garbage.
625	*/	536	*/
626
627	void	537	void
628	copy_object (object *op2, object *op)	538	object::copy_to (object *dst)
629	{	539	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
632		542
633	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));
634		548
635	if (is_freed)	549	if (is_freed)
636	SET_FLAG (op, FLAG_FREED);	550	SET_FLAG (dst, FLAG_FREED);
		551
637	if (is_removed)	552	if (is_removed)
638	SET_FLAG (op, FLAG_REMOVED);	553	SET_FLAG (dst, FLAG_REMOVED);
639		554
640	if (op2->speed < 0)	555	if (speed < 0)
641	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
642		557
643	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
644	if (op2->key_values)	559	if (key_values)
645	{	560	{
646	key_value *tail = 0;	561	key_value *tail = 0;
647	key_value *i;	562	key_value *i;
648		563
649	op->key_values = 0;	564	dst->key_values = 0;
650		565
651	for (i = op2->key_values; i; i = i->next)	566	for (i = key_values; i; i = i->next)
652	{	567	{
653	key_value *new_link = new key_value;	568	key_value *new_link = new key_value;
654		569
655	new_link->next = 0;	570	new_link->next = 0;
656	new_link->key = i->key;	571	new_link->key = i->key;
657	new_link->value = i->value;	572	new_link->value = i->value;
658		573
659	/* Try and be clever here, too. */	574	/* Try and be clever here, too. */
660	if (!op->key_values)	575	if (!dst->key_values)
661	{	576	{
662	op->key_values = new_link;	577	dst->key_values = new_link;
663	tail = new_link;	578	tail = new_link;
664	}	579	}
665	else	580	else
666	{	581	{
667	tail->next = new_link;	582	tail->next = new_link;
668	tail = new_link;	583	tail = new_link;
669	}	584	}
670	}	585	}
671	}	586	}
672		587
673	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;
674	}	597	}
675		598
676	/*	599	/*
677	* 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
678	* 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
…		…
691	/*	614	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	615	* Updates the speed of an object. If the speed changes from 0 to another
693	* value, or vice versa, then add/remove the object from the active list.	616	* value, or vice versa, then add/remove the object from the active list.
694	* This function needs to be called whenever the speed of an object changes.	617	* This function needs to be called whenever the speed of an object changes.
695	*/	618	*/
696
697	void	619	void
698	update_ob_speed (object *op)	620	update_ob_speed (object *op)
699	{	621	{
700	extern int arch_init;	622	extern int arch_init;
701		623
…		…
710	abort ();	632	abort ();
711	#else	633	#else
712	op->speed = 0;	634	op->speed = 0;
713	#endif	635	#endif
714	}	636	}
		637
715	if (arch_init)	638	if (arch_init)
716	{
717	return;	639	return;
718	}	640
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	642	{
721	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
723	return;	645	return;
724		646
725	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	648	* of the list. */
727	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
728	if (op->active_next != NULL)	651	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
730	active_objects = op;	654	active_objects = op;
731	}	655	}
732	else	656	else
733	{	657	{
734	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
736	return;	660	return;
737		661
738	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
739	{	663	{
740	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
741	if (op->active_next != NULL)	666	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
743	}	668	}
744	else	669	else
745	{	670	{
746	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
747	if (op->active_next)	673	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
749	}	675	}
		676
750	op->active_next = NULL;	677	op->active_next = NULL;
751	op->active_prev = NULL;	678	op->active_prev = NULL;
752	}	679	}
753	}	680	}
754		681
…		…
879	update_now = 1;	806	update_now = 1;
880		807
881	if ((move_slow | op->move_slow) != move_slow)	808	if ((move_slow | op->move_slow) != move_slow)
882	update_now = 1;	809	update_now = 1;
883	}	810	}
		811
884	/* if the object is being removed, we can't make intelligent	812	/* if the object is being removed, we can't make intelligent
885	* decisions, because remove_ob can't really pass the object	813	* decisions, because remove_ob can't really pass the object
886	* that is being removed.	814	* that is being removed.
887	*/	815	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	817	update_now = 1;
890	else if (action == UP_OBJ_FACE)	818	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	819	/* Nothing to do for that case */ ;
892	else	820	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	821	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		822
895	if (update_now)	823	if (update_now)
896	{	824	{
…		…
900		828
901	if (op->more != NULL)	829	if (op->more != NULL)
902	update_object (op->more, action);	830	update_object (op->more, action);
903	}	831	}
904		832
905	static unordered_vector<object *> mortals;	833	object::vector object::mortals;
906	static std::vector<object *> freed;	834	object::vector object::objects; // not yet used
		835	object *object::first;
907		836
908	void object::free_mortals ()	837	void object::free_mortals ()
909	{	838	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	840	if ((*i)->refcnt)
		841	++i; // further delay freeing
		842	else
912	{	843	{
913	freed.push_back (*i);	844	delete *i;
914	mortals.erase (i);	845	mortals.erase (i);
915	}	846	}
916	else
917	++i;
918	}	847	}
919		848
920	object::object ()	849	object::object ()
921	{	850	{
922	SET_FLAG (this, FLAG_REMOVED);	851	SET_FLAG (this, FLAG_REMOVED);
923		852
924	expmul = 1.0;	853	expmul = 1.0;
925	face = blank_face;	854	face = blank_face;
926	attacked_by_count = -1;
927	}	855	}
928		856
929	object::~object ()	857	object::~object ()
930	{	858	{
931	free_key_values (this);	859	free_key_values (this);
932	}	860	}
933		861
934	void object::link ()	862	void object::link ()
935	{	863	{
936	count = ++ob_count;	864	count = ++ob_count;
		865	uuid = gen_uuid ();
937		866
938	prev = 0;	867	prev = 0;
939	next = objects;	868	next = object::first;
940		869
941	if (objects)	870	if (object::first)
942	objects->prev = this;	871	object::first->prev = this;
943		872
944	objects = this;	873	object::first = this;
945	}	874	}
946		875
947	void object::unlink ()	876	void object::unlink ()
948	{	877	{
949	count = 0;	878	if (this == object::first)
		879	object::first = next;
950		880
951	/* Remove this object from the list of used objects */	881	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	882	if (prev) prev->next = next;
		883	if (next) next->prev = prev;
		884
955	prev = 0;	885	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	886	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	887	}
967		888
968	object *object::create ()	889	object *object::create ()
969	{	890	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	891	object *op = new object;
974	else
975	{
976	// highly annoying, but the only way to get it stable right now
977	op = freed.back (); freed.pop_back ();
978	op->~object ();
979	new ((void *)op) object;
980	}
981
982	op->link ();	892	op->link ();
983	return op;	893	return op;
984	}	894	}
985		895
986	/*	896	/*
…		…
988	* 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
989	* free objects. The IS_FREED() flag is set in the object.	899	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	900	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	901	* this function to succeed.
992	*	902	*
993	* 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
994	* inventory to the ground.	904	* inventory to the ground.
995	*/	905	*/
996	void object::free (bool free_inventory)	906	void object::destroy (bool destroy_inventory)
997	{	907	{
		908	if (QUERY_FLAG (this, FLAG_FREED))
		909	return;
		910
		911	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		912	remove_friendly_object (this);
		913
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	914	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	915	remove ();
1000	LOG (llevDebug, "Free object called with non removed object\n");
1001	dump_object (this);
1002	#ifdef MANY_CORES
1003	abort ();
1004	#endif
1005	}
1006		916
1007	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1008	{
1009	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1010	remove_friendly_object (this);
1011	}
1012
1013	if (QUERY_FLAG (this, FLAG_FREED))	917	SET_FLAG (this, FLAG_FREED);
1014	{
1015	dump_object (this);
1016	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1017	return;
1018	}
1019		918
1020	if (more)	919	if (more)
1021	{	920	{
1022	more->free (free_inventory);	921	more->destroy (destroy_inventory);
1023	more = 0;	922	more = 0;
1024	}	923	}
1025		924
1026	if (inv)	925	if (inv)
1027	{	926	{
1028	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
1030	* drop on that space.	929	* drop on that space.
1031	*/	930	*/
1032	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)
1033	{	932	{
1034	object *	933	object *op = inv;
1035	op = inv;
1036		934
1037	while (op)	935	while (op)
1038	{	936	{
1039	object *
1040	tmp = op->below;	937	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	938	op->destroy (destroy_inventory);
1044	op = tmp;	939	op = tmp;
1045	}	940	}
1046	}	941	}
1047	else	942	else
1048	{ /* Put objects in inventory onto this space */	943	{ /* Put objects in inventory onto this space */
1049	object *	944	object *op = inv;
1050	op = inv;
1051		945
1052	while (op)	946	while (op)
1053	{	947	{
1054	object *
1055	tmp = op->below;	948	object *tmp = op->below;
1056		949
1057	remove_ob (op);	950	op->remove ();
1058		951
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1060	|| 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))
1061	free_object (op);	954	op->destroy ();
1062	else	955	else
1063	{	956	{
1064	op->x = x;	957	op->x = x;
1065	op->y = y;	958	op->y = y;
1066	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 */
…		…
1069	op = tmp;	962	op = tmp;
1070	}	963	}
1071	}	964	}
1072	}	965	}
1073		966
1074	clear_owner (this);	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
		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;
1075		994
1076	/* Remove object from the active list */	995	/* Remove object from the active list */
1077	speed = 0;	996	speed = 0;
1078	update_ob_speed (this);	997	update_ob_speed (this);
1079		998
1080	unlink ();	999	unlink ();
1081		1000
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	1001	mortals.push_back (this);
1085	}	1002	}
1086		1003
1087	/*	1004	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	1005	* sub_weight() recursively (outwards) subtracts a number from the
1089	* 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)).
1090	*/	1007	*/
1091
1092	void	1008	void
1093	sub_weight (object *op, signed long weight)	1009	sub_weight (object *op, signed long weight)
1094	{	1010	{
1095	while (op != NULL)	1011	while (op != NULL)
1096	{	1012	{
1097	if (op->type == CONTAINER)	1013	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1014	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1015
1101	op->carrying -= weight;	1016	op->carrying -= weight;
1102	op = op->env;	1017	op = op->env;
1103	}	1018	}
1104	}	1019	}
1105		1020
1106	/* remove_ob(op):	1021	/* op->remove ():
1107	* 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
1108	* 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
1109	* object will have no environment. If the object previously had an	1024	* object will have no environment. If the object previously had an
1110	* environment, the x and y coordinates will be updated to	1025	* environment, the x and y coordinates will be updated to
1111	* the previous environment.	1026	* the previous environment.
1112	* Beware: This function is called from the editor as well!	1027	* Beware: This function is called from the editor as well!
1113	*/	1028	*/
1114
1115	void	1029	void
1116	remove_ob (object *op)	1030	object::remove ()
1117	{	1031	{
1118	object *tmp, *last = NULL;	1032	object *tmp, *last = 0;
1119	object *otmp;	1033	object *otmp;
1120		1034
1121	tag_t tag;
1122	int check_walk_off;	1035	int check_walk_off;
1123	mapstruct *m;
1124		1036
1125	sint16 x, y;
1126
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	1037	if (QUERY_FLAG (this, FLAG_REMOVED))
1128	{	1038	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		1039
1132	/* Changed it to always dump core in this case. As has been learned
1133	* in the past, trying to recover from errors almost always
1134	* make things worse, and this is a real error here - something
1135	* that should not happen.
1136	* Yes, if this was a mission critical app, trying to do something
1137	* to recover may make sense, but that is because failure of the app
1138	* may have other disastrous problems. Cf runs out of a script
1139	* so is easily enough restarted without any real problems.
1140	* MSW 2001-07-01
1141	*/
1142	abort ();
1143	}
1144
1145	if (op->more != NULL)
1146	remove_ob (op->more);
1147
1148	SET_FLAG (op, FLAG_REMOVED);	1040	SET_FLAG (this, FLAG_REMOVED);
		1041
		1042	if (more)
		1043	more->remove ();
1149		1044
1150	/*	1045	/*
1151	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1152	* inventory.	1047	* inventory.
1153	*/	1048	*/
1154	if (op->env != NULL)	1049	if (env)
1155	{	1050	{
1156	if (op->nrof)	1051	if (nrof)
1157	sub_weight (op->env, op->weight * op->nrof);	1052	sub_weight (env, weight * nrof);
1158	else	1053	else
1159	sub_weight (op->env, op->weight + op->carrying);	1054	sub_weight (env, weight + carrying);
1160		1055
1161	/* 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
1162	* made to players inventory. If set, avoiding the call	1057	* made to players inventory. If set, avoiding the call
1163	* to save cpu time.	1058	* to save cpu time.
1164	*/	1059	*/
1165	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))
1166	fix_player (otmp);	1061	fix_player (otmp);
1167		1062
1168	if (op->above != NULL)	1063	if (above != NULL)
1169	op->above->below = op->below;	1064	above->below = below;
1170	else	1065	else
1171	op->env->inv = op->below;	1066	env->inv = below;
1172		1067
1173	if (op->below != NULL)	1068	if (below != NULL)
1174	op->below->above = op->above;	1069	below->above = above;
1175		1070
1176	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1177	* 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
1178	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1179	*/	1074	*/
1180	op->x = op->env->x, op->y = op->env->y;	1075	x = env->x, y = env->y;
1181	op->map = op->env->map;	1076	map = env->map;
1182	op->above = NULL, op->below = NULL;	1077	above = 0, below = 0;
1183	op->env = NULL;	1078	env = 0;
1184	return;
1185	}
1186
1187	/* If we get here, we are removing it from a map */
1188	if (op->map == NULL)
1189	return;
1190
1191	x = op->x;
1192	y = op->y;
1193	m = get_map_from_coord (op->map, &x, &y);
1194
1195	if (!m)
1196	{	1079	}
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1080	else if (map)
1198	op->map->path, op->x, op->y);	1081	{
1199	/* in old days, we used to set x and y to 0 and continue.	1082	/* Re did the following section of code - it looks like it had
1200	* it seems if we get into this case, something is probablye	1083	* lots of logic for things we no longer care about
1201	* screwed up and should be fixed.
1202	*/	1084	*/
1203	abort ();
1204	}
1205	if (op->map != m)
1206	{
1207	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1208	op->map->path, m->path, op->x, op->y, x, y);
1209	}
1210		1085
1211	/* Re did the following section of code - it looks like it had
1212	* lots of logic for things we no longer care about
1213	*/
1214
1215	/* link the object above us */	1086	/* link the object above us */
1216	if (op->above)	1087	if (above)
1217	op->above->below = op->below;	1088	above->below = below;
1218	else	1089	else
1219	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 */
1220		1091
1221	/* Relink the object below us, if there is one */	1092	/* Relink the object below us, if there is one */
1222	if (op->below)	1093	if (below)
1223	op->below->above = op->above;	1094	below->above = above;
1224	else	1095	else
1225	{	1096	{
1226	/* 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
1227	* use translated coordinates in case some oddness with map tiling is	1098	* use translated coordinates in case some oddness with map tiling is
1228	* evident	1099	* evident
1229	*/
1230	if (GET_MAP_OB (m, x, y) != op)
1231	{
1232	dump_object (op);
1233	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1234	errmsg);
1235	dump_object (GET_MAP_OB (m, x, y));
1236	LOG (llevError, "%s\n", errmsg);
1237	}
1238
1239	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1240	}
1241
1242	op->above = NULL;
1243	op->below = NULL;
1244
1245	if (op->map->in_memory == MAP_SAVING)
1246	return;
1247
1248	tag = op->count;
1249	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1250
1251	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1252	{
1253	/* No point updating the players look faces if he is the object
1254	* being removed.
1255	*/
1256
1257	if (tmp->type == PLAYER && tmp != op)
1258	{
1259	/* If a container that the player is currently using somehow gets
1260	* removed (most likely destroyed), update the player view
1261	* appropriately.
1262	*/	1100	*/
1263	if (tmp->container == op)	1101	if (GET_MAP_OB (map, x, y) != this)
1264	{	1102	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1103	char *dump = dump_object (this);
1266	tmp->container = NULL;	1104	LOG (llevError,
		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);
		1107	dump = dump_object (GET_MAP_OB (map, x, y));
		1108	LOG (llevError, "%s\n", dump);
		1109	free (dump);
1267	}	1110	}
1268		1111
1269	tmp->contr->socket.update_look = 1;	1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1270	}
1271	/* See if player moving off should effect something */
1272	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1273	{	1113	}
1274	move_apply (tmp, op, NULL);
1275		1114
1276	if (was_destroyed (op, tag))	1115	above = 0;
		1116	below = 0;
		1117
		1118	if (map->in_memory == MAP_SAVING)
		1119	return;
		1120
		1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1122
		1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1124	{
		1125	/* No point updating the players look faces if he is the object
		1126	* being removed.
		1127	*/
		1128
		1129	if (tmp->type == PLAYER && tmp != this)
1277	{	1130	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1131	/* If a container that the player is currently using somehow gets
		1132	* removed (most likely destroyed), update the player view
		1133	* appropriately.
		1134	*/
		1135	if (tmp->container == this)
		1136	{
		1137	CLEAR_FLAG (this, FLAG_APPLIED);
		1138	tmp->container = 0;
		1139	}
		1140
		1141	tmp->contr->socket->floorbox_update ();
1279	}	1142	}
		1143
		1144	/* See if player moving off should effect something */
		1145	if (check_walk_off
		1146	&& ((move_type & tmp->move_off)
		1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1148	{
		1149	move_apply (tmp, this, 0, false);
		1150
		1151	if (destroyed ())
		1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1153	}
1281		1154
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1156
1284	if (tmp->above == tmp)	1157	if (tmp->above == tmp)
1285	tmp->above = NULL;	1158	tmp->above = 0;
1286		1159
1287	last = tmp;	1160	last = tmp;
1288	}	1161	}
1289		1162
1290	/* last == NULL of there are no objects on this space */	1163	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1164	if (!last)
1292	{	1165	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* 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
1295	* 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
1296	* be correct anyways.	1169	* be correct anyways.
1297	*/	1170	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1172	update_position (map, x, y);
1300	}	1173	}
1301	else	1174	else
1302	update_object (last, UP_OBJ_REMOVE);	1175	update_object (last, UP_OBJ_REMOVE);
1303		1176
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1305	update_all_los (op->map, op->x, op->y);	1178	update_all_los (map, x, y);
		1179	}
1306	}	1180	}
1307		1181
1308	/*	1182	/*
1309	* merge_ob(op,top):	1183	* merge_ob(op,top):
1310	*	1184	*
1311	* This function goes through all objects below and including top, and	1185	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1186	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1187	* If top is NULL, it is calculated.
1314	* 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
1315	*/	1189	*/
1316
1317	object *	1190	object *
1318	merge_ob (object *op, object *top)	1191	merge_ob (object *op, object *top)
1319	{	1192	{
1320	if (!op->nrof)	1193	if (!op->nrof)
1321	return 0;	1194	return 0;
		1195
1322	if (top == NULL)	1196	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1197	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1198
1324	for (; top != NULL; top = top->below)	1199	for (; top != NULL; top = top->below)
1325	{	1200	{
1326	if (top == op)	1201	if (top == op)
1327	continue;	1202	continue;
1328	if (CAN_MERGE (op, top))	1203
		1204	if (object::can_merge (op, top))
1329	{	1205	{
1330	top->nrof += op->nrof;	1206	top->nrof += op->nrof;
1331		1207
1332	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1208	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1333	op->weight = 0; /* Don't want any adjustements now */	1209	op->weight = 0; /* Don't want any adjustements now */
1334	remove_ob (op);	1210	op->destroy ();
1335	free_object (op);
1336	return top;	1211	return top;
1337	}	1212	}
1338	}	1213	}
		1214
1339	return NULL;	1215	return 0;
1340	}	1216	}
1341		1217
1342	/*	1218	/*
1343	* 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
1344	* job preparing multi-part monsters	1220	* job preparing multi-part monsters
1345	*/	1221	*/
1346	object *	1222	object *
1347	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)
1348	{	1224	{
1349	object *	1225	object *tmp;
1350	tmp;
1351		1226
1352	if (op->head)	1227	if (op->head)
1353	op = op->head;	1228	op = op->head;
		1229
1354	for (tmp = op; tmp; tmp = tmp->more)	1230	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1231	{
1356	tmp->x = x + tmp->arch->clone.x;	1232	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1233	tmp->y = y + tmp->arch->clone.y;
1358	}	1234	}
		1235
1359	return insert_ob_in_map (op, m, originator, flag);	1236	return insert_ob_in_map (op, m, originator, flag);
1360	}	1237	}
1361		1238
1362	/*	1239	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1240	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1256	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1257	* just 'op' otherwise
1381	*/	1258	*/
1382		1259
1383	object *	1260	object *
1384	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)
1385	{	1262	{
1386	object *tmp, *top, *floor = NULL;	1263	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1264	sint16 x, y;
1388		1265
1389	if (QUERY_FLAG (op, FLAG_FREED))	1266	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1392	return NULL;	1269	return NULL;
1393	}	1270	}
1394		1271
1395	if (m == NULL)	1272	if (m == NULL)
1396	{	1273	{
1397	dump_object (op);	1274	char *dump = dump_object (op);
1398	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);
1399	return op;	1277	return op;
1400	}	1278	}
1401		1279
1402	if (out_of_map (m, op->x, op->y))	1280	if (out_of_map (m, op->x, op->y))
1403	{	1281	{
1404	dump_object (op);	1282	char *dump = dump_object (op);
1405	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);
1406	#ifdef MANY_CORES	1284	#ifdef MANY_CORES
1407	/* 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
1408	* 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
1409	* improperly inserted.	1287	* improperly inserted.
1410	*/	1288	*/
1411	abort ();	1289	abort ();
1412	#endif	1290	#endif
		1291	free (dump);
1413	return op;	1292	return op;
1414	}	1293	}
1415		1294
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1296	{
1418	dump_object (op);	1297	char *dump = dump_object (op);
1419	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);
1420	return op;	1300	return op;
1421	}	1301	}
1422		1302
1423	if (op->more != NULL)	1303	if (op->more != NULL)
1424	{	1304	{
…		…
1462		1342
1463	/* this has to be done after we translate the coordinates.	1343	/* this has to be done after we translate the coordinates.
1464	*/	1344	*/
1465	if (op->nrof && !(flag & INS_NO_MERGE))	1345	if (op->nrof && !(flag & INS_NO_MERGE))
1466	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)
1467	if (CAN_MERGE (op, tmp))	1347	if (object::can_merge (op, tmp))
1468	{	1348	{
1469	op->nrof += tmp->nrof;	1349	op->nrof += tmp->nrof;
1470	remove_ob (tmp);	1350	tmp->destroy ();
1471	free_object (tmp);
1472	}	1351	}
1473		1352
1474	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 */
1475	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1476		1355
…		…
1604	* it, so save a few ticks and start from there.	1483	* it, so save a few ticks and start from there.
1605	*/	1484	*/
1606	if (!(flag & INS_MAP_LOAD))	1485	if (!(flag & INS_MAP_LOAD))
1607	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)
1608	if (tmp->type == PLAYER)	1487	if (tmp->type == PLAYER)
1609	tmp->contr->socket.update_look = 1;	1488	tmp->contr->socket->floorbox_update ();
1610		1489
1611	/* If this object glows, it may affect lighting conditions that are	1490	/* If this object glows, it may affect lighting conditions that are
1612	* 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
1613	* 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
1614	* on the map will get recalculated. The players could very well	1493	* on the map will get recalculated. The players could very well
…		…
1622		1501
1623	/* updates flags (blocked, alive, no magic, etc) for this map space */	1502	/* updates flags (blocked, alive, no magic, etc) for this map space */
1624	update_object (op, UP_OBJ_INSERT);	1503	update_object (op, UP_OBJ_INSERT);
1625		1504
1626	/* 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,
1627	* we want to have update_look set above before calling this.	1506	* we want to have floorbox_update called before calling this.
1628	*	1507	*
1629	* check_move_on() must be after this because code called from	1508	* check_move_on() must be after this because code called from
1630	* check_move_on() depends on correct map flags (so functions like	1509	* check_move_on() depends on correct map flags (so functions like
1631	* blocked() and wall() work properly), and these flags are updated by	1510	* blocked() and wall() work properly), and these flags are updated by
1632	* update_object().	1511	* update_object().
…		…
1654	* op is the object to insert it under: supplies x and the map.	1533	* op is the object to insert it under: supplies x and the map.
1655	*/	1534	*/
1656	void	1535	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1536	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1537	{
1659	object *tmp;	1538	object *
		1539	tmp;
1660	object *tmp1;	1540	object *
		1541	tmp1;
1661		1542
1662	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1663		1544
1664	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)
1665	{
1666	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1667	{	1547	tmp->destroy ();
1668	remove_ob (tmp);
1669	free_object (tmp);
1670	}
1671	}
1672		1548
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1549	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1550
1675	tmp1->x = op->x;	1551	tmp1->x = op->x;
1676	tmp1->y = op->y;	1552	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1553	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1554	}
…		…
1686	*/	1562	*/
1687		1563
1688	object *	1564	object *
1689	get_split_ob (object *orig_ob, uint32 nr)	1565	get_split_ob (object *orig_ob, uint32 nr)
1690	{	1566	{
1691	object *	1567	object *newob;
1692	newob;
1693	int
1694	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1695		1569
1696	if (orig_ob->nrof < nr)	1570	if (orig_ob->nrof < nr)
1697	{	1571	{
1698	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);
1699	return NULL;	1573	return NULL;
1700	}	1574	}
		1575
1701	newob = object_create_clone (orig_ob);	1576	newob = object_create_clone (orig_ob);
		1577
1702	if ((orig_ob->nrof -= nr) < 1)	1578	if ((orig_ob->nrof -= nr) < 1)
1703	{	1579	orig_ob->destroy (1);
1704	if (!is_removed)
1705	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);
1707	}
1708	else if (!is_removed)	1580	else if (!is_removed)
1709	{	1581	{
1710	if (orig_ob->env != NULL)	1582	if (orig_ob->env != NULL)
1711	sub_weight (orig_ob->env, orig_ob->weight * nr);	1583	sub_weight (orig_ob->env, orig_ob->weight * nr);
1712	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)
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1586	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1587	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1588	return NULL;
1717	}	1589	}
1718	}	1590	}
		1591
1719	newob->nrof = nr;	1592	newob->nrof = nr;
1720		1593
1721	return newob;	1594	return newob;
1722	}	1595	}
1723		1596
…		…
1730	*/	1603	*/
1731		1604
1732	object *	1605	object *
1733	decrease_ob_nr (object *op, uint32 i)	1606	decrease_ob_nr (object *op, uint32 i)
1734	{	1607	{
1735	object *	1608	object *tmp;
1736	tmp;
1737	player *	1609	player *pl;
1738	pl;
1739		1610
1740	if (i == 0) /* objects with op->nrof require this check */	1611	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1612	return op;
1742		1613
1743	if (i > op->nrof)	1614	if (i > op->nrof)
1744	i = op->nrof;	1615	i = op->nrof;
1745		1616
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1617	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1618	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1619	else if (op->env != NULL)
1751	{	1620	{
1752	/* is this object in the players inventory, or sub container	1621	/* is this object in the players inventory, or sub container
1753	* therein?	1622	* therein?
1754	*/	1623	*/
…		…
1779	esrv_send_item (tmp, op);	1648	esrv_send_item (tmp, op);
1780	}	1649	}
1781	}	1650	}
1782	else	1651	else
1783	{	1652	{
1784	remove_ob (op);	1653	op->remove ();
1785	op->nrof = 0;	1654	op->nrof = 0;
1786	if (tmp)	1655	if (tmp)
1787	{	1656	{
1788	esrv_del_item (tmp->contr, op->count);	1657	esrv_del_item (tmp->contr, op->count);
1789	}	1658	}
1790	}	1659	}
1791	}	1660	}
1792	else	1661	else
1793	{	1662	{
1794	object *
1795	above = op->above;	1663	object *above = op->above;
1796		1664
1797	if (i < op->nrof)	1665	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1666	op->nrof -= i;
1800	}
1801	else	1667	else
1802	{	1668	{
1803	remove_ob (op);	1669	op->remove ();
1804	op->nrof = 0;	1670	op->nrof = 0;
1805	}	1671	}
		1672
1806	/* Since we just removed op, op->above is null */	1673	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1674	for (tmp = above; tmp != NULL; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1675	if (tmp->type == PLAYER)
1809	{	1676	{
1810	if (op->nrof)	1677	if (op->nrof)
…		…
1813	esrv_del_item (tmp->contr, op->count);	1680	esrv_del_item (tmp->contr, op->count);
1814	}	1681	}
1815	}	1682	}
1816		1683
1817	if (op->nrof)	1684	if (op->nrof)
1818	{
1819	return op;	1685	return op;
1820	}
1821	else	1686	else
1822	{	1687	{
1823	free_object (op);	1688	op->destroy ();
1824	return NULL;	1689	return NULL;
1825	}	1690	}
1826	}	1691	}
1827		1692
1828	/*	1693	/*
…		…
1834	add_weight (object *op, signed long weight)	1699	add_weight (object *op, signed long weight)
1835	{	1700	{
1836	while (op != NULL)	1701	while (op != NULL)
1837	{	1702	{
1838	if (op->type == CONTAINER)	1703	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1704	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1705
1842	op->carrying += weight;	1706	op->carrying += weight;
1843	op = op->env;	1707	op = op->env;
1844	}	1708	}
1845	}	1709	}
1846		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
1847	/*	1731	/*
1848	* insert_ob_in_ob(op,environment):	1732	* env->insert (op)
1849	* This function inserts the object op in the linked list	1733	* This function inserts the object op in the linked list
1850	* inside the object environment.	1734	* inside the object environment.
1851	*	1735	*
1852	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1853	* the inventory at the last position or next to other objects of the same
1854	* type.
1855	* Frank: Now sorted by type, archetype and magic!
1856	*
1857	* 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
1858	* be != op, if items are merged. -Tero	1737	* be != op, if items are merged. -Tero
1859	*/	1738	*/
1860		1739
1861	object *	1740	object *
1862	insert_ob_in_ob (object *op, object *where)	1741	object::insert (object *op)
1863	{	1742	{
1864	object *	1743	object *tmp, *otmp;
1865	tmp, *
1866	otmp;
1867		1744
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1745	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1746	op->remove ();
1870	dump_object (op);	1747
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872	return op;
1873	}
1874	if (where == NULL)
1875	{
1876	dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878	return op;
1879	}
1880	if (where->head)
1881	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;
1884	}
1885	if (op->more)	1748	if (op->more)
1886	{	1749	{
1887	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);
1888	return op;	1751	return op;
1889	}	1752	}
		1753
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1754	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1755	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1756	if (op->nrof)
1893	{	1757	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1758	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1895	if (CAN_MERGE (tmp, op))	1759	if (object::can_merge (tmp, op))
1896	{	1760	{
1897	/* return the original object and remove inserted object	1761	/* return the original object and remove inserted object
1898	(client needs the original object) */	1762	(client needs the original object) */
1899	tmp->nrof += op->nrof;	1763	tmp->nrof += op->nrof;
1900	/* Weight handling gets pretty funky. Since we are adding to	1764	/* Weight handling gets pretty funky. Since we are adding to
1901	* tmp->nrof, we need to increase the weight.	1765	* tmp->nrof, we need to increase the weight.
1902	*/	1766	*/
1903	add_weight (where, op->weight * op->nrof);	1767	add_weight (this, op->weight * op->nrof);
1904	SET_FLAG (op, FLAG_REMOVED);	1768	SET_FLAG (op, FLAG_REMOVED);
1905	free_object (op); /* free the inserted object */	1769	op->destroy (); /* free the inserted object */
1906	op = tmp;	1770	op = tmp;
1907	remove_ob (op); /* and fix old object's links */	1771	op->remove (); /* and fix old object's links */
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1772	CLEAR_FLAG (op, FLAG_REMOVED);
1909	break;	1773	break;
1910	}	1774	}
1911		1775
1912	/* I assume combined objects have no inventory	1776	/* I assume combined objects have no inventory
1913	* We add the weight - this object could have just been removed	1777	* We add the weight - this object could have just been removed
1914	* (if it was possible to merge). calling remove_ob will subtract	1778	* (if it was possible to merge). calling remove_ob will subtract
1915	* 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
1916	* the linking below	1780	* the linking below
1917	*/	1781	*/
1918	add_weight (where, op->weight * op->nrof);	1782	add_weight (this, op->weight * op->nrof);
1919	}	1783	}
1920	else	1784	else
1921	add_weight (where, (op->weight + op->carrying));	1785	add_weight (this, (op->weight + op->carrying));
1922		1786
1923	otmp = is_player_inv (where);	1787	otmp = is_player_inv (this);
1924	if (otmp && otmp->contr != NULL)	1788	if (otmp && otmp->contr)
1925	{
1926	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1789	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1927	fix_player (otmp);	1790	fix_player (otmp);
1928	}
1929		1791
1930	op->map = NULL;	1792	op->map = NULL;
1931	op->env = where;	1793	op->env = this;
1932	op->above = NULL;	1794	op->above = NULL;
1933	op->below = NULL;	1795	op->below = NULL;
1934	op->x = 0, op->y = 0;	1796	op->x = 0, op->y = 0;
1935		1797
1936	/* 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 */
1937	if ((op->glow_radius != 0) && where->map)	1799	if ((op->glow_radius != 0) && map)
1938	{	1800	{
1939	#ifdef DEBUG_LIGHTS	1801	#ifdef DEBUG_LIGHTS
1940	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);
1941	#endif /* DEBUG_LIGHTS */	1803	#endif /* DEBUG_LIGHTS */
1942	if (MAP_DARKNESS (where->map))	1804	if (MAP_DARKNESS (map))
1943	update_all_los (where->map, where->x, where->y);	1805	update_all_los (map, x, y);
1944	}	1806	}
1945		1807
1946	/* 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.
1947	* It sure simplifies this function...	1809	* It sure simplifies this function...
1948	*/	1810	*/
1949	if (where->inv == NULL)	1811	if (!inv)
1950	where->inv = op;	1812	inv = op;
1951	else	1813	else
1952	{	1814	{
1953	op->below = where->inv;	1815	op->below = inv;
1954	op->below->above = op;	1816	op->below->above = op;
1955	where->inv = op;	1817	inv = op;
1956	}	1818	}
		1819
1957	return op;	1820	return op;
1958	}	1821	}
1959		1822
1960	/*	1823	/*
1961	* Checks if any objects has a move_type that matches objects	1824	* Checks if any objects has a move_type that matches objects
…		…
1980		1843
1981	int	1844	int
1982	check_move_on (object *op, object *originator)	1845	check_move_on (object *op, object *originator)
1983	{	1846	{
1984	object *tmp;	1847	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1848	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1849	int x = op->x, y = op->y;
1988		1850
1989	MoveType move_on, move_slow, move_block;	1851	MoveType move_on, move_slow, move_block;
1990		1852
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1853	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1854	return 0;
1993
1994	tag = op->count;
1995		1855
1996	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);
1997	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);
1998	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);
1999		1859
…		…
2042	{	1902	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1903	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2044	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1904	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1905	{
2046		1906
		1907	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1908	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1909
2049	if (op->type == PLAYER)	1910	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1911	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1912	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1913	diff /= 4.0;
…		…
2057		1918
2058	/* Basically same logic as above, except now for actual apply. */	1919	/* Basically same logic as above, except now for actual apply. */
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1920	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2060	((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))
2061	{	1922	{
2062	move_apply (tmp, op, originator);	1923	move_apply (tmp, op, originator, true);
2063		1924
2064	if (was_destroyed (op, tag))	1925	if (op->destroyed ())
2065	return 1;	1926	return 1;
2066		1927
2067	/* what the person/creature stepped onto has moved the object	1928	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1929	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1930	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	1942	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1943	* The first matching object is returned, or NULL if none.
2083	*/	1944	*/
2084		1945
2085	object *	1946	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1947	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1948	{
2088	object *	1949	object *
2089	tmp;	1950	tmp;
2090		1951
2091	if (m == NULL || out_of_map (m, x, y))	1952	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	1965	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	1966	* The first matching object is returned, or NULL if none.
2106	*/	1967	*/
2107		1968
2108	object *	1969	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	1970	present (unsigned char type, maptile *m, int x, int y)
2110	{	1971	{
2111	object *	1972	object *
2112	tmp;	1973	tmp;
2113		1974
2114	if (out_of_map (m, x, y))	1975	if (out_of_map (m, x, y))
…		…
2254	* 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
2255	* customized, changed states, etc.	2116	* customized, changed states, etc.
2256	*/	2117	*/
2257		2118
2258	int	2119	int
2259	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)
2260	{	2121	{
2261	int	2122	int
2262	i,	2123	i,
2263	index = 0, flag;	2124	index = 0, flag;
2264	static int	2125	static int
…		…
2285	return -1;	2146	return -1;
2286	return altern[RANDOM () % index];	2147	return altern[RANDOM () % index];
2287	}	2148	}
2288		2149
2289	/*	2150	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2151	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2152	* find_free_spot(), but it will search max number of squares.
2292	* 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.
2293	* 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.
2294	*/	2155	*/
2295		2156
2296	int	2157	int
2297	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)
2298	{	2159	{
2299	int	2160	int
2300	i;	2161	i;
2301		2162
2302	for (i = 0; i < SIZEOFFREE; i++)	2163	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* 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
2367	* there is capable of.	2228	* there is capable of.
2368	*/	2229	*/
2369		2230
2370	int	2231	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2232	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2233	{
2373	int	2234	int
2374	i,	2235	i,
2375	max = SIZEOFFREE, mflags;	2236	max = SIZEOFFREE, mflags;
2376	sint16	2237
2377	nx,	2238	sint16 nx, ny;
2378	ny;
2379	object *	2239	object *
2380	tmp;	2240	tmp;
2381	mapstruct *	2241	maptile *
2382	mp;	2242	mp;
2383	MoveType	2243
2384	blocked,	2244	MoveType blocked, move_type;
2385	move_type;
2386		2245
2387	if (exclude && exclude->head)	2246	if (exclude && exclude->head)
2388	{	2247	{
2389	exclude = exclude->head;	2248	exclude = exclude->head;
2390	move_type = exclude->move_type;	2249	move_type = exclude->move_type;
…		…
2595	* Modified to be map tile aware -.MSW	2454	* Modified to be map tile aware -.MSW
2596	*/	2455	*/
2597		2456
2598		2457
2599	int	2458	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2459	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2460	{
2602	sint16	2461	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2462	int
2606	mflags;	2463	mflags;
2607		2464
2608	if (dir < 0)	2465	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2466	return 0; /* exit condition: invalid direction */
…		…
2656	* create clone from object to another	2513	* create clone from object to another
2657	*/	2514	*/
2658	object *	2515	object *
2659	object_create_clone (object *asrc)	2516	object_create_clone (object *asrc)
2660	{	2517	{
2661	object *
2662	dst = NULL, *tmp, *src, *part, *prev, *item;	2518	object *dst = 0, *tmp, *src, *part, *prev, *item;
2663		2519
2664	if (!asrc)	2520	if (!asrc)
2665	return NULL;	2521	return 0;
		2522
2666	src = asrc;	2523	src = asrc;
2667	if (src->head)	2524	if (src->head)
2668	src = src->head;	2525	src = src->head;
2669		2526
2670	prev = NULL;	2527	prev = 0;
2671	for (part = src; part; part = part->more)	2528	for (part = src; part; part = part->more)
2672	{	2529	{
2673	tmp = get_object ();	2530	tmp = part->clone ();
2674	copy_object (part, tmp);
2675	tmp->x -= src->x;	2531	tmp->x -= src->x;
2676	tmp->y -= src->y;	2532	tmp->y -= src->y;
		2533
2677	if (!part->head)	2534	if (!part->head)
2678	{	2535	{
2679	dst = tmp;	2536	dst = tmp;
2680	tmp->head = NULL;	2537	tmp->head = 0;
2681	}	2538	}
2682	else	2539	else
2683	{	2540	{
2684	tmp->head = dst;	2541	tmp->head = dst;
2685	}	2542	}
		2543
2686	tmp->more = NULL;	2544	tmp->more = 0;
		2545
2687	if (prev)	2546	if (prev)
2688	prev->more = tmp;	2547	prev->more = tmp;
		2548
2689	prev = tmp;	2549	prev = tmp;
2690	}	2550	}
2691		2551
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2552	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2553	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2554
2698	return dst;	2555	return dst;
2699	}	2556	}
2700		2557
2701	/* return true if the object was destroyed, 0 otherwise */
2702	int
2703	was_destroyed (const object *op, tag_t old_tag)
2704	{
2705	/* checking for FLAG_FREED isn't necessary, but makes this function more
2706	* robust */
2707	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2708	}
2709
2710	/* GROS - Creates an object using a string representing its content. */	2558	/* GROS - Creates an object using a string representing its content. */
2711
2712	/* 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 */
2713
2714	/* 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, */
2715
2716	/* 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. */
2717
2718	/* 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. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2563	/* Also remember that multiparts objects are not supported for now. */
2721		2564
2722	object *	2565	object *
2723	load_object_str (const char *obstr)	2566	load_object_str (const char *obstr)
2724	{	2567	{
2725	object *	2568	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2569	char filename[MAX_BUF];
2729		2570
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2571	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2572
2732	FILE *
2733	tempfile = fopen (filename, "w");	2573	FILE *tempfile = fopen (filename, "w");
2734		2574
2735	if (tempfile == NULL)	2575	if (tempfile == NULL)
2736	{	2576	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2577	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2578	return NULL;
2739	};	2579	}
		2580
2740	fprintf (tempfile, obstr);	2581	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2582	fclose (tempfile);
2742		2583
2743	op = get_object ();	2584	op = object::create ();
2744		2585
2745	object_thawer	2586	object_thawer thawer (filename);
2746	thawer (filename);
2747		2587
2748	if (thawer)	2588	if (thawer)
2749	load_object (thawer, op, 0);	2589	load_object (thawer, op, 0);
2750		2590
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2591	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2599	* returns NULL if no match.
2760	*/	2600	*/
2761	object *	2601	object *
2762	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)
2763	{	2603	{
2764	object *	2604	object *tmp;
2765	tmp;
2766		2605
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2606	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2607	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2608	return tmp;
2770		2609
…		…
2778	* do the desired thing.	2617	* do the desired thing.
2779	*/	2618	*/
2780	key_value *	2619	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2620	get_ob_key_link (const object *ob, const char *key)
2782	{	2621	{
2783	key_value *	2622	key_value *link;
2784	link;
2785		2623
2786	for (link = ob->key_values; link != NULL; link = link->next)	2624	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2625	if (link->key == key)
2789	{
2790	return link;	2626	return link;
2791	}
2792	}
2793		2627
2794	return NULL;	2628	return NULL;
2795	}	2629	}
2796		2630
2797	/*	2631	/*
…		…
2802	* The returned string is shared.	2636	* The returned string is shared.
2803	*/	2637	*/
2804	const char *	2638	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2639	get_ob_key_value (const object *op, const char *const key)
2806	{	2640	{
2807	key_value *	2641	key_value *link;
2808	link;	2642	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2643
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2644	if (!canonical_key)
2815	{	2645	{
2816	/* 1. There being a field named key on any object	2646	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2647	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2648	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2649	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2650	*/
2821	return NULL;	2651	return 0;
2822	}	2652	}
2823		2653
2824	/* This is copied from get_ob_key_link() above -	2654	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2655	* only 4 lines, and saves the function call overhead.
2826	*/	2656	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2657	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2658	if (link->key == canonical_key)
2830	{
2831	return link->value;	2659	return link->value;
2832	}	2660
2833	}
2834	return NULL;	2661	return 0;
2835	}	2662	}
2836		2663
2837		2664
2838	/*	2665	/*
2839	* Updates the canonical_key in op to value.	2666	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2702	if (last)
2876	last->next = field->next;	2703	last->next = field->next;
2877	else	2704	else
2878	op->key_values = field->next;	2705	op->key_values = field->next;
2879		2706
2880	delete
2881	field;	2707	delete field;
2882	}	2708	}
2883	}	2709	}
2884	return TRUE;	2710	return TRUE;
2885	}	2711	}
2886	/* IF we get here, key doesn't exist */	2712	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2747	* Returns TRUE on success.
2922	*/	2748	*/
2923	int	2749	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2750	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2751	{
2926	shstr
2927	key_ (key);	2752	shstr key_ (key);
2928		2753
2929	return set_ob_key_value_s (op, key_, value, add_key);	2754	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2755	}
		2756
		2757	object::depth_iterator::depth_iterator (object *container)
		2758	: iterator_base (container)
		2759	{
		2760	while (item->inv)
		2761	item = item->inv;
		2762	}
		2763
		2764	void
		2765	object::depth_iterator::next ()
		2766	{
		2767	if (item->below)
		2768	{
		2769	item = item->below;
		2770
		2771	while (item->inv)
		2772	item = item->inv;
		2773	}
		2774	else
		2775	item = item->env;
		2776	}
		2777
		2778	// return a suitable string describing an objetc in enough detail to find it
		2779	const char *
		2780	object::debug_desc (char *info) const
		2781	{
		2782	char info2[256 * 3];
		2783	char *p = info;
		2784
		2785	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2786	count,
		2787	&name,
		2788	title ? " " : "",
		2789	title ? (const char *)title : "");
		2790
		2791	if (env)
		2792	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2793
		2794	if (map)
		2795	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2796
		2797	return info;
		2798	}
		2799
		2800	const char *
		2801	object::debug_desc () const
		2802	{
		2803	static char info[256 * 3];
		2804	return debug_desc (info);
		2805	}
		2806

Diff Legend

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