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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.73 by root, Wed Dec 20 01:19:11 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.26 2006/09/11 11:46:52 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
22		16
23	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
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	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>
28	*/	22	*/
29		23
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
32	variable. */	26	variable. */
33	#include <global.h>	27	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	28	#include <stdio.h>
36	# include <sys/types.h>	29	#include <sys/types.h>
37	# include <sys/uio.h>	30	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	31	#include <object.h>
40	#include <funcpoint.h>	32	#include <funcpoint.h>
41	#include <skills.h>
42	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
		38	static UUID uuid;
		39	const uint64 UUID_SKIP = 1<<19;
44		40
45	object *objects; /* Pointer to the list of used objects */
46	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 */
47		42
48	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,
49	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
50	};	45	};
…		…
57	int freedir[SIZEOFFREE] = {	52	int freedir[SIZEOFFREE] = {
58	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,
59	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
60	};	55	};
61		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
62	/* 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. */
63	static int	135	static int
64	compare_ob_value_lists_one (const object *wants, const object *has)	136	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	137	{
66	key_value *wants_field;	138	key_value *wants_field;
…		…
113	*	185	*
114	* 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
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
117	*	189	*
118	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
119	*	191	*
120	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
121	* check weight	193	* check weight
122	*/	194	*/
123		195
124	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	197	{
126	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
127	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)
128	return 0;	204	return 0;
129		205
130	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
131	return 0;
132
133	/* 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
134	* 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
135	* used to store nrof).	209	* used to store nrof).
136	*/	210	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
147	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
148		222
149	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
150	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
151		225
152		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
153	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
154	* being locked in inventory should prevent merging.
155	* 0x4 in flags3 is CLIENT_SENT
156	*/
157	if ((ob1->arch != ob2->arch) ||
158	(ob1->flags[0] != ob2->flags[0]) ||
159	(ob1->flags[1] != ob2->flags[1]) ||
160	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
161	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
162	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
163	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
164	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
165	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
166	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
167	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
168	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
169	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
170	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
171	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
172	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
173	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
174	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
175	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
176	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
177	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
178	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
179	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
180	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
181	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
182	(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)
183	return 0;	251	return 0;
184		252
185	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
186	* check all objects in the inventory.	254	* check all objects in the inventory.
187	*/	255	*/
…		…
190	/* 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 */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;	260	return 0;
193		261
194	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
196	return 0;	264	return 0;
197		265
198	/* 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
199	* if it is valid.	267	* if it is valid.
200	*/	268	*/
…		…
214	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)
215	return 0;	283	return 0;
216		284
217	switch (ob1->type)	285	switch (ob1->type)
218	{	286	{
219	case SCROLL:	287	case SCROLL:
220	if (ob1->level != ob2->level)	288	if (ob1->level != ob2->level)
221	return 0;	289	return 0;
222	break;	290	break;
223	}	291	}
224		292
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	293	if (ob1->key_values != NULL || ob2->key_values != NULL)
226	{	294	{
227	/* At least one of these has key_values. */	295	/* At least one of these has key_values. */
…		…
249	/*	317	/*
250	* sum_weight() is a recursive function which calculates the weight	318	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	319	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	320	* containers are carrying, and sums it up.
253	*/	321	*/
254	signed long	322	long
255	sum_weight (object *op)	323	sum_weight (object *op)
256	{	324	{
257	signed long sum;	325	long sum;
258	object *inv;	326	object *inv;
259		327
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	329	{
262	if (inv->inv)	330	if (inv->inv)
263	sum_weight (inv);	331	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	333	}
		334
266	if (op->type == CONTAINER && op->stats.Str)	335	if (op->type == CONTAINER && op->stats.Str)
267	sum = (sum * (100 - op->stats.Str)) / 100;	336	sum = (sum * (100 - op->stats.Str)) / 100;
		337
268	if (op->carrying != sum)	338	if (op->carrying != sum)
269	op->carrying = sum;	339	op->carrying = sum;
		340
270	return sum;	341	return sum;
271	}	342	}
272		343
273	/**	344	/**
274	* Return the outermost environment object for a given object.	345	* Return the outermost environment object for a given object.
…		…
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	373	* Some error messages.
303	* 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.
304	*/	375	*/
305		376
306	void	377	char *
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}
355
356	/*
357	* Dumps an object. Returns output in the static global errmsg array.
358	*/
359
360	void
361	dump_object (object *op)	378	dump_object (object *op)
362	{	379	{
363	if (op == NULL)	380	if (!op)
364	{	381	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		382
372	void	383	object_freezer freezer;
373	dump_all_objects (void)	384	save_object (freezer, op, 3);
374	{	385	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	386	}
383		387
384	/*	388	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	390	* multi-object 1 which is closest to the second object.
…		…
406	*/	410	*/
407		411
408	object *	412	object *
409	find_object (tag_t i)	413	find_object (tag_t i)
410	{	414	{
411	object *op;	415	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	416	if (op->count == i)
415	break;	417	return op;
		418
416	return op;	419	return 0;
417	}	420	}
418		421
419	/*	422	/*
420	* 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.
421	* Used only by the patch command, but not all that useful.	424	* Used only by the patch command, but not all that useful.
…		…
423	*/	426	*/
424		427
425	object *	428	object *
426	find_object_name (const char *str)	429	find_object_name (const char *str)
427	{	430	{
428	const char *name = shstr::find (str);	431	shstr_cmp str_ (str);
429	object *op;	432	object *op;
430		433
431	for (op = objects; op != NULL; op = op->next)	434	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	435	if (op->name == str_)
433	break;	436	break;
434		437
435	return op;	438	return op;
436	}	439	}
437		440
…		…
440	{	443	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	444	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	445	}
443		446
444	/*	447	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}
481
482	/*
483	* 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
484	* skill and experience objects.	449	* skill and experience objects.
485	*/	450	*/
486	void	451	void
487	set_owner (object *op, object *owner)	452	object::set_owner (object *owner)
488	{	453	{
489	if (owner == NULL || op == NULL)	454	if (!owner)
490	return;	455	return;
491		456
492	/* next line added to allow objects which own objects */	457	/* next line added to allow objects which own objects */
493	/* 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
494	* with the fireball owning a poison cloud which then owned the	459	* with the fireball owning a poison cloud which then owned the
495	* 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
496	* freed and then another object replacing it. Since the ownercounts	461	* freed and then another object replacing it. Since the ownercounts
497	* 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.
498	*/	463	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	464	while (owner->owner)
500	owner = owner->owner;	465	owner = owner->owner;
501		466
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	467	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object *op, object *clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	468	}
542		469
543	/* Zero the key_values on op, decrementing the shared-string	470	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	471	* refcounts and freeing the links.
545	*/	472	*/
…		…
561	{	488	{
562	attachable_base::clear ();	489	attachable_base::clear ();
563		490
564	free_key_values (this);	491	free_key_values (this);
565		492
566	clear_owner (this);	493	owner = 0;
567
568	name = 0;	494	name = 0;
569	name_pl = 0;	495	name_pl = 0;
570	title = 0;	496	title = 0;
571	race = 0;	497	race = 0;
572	slaying = 0;	498	slaying = 0;
573	skill = 0;	499	skill = 0;
574	msg = 0;	500	msg = 0;
575	lore = 0;	501	lore = 0;
576	custom_name = 0;	502	custom_name = 0;
577	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;
578		515
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		517
581	SET_FLAG (this, FLAG_REMOVED);	518	SET_FLAG (this, FLAG_REMOVED);
582	}
583		519
584	void object::clone (object *destination)
585	{
586	*(object_copy *) destination = *this;
587	*(object_pod *) destination = *this;
588
589	if (self || cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */	520	/* What is not cleared is next, prev, and count */
616		521
617	op->expmul = 1.0;	522	expmul = 1.0;
618	op->face = blank_face;	523	face = blank_face;
619	op->attacked_by_count = -1;
620		524
621	if (settings.casting_time)	525	if (settings.casting_time)
622	op->casting_time = -1;	526	casting_time = -1;
623	}	527	}
624		528
625	/*	529	/*
626	* copy object first frees everything allocated by the second object,	530	* copy_to first frees everything allocated by the dst object,
627	* and then copies the contends of the first object into the second	531	* and then copies the contents of itself into the second
628	* object, allocating what needs to be allocated. Basically, any	532	* object, allocating what needs to be allocated. Basically, any
629	* 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,
630	* 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
631	* will point at garbage.	535	* will point at garbage.
632	*/	536	*/
633
634	void	537	void
635	copy_object (object *op2, object *op)	538	object::copy_to (object *dst)
636	{	539	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
639		542
640	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));
641		548
642	if (is_freed)	549	if (is_freed)
643	SET_FLAG (op, FLAG_FREED);	550	SET_FLAG (dst, FLAG_FREED);
		551
644	if (is_removed)	552	if (is_removed)
645	SET_FLAG (op, FLAG_REMOVED);	553	SET_FLAG (dst, FLAG_REMOVED);
646		554
647	if (op2->speed < 0)	555	if (speed < 0)
648	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
649		557
650	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
651	if (op2->key_values)	559	if (key_values)
652	{	560	{
653	key_value *tail = 0;	561	key_value *tail = 0;
654	key_value *i;	562	key_value *i;
655		563
656	op->key_values = 0;	564	dst->key_values = 0;
657		565
658	for (i = op2->key_values; i; i = i->next)	566	for (i = key_values; i; i = i->next)
659	{	567	{
660	key_value *new_link = new key_value;	568	key_value *new_link = new key_value;
661		569
662	new_link->next = 0;	570	new_link->next = 0;
663	new_link->key = i->key;	571	new_link->key = i->key;
664	new_link->value = i->value;	572	new_link->value = i->value;
665		573
666	/* Try and be clever here, too. */	574	/* Try and be clever here, too. */
667	if (!op->key_values)	575	if (!dst->key_values)
668	{	576	{
669	op->key_values = new_link;	577	dst->key_values = new_link;
670	tail = new_link;	578	tail = new_link;
671	}	579	}
672	else	580	else
673	{	581	{
674	tail->next = new_link;	582	tail->next = new_link;
675	tail = new_link;	583	tail = new_link;
676	}	584	}
677	}	585	}
678	}	586	}
679		587
680	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;
681	}	597	}
682		598
683	/*	599	/*
684	* 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
685	* 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
…		…
698	/*	614	/*
699	* 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
700	* 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.
701	* 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.
702	*/	618	*/
703
704	void	619	void
705	update_ob_speed (object *op)	620	update_ob_speed (object *op)
706	{	621	{
707	extern int arch_init;	622	extern int arch_init;
708		623
…		…
717	abort ();	632	abort ();
718	#else	633	#else
719	op->speed = 0;	634	op->speed = 0;
720	#endif	635	#endif
721	}	636	}
		637
722	if (arch_init)	638	if (arch_init)
723	{
724	return;	639	return;
725	}	640
726	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
727	{	642	{
728	/* If already on active list, don't do anything */	643	/* If already on active list, don't do anything */
729	if (op->active_next || op->active_prev || op == active_objects)	644	if (op->active_next || op->active_prev || op == active_objects)
730	return;	645	return;
731		646
732	/* process_events() expects us to insert the object at the beginning	647	/* process_events() expects us to insert the object at the beginning
733	* of the list. */	648	* of the list. */
734	op->active_next = active_objects;	649	op->active_next = active_objects;
		650
735	if (op->active_next != NULL)	651	if (op->active_next != NULL)
736	op->active_next->active_prev = op;	652	op->active_next->active_prev = op;
		653
737	active_objects = op;	654	active_objects = op;
738	}	655	}
739	else	656	else
740	{	657	{
741	/* If not on the active list, nothing needs to be done */	658	/* If not on the active list, nothing needs to be done */
…		…
743	return;	660	return;
744		661
745	if (op->active_prev == NULL)	662	if (op->active_prev == NULL)
746	{	663	{
747	active_objects = op->active_next;	664	active_objects = op->active_next;
		665
748	if (op->active_next != NULL)	666	if (op->active_next != NULL)
749	op->active_next->active_prev = NULL;	667	op->active_next->active_prev = NULL;
750	}	668	}
751	else	669	else
752	{	670	{
753	op->active_prev->active_next = op->active_next;	671	op->active_prev->active_next = op->active_next;
		672
754	if (op->active_next)	673	if (op->active_next)
755	op->active_next->active_prev = op->active_prev;	674	op->active_next->active_prev = op->active_prev;
756	}	675	}
		676
757	op->active_next = NULL;	677	op->active_next = NULL;
758	op->active_prev = NULL;	678	op->active_prev = NULL;
759	}	679	}
760	}	680	}
761		681
…		…
886	update_now = 1;	806	update_now = 1;
887		807
888	if ((move_slow | op->move_slow) != move_slow)	808	if ((move_slow | op->move_slow) != move_slow)
889	update_now = 1;	809	update_now = 1;
890	}	810	}
		811
891	/* if the object is being removed, we can't make intelligent	812	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	813	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	814	* that is being removed.
894	*/	815	*/
895	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	817	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	818	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	819	/* Nothing to do for that case */ ;
902	}
903	else	820	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	821	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		822
908	if (update_now)	823	if (update_now)
909	{	824	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	825	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	826	update_position (op->map, op->x, op->y);
…		…
913		828
914	if (op->more != NULL)	829	if (op->more != NULL)
915	update_object (op->more, action);	830	update_object (op->more, action);
916	}	831	}
917		832
918	static unordered_vector<object *> mortals;	833	object::vector object::mortals;
919	static std::vector<object *> freed;	834	object::vector object::objects; // not yet used
		835	object *object::first;
920		836
921	void object::free_mortals ()	837	void object::free_mortals ()
922	{	838	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	if (!(*i)->refcount)	840	if ((*i)->refcnt)
		841	++i; // further delay freeing
		842	else
925	{	843	{
926	freed.push_back (*i);	844	delete *i;
927	mortals.erase (i);	845	mortals.erase (i);
928	}	846	}
929	else
930	++i;
931	}	847	}
932		848
933	object::object ()	849	object::object ()
934	{	850	{
935	SET_FLAG (this, FLAG_REMOVED);	851	SET_FLAG (this, FLAG_REMOVED);
936		852
937	expmul = 1.0;	853	expmul = 1.0;
938	face = blank_face;	854	face = blank_face;
939	attacked_by_count = -1;
940	}	855	}
941		856
942	object::~object ()	857	object::~object ()
943	{	858	{
944	free_key_values (this);	859	free_key_values (this);
945	}	860	}
946		861
947	void object::link ()	862	void object::link ()
948	{	863	{
949	count = ++ob_count;	864	count = ++ob_count;
		865	uuid = gen_uuid ();
950		866
951	prev = 0;	867	prev = 0;
952	next = objects;	868	next = object::first;
953		869
954	if (objects)	870	if (object::first)
955	objects->prev = this;	871	object::first->prev = this;
956		872
957	objects = this;	873	object::first = this;
958	}	874	}
959		875
960	void object::unlink ()	876	void object::unlink ()
961	{	877	{
962	count = 0;	878	if (this == object::first)
		879	object::first = next;
963		880
964	/* Remove this object from the list of used objects */	881	/* Remove this object from the list of used objects */
965	if (prev)
966	{
967	prev->next = next;	882	if (prev) prev->next = next;
		883	if (next) next->prev = prev;
		884
968	prev = 0;	885	prev = 0;
969	}
970
971	if (next)
972	{
973	next->prev = prev;
974	next = 0;	886	next = 0;
975	}
976
977	if (this == objects)
978	objects = next;
979	}	887	}
980		888
981	object *object::create ()	889	object *object::create ()
982	{	890	{
983	object *op;
984
985	if (freed.empty ())
986	op = new object;	891	object *op = new object;
987	else
988	{
989	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();
991	op->~object ();
992	new ((void *)op) object;
993	}
994
995	op->link ();	892	op->link ();
996	return op;	893	return op;
997	}	894	}
998		895
999	/*	896	/*
…		…
1001	* 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
1002	* free objects. The IS_FREED() flag is set in the object.	899	* free objects. The IS_FREED() flag is set in the object.
1003	* The object must have been removed by remove_ob() first for	900	* The object must have been removed by remove_ob() first for
1004	* this function to succeed.	901	* this function to succeed.
1005	*	902	*
1006	* 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
1007	* inventory to the ground.	904	* inventory to the ground.
1008	*/	905	*/
1009	void object::free (bool free_inventory)	906	void object::destroy (bool destroy_inventory)
1010	{	907	{
		908	if (QUERY_FLAG (this, FLAG_FREED))
		909	return;
		910
		911	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		912	remove_friendly_object (this);
		913
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	914	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	915	remove ();
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		916
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);
1024	}
1025
1026	if (QUERY_FLAG (this, FLAG_FREED))	917	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		918
1033	if (more)	919	if (more)
1034	{	920	{
1035	more->free (free_inventory);	921	more->destroy (destroy_inventory);
1036	more = 0;	922	more = 0;
1037	}	923	}
1038		924
1039	if (inv)	925	if (inv)
1040	{	926	{
1041	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
1042	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
1043	* drop on that space.	929	* drop on that space.
1044	*/	930	*/
1045	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)
1046	{	932	{
1047	object *	933	object *op = inv;
1048	op = inv;
1049		934
1050	while (op)	935	while (op)
1051	{	936	{
1052	object *
1053	tmp = op->below;	937	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	938	op->destroy (destroy_inventory);
1057	op = tmp;	939	op = tmp;
1058	}	940	}
1059	}	941	}
1060	else	942	else
1061	{ /* Put objects in inventory onto this space */	943	{ /* Put objects in inventory onto this space */
1062	object *	944	object *op = inv;
1063	op = inv;
1064		945
1065	while (op)	946	while (op)
1066	{	947	{
1067	object *
1068	tmp = op->below;	948	object *tmp = op->below;
1069		949
1070	remove_ob (op);	950	op->remove ();
1071		951
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	|| 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))
1074	free_object (op);	954	op->destroy ();
1075	else	955	else
1076	{	956	{
1077	op->x = x;	957	op->x = x;
1078	op->y = y;	958	op->y = y;
1079	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 */
…		…
1082	op = tmp;	962	op = tmp;
1083	}	963	}
1084	}	964	}
1085	}	965	}
1086		966
1087	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;
1088		994
1089	/* Remove object from the active list */	995	/* Remove object from the active list */
1090	speed = 0;	996	speed = 0;
1091	update_ob_speed (this);	997	update_ob_speed (this);
1092		998
1093	unlink ();	999	unlink ();
1094		1000
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1001	mortals.push_back (this);
1098	}	1002	}
1099		1003
1100	/*	1004	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1005	* sub_weight() recursively (outwards) subtracts a number from the
1102	* 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)).
1103	*/	1007	*/
1104
1105	void	1008	void
1106	sub_weight (object *op, signed long weight)	1009	sub_weight (object *op, signed long weight)
1107	{	1010	{
1108	while (op != NULL)	1011	while (op != NULL)
1109	{	1012	{
1110	if (op->type == CONTAINER)	1013	if (op->type == CONTAINER)
1111	{
1112	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1014	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1113	}	1015
1114	op->carrying -= weight;	1016	op->carrying -= weight;
1115	op = op->env;	1017	op = op->env;
1116	}	1018	}
1117	}	1019	}
1118		1020
1119	/* remove_ob(op):	1021	/* op->remove ():
1120	* 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
1121	* 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
1122	* object will have no environment. If the object previously had an	1024	* object will have no environment. If the object previously had an
1123	* environment, the x and y coordinates will be updated to	1025	* environment, the x and y coordinates will be updated to
1124	* the previous environment.	1026	* the previous environment.
1125	* Beware: This function is called from the editor as well!	1027	* Beware: This function is called from the editor as well!
1126	*/	1028	*/
1127
1128	void	1029	void
1129	remove_ob (object *op)	1030	object::remove ()
1130	{	1031	{
1131	object *tmp, *last = NULL;	1032	object *tmp, *last = 0;
1132	object *otmp;	1033	object *otmp;
1133		1034
1134	tag_t tag;
1135	int check_walk_off;	1035	int check_walk_off;
1136	mapstruct *m;
1137		1036
1138	sint16 x, y;
1139
1140	if (QUERY_FLAG (op, FLAG_REMOVED))	1037	if (QUERY_FLAG (this, FLAG_REMOVED))
1141	{	1038	return;
1142	dump_object (op);
1143	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1144		1039
1145	/* Changed it to always dump core in this case. As has been learned
1146	* in the past, trying to recover from errors almost always
1147	* make things worse, and this is a real error here - something
1148	* that should not happen.
1149	* Yes, if this was a mission critical app, trying to do something
1150	* to recover may make sense, but that is because failure of the app
1151	* may have other disastrous problems. Cf runs out of a script
1152	* so is easily enough restarted without any real problems.
1153	* MSW 2001-07-01
1154	*/
1155	abort ();
1156	}
1157
1158	if (op->more != NULL)
1159	remove_ob (op->more);
1160
1161	SET_FLAG (op, FLAG_REMOVED);	1040	SET_FLAG (this, FLAG_REMOVED);
		1041
		1042	if (more)
		1043	more->remove ();
1162		1044
1163	/*	1045	/*
1164	* In this case, the object to be removed is in someones	1046	* In this case, the object to be removed is in someones
1165	* inventory.	1047	* inventory.
1166	*/	1048	*/
1167	if (op->env != NULL)	1049	if (env)
1168	{	1050	{
1169	if (op->nrof)	1051	if (nrof)
1170	sub_weight (op->env, op->weight * op->nrof);	1052	sub_weight (env, weight * nrof);
1171	else	1053	else
1172	sub_weight (op->env, op->weight + op->carrying);	1054	sub_weight (env, weight + carrying);
1173		1055
1174	/* 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
1175	* made to players inventory. If set, avoiding the call	1057	* made to players inventory. If set, avoiding the call
1176	* to save cpu time.	1058	* to save cpu time.
1177	*/	1059	*/
1178	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))
1179	fix_player (otmp);	1061	fix_player (otmp);
1180		1062
1181	if (op->above != NULL)	1063	if (above != NULL)
1182	op->above->below = op->below;	1064	above->below = below;
1183	else	1065	else
1184	op->env->inv = op->below;	1066	env->inv = below;
1185		1067
1186	if (op->below != NULL)	1068	if (below != NULL)
1187	op->below->above = op->above;	1069	below->above = above;
1188		1070
1189	/* we set up values so that it could be inserted into	1071	/* we set up values so that it could be inserted into
1190	* 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
1191	* to the caller to decide what we want to do.	1073	* to the caller to decide what we want to do.
1192	*/	1074	*/
1193	op->x = op->env->x, op->y = op->env->y;	1075	x = env->x, y = env->y;
1194	op->map = op->env->map;	1076	map = env->map;
1195	op->above = NULL, op->below = NULL;	1077	above = 0, below = 0;
1196	op->env = NULL;	1078	env = 0;
1197	return;
1198	}
1199
1200	/* If we get here, we are removing it from a map */
1201	if (op->map == NULL)
1202	return;
1203
1204	x = op->x;
1205	y = op->y;
1206	m = get_map_from_coord (op->map, &x, &y);
1207
1208	if (!m)
1209	{	1079	}
1210	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)
1211	op->map->path, op->x, op->y);	1081	{
1212	/* 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
1213	* it seems if we get into this case, something is probablye	1083	* lots of logic for things we no longer care about
1214	* screwed up and should be fixed.
1215	*/	1084	*/
1216	abort ();
1217	}
1218	if (op->map != m)
1219	{
1220	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1221	op->map->path, m->path, op->x, op->y, x, y);
1222	}
1223		1085
1224	/* Re did the following section of code - it looks like it had
1225	* lots of logic for things we no longer care about
1226	*/
1227
1228	/* link the object above us */	1086	/* link the object above us */
1229	if (op->above)	1087	if (above)
1230	op->above->below = op->below;	1088	above->below = below;
1231	else	1089	else
1232	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 */
1233		1091
1234	/* Relink the object below us, if there is one */	1092	/* Relink the object below us, if there is one */
1235	if (op->below)	1093	if (below)
1236	op->below->above = op->above;	1094	below->above = above;
1237	else	1095	else
1238	{	1096	{
1239	/* 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
1240	* use translated coordinates in case some oddness with map tiling is	1098	* use translated coordinates in case some oddness with map tiling is
1241	* evident	1099	* evident
1242	*/
1243	if (GET_MAP_OB (m, x, y) != op)
1244	{
1245	dump_object (op);
1246	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",
1247	errmsg);
1248	dump_object (GET_MAP_OB (m, x, y));
1249	LOG (llevError, "%s\n", errmsg);
1250	}
1251
1252	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1253	}
1254
1255	op->above = NULL;
1256	op->below = NULL;
1257
1258	if (op->map->in_memory == MAP_SAVING)
1259	return;
1260
1261	tag = op->count;
1262	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1263
1264	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1265	{
1266	/* No point updating the players look faces if he is the object
1267	* being removed.
1268	*/
1269
1270	if (tmp->type == PLAYER && tmp != op)
1271	{
1272	/* If a container that the player is currently using somehow gets
1273	* removed (most likely destroyed), update the player view
1274	* appropriately.
1275	*/	1100	*/
1276	if (tmp->container == op)	1101	if (GET_MAP_OB (map, x, y) != this)
1277	{	1102	{
1278	CLEAR_FLAG (op, FLAG_APPLIED);	1103	char *dump = dump_object (this);
1279	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);
1280	}	1110	}
1281		1111
1282	tmp->contr->socket.update_look = 1;	1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1283	}
1284	/* See if player moving off should effect something */
1285	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1286	{	1113	}
1287	move_apply (tmp, op, NULL);
1288		1114
1289	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)
1290	{	1130	{
1291	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 ();
1292	}	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);
		1150
		1151	if (destroyed ())
		1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1293	}	1153	}
1294		1154
1295	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1296		1156
1297	if (tmp->above == tmp)	1157	if (tmp->above == tmp)
1298	tmp->above = NULL;	1158	tmp->above = 0;
1299		1159
1300	last = tmp;	1160	last = tmp;
1301	}	1161	}
1302		1162
1303	/* last == NULL of there are no objects on this space */	1163	/* last == NULL of there are no objects on this space */
1304	if (last == NULL)	1164	if (!last)
1305	{	1165	{
1306	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1307	* 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
1308	* 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
1309	* be correct anyways.	1169	* be correct anyways.
1310	*/	1170	*/
1311	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1312	update_position (op->map, op->x, op->y);	1172	update_position (map, x, y);
1313	}	1173	}
1314	else	1174	else
1315	update_object (last, UP_OBJ_REMOVE);	1175	update_object (last, UP_OBJ_REMOVE);
1316		1176
1317	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1318	update_all_los (op->map, op->x, op->y);	1178	update_all_los (map, x, y);
		1179	}
1319	}	1180	}
1320		1181
1321	/*	1182	/*
1322	* merge_ob(op,top):	1183	* merge_ob(op,top):
1323	*	1184	*
1324	* This function goes through all objects below and including top, and	1185	* This function goes through all objects below and including top, and
1325	* merges op to the first matching object.	1186	* merges op to the first matching object.
1326	* If top is NULL, it is calculated.	1187	* If top is NULL, it is calculated.
1327	* 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
1328	*/	1189	*/
1329
1330	object *	1190	object *
1331	merge_ob (object *op, object *top)	1191	merge_ob (object *op, object *top)
1332	{	1192	{
1333	if (!op->nrof)	1193	if (!op->nrof)
1334	return 0;	1194	return 0;
		1195
1335	if (top == NULL)	1196	if (top == NULL)
1336	for (top = op; top != NULL && top->above != NULL; top = top->above);	1197	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1198
1337	for (; top != NULL; top = top->below)	1199	for (; top != NULL; top = top->below)
1338	{	1200	{
1339	if (top == op)	1201	if (top == op)
1340	continue;	1202	continue;
1341	if (CAN_MERGE (op, top))	1203
		1204	if (object::can_merge (op, top))
1342	{	1205	{
1343	top->nrof += op->nrof;	1206	top->nrof += op->nrof;
1344		1207
1345	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1208	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1346	op->weight = 0; /* Don't want any adjustements now */	1209	op->weight = 0; /* Don't want any adjustements now */
1347	remove_ob (op);	1210	op->destroy ();
1348	free_object (op);
1349	return top;	1211	return top;
1350	}	1212	}
1351	}	1213	}
		1214
1352	return NULL;	1215	return 0;
1353	}	1216	}
1354		1217
1355	/*	1218	/*
1356	* 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
1357	* job preparing multi-part monsters	1220	* job preparing multi-part monsters
1358	*/	1221	*/
1359	object *	1222	object *
1360	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)
1361	{	1224	{
1362	object *	1225	object *tmp;
1363	tmp;
1364		1226
1365	if (op->head)	1227	if (op->head)
1366	op = op->head;	1228	op = op->head;
		1229
1367	for (tmp = op; tmp; tmp = tmp->more)	1230	for (tmp = op; tmp; tmp = tmp->more)
1368	{	1231	{
1369	tmp->x = x + tmp->arch->clone.x;	1232	tmp->x = x + tmp->arch->clone.x;
1370	tmp->y = y + tmp->arch->clone.y;	1233	tmp->y = y + tmp->arch->clone.y;
1371	}	1234	}
		1235
1372	return insert_ob_in_map (op, m, originator, flag);	1236	return insert_ob_in_map (op, m, originator, flag);
1373	}	1237	}
1374		1238
1375	/*	1239	/*
1376	* insert_ob_in_map (op, map, originator, flag):	1240	* insert_ob_in_map (op, map, originator, flag):
…		…
1392	* NULL if 'op' was destroyed	1256	* NULL if 'op' was destroyed
1393	* just 'op' otherwise	1257	* just 'op' otherwise
1394	*/	1258	*/
1395		1259
1396	object *	1260	object *
1397	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)
1398	{	1262	{
1399	object *tmp, *top, *floor = NULL;	1263	object *tmp, *top, *floor = NULL;
1400	sint16 x, y;	1264	sint16 x, y;
1401		1265
1402	if (QUERY_FLAG (op, FLAG_FREED))	1266	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1405	return NULL;	1269	return NULL;
1406	}	1270	}
1407		1271
1408	if (m == NULL)	1272	if (m == NULL)
1409	{	1273	{
1410	dump_object (op);	1274	char *dump = dump_object (op);
1411	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);
1412	return op;	1277	return op;
1413	}	1278	}
1414		1279
1415	if (out_of_map (m, op->x, op->y))	1280	if (out_of_map (m, op->x, op->y))
1416	{	1281	{
1417	dump_object (op);	1282	char *dump = dump_object (op);
1418	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);
1419	#ifdef MANY_CORES	1284	#ifdef MANY_CORES
1420	/* 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
1421	* 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
1422	* improperly inserted.	1287	* improperly inserted.
1423	*/	1288	*/
1424	abort ();	1289	abort ();
1425	#endif	1290	#endif
		1291	free (dump);
1426	return op;	1292	return op;
1427	}	1293	}
1428		1294
1429	if (!QUERY_FLAG (op, FLAG_REMOVED))	1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1430	{	1296	{
1431	dump_object (op);	1297	char *dump = dump_object (op);
1432	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);
1433	return op;	1300	return op;
1434	}	1301	}
1435		1302
1436	if (op->more != NULL)	1303	if (op->more != NULL)
1437	{	1304	{
…		…
1475		1342
1476	/* this has to be done after we translate the coordinates.	1343	/* this has to be done after we translate the coordinates.
1477	*/	1344	*/
1478	if (op->nrof && !(flag & INS_NO_MERGE))	1345	if (op->nrof && !(flag & INS_NO_MERGE))
1479	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)
1480	if (CAN_MERGE (op, tmp))	1347	if (object::can_merge (op, tmp))
1481	{	1348	{
1482	op->nrof += tmp->nrof;	1349	op->nrof += tmp->nrof;
1483	remove_ob (tmp);	1350	tmp->destroy ();
1484	free_object (tmp);
1485	}	1351	}
1486		1352
1487	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 */
1488	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1489		1355
…		…
1617	* it, so save a few ticks and start from there.	1483	* it, so save a few ticks and start from there.
1618	*/	1484	*/
1619	if (!(flag & INS_MAP_LOAD))	1485	if (!(flag & INS_MAP_LOAD))
1620	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)
1621	if (tmp->type == PLAYER)	1487	if (tmp->type == PLAYER)
1622	tmp->contr->socket.update_look = 1;	1488	tmp->contr->socket->floorbox_update ();
1623		1489
1624	/* If this object glows, it may affect lighting conditions that are	1490	/* If this object glows, it may affect lighting conditions that are
1625	* 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
1626	* 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
1627	* on the map will get recalculated. The players could very well	1493	* on the map will get recalculated. The players could very well
…		…
1635		1501
1636	/* updates flags (blocked, alive, no magic, etc) for this map space */	1502	/* updates flags (blocked, alive, no magic, etc) for this map space */
1637	update_object (op, UP_OBJ_INSERT);	1503	update_object (op, UP_OBJ_INSERT);
1638		1504
1639	/* 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,
1640	* we want to have update_look set above before calling this.	1506	* we want to have floorbox_update called before calling this.
1641	*	1507	*
1642	* check_move_on() must be after this because code called from	1508	* check_move_on() must be after this because code called from
1643	* check_move_on() depends on correct map flags (so functions like	1509	* check_move_on() depends on correct map flags (so functions like
1644	* blocked() and wall() work properly), and these flags are updated by	1510	* blocked() and wall() work properly), and these flags are updated by
1645	* update_object().	1511	* update_object().
…		…
1667	* 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.
1668	*/	1534	*/
1669	void	1535	void
1670	replace_insert_ob_in_map (const char *arch_string, object *op)	1536	replace_insert_ob_in_map (const char *arch_string, object *op)
1671	{	1537	{
1672	object *tmp;	1538	object *
		1539	tmp;
1673	object *tmp1;	1540	object *
		1541	tmp1;
1674		1542
1675	/* first search for itself and remove any old instances */	1543	/* first search for itself and remove any old instances */
1676		1544
1677	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)
1678	{
1679	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1680	{	1547	tmp->destroy ();
1681	remove_ob (tmp);
1682	free_object (tmp);
1683	}
1684	}
1685		1548
1686	tmp1 = arch_to_object (find_archetype (arch_string));	1549	tmp1 = arch_to_object (archetype::find (arch_string));
1687		1550
1688	tmp1->x = op->x;	1551	tmp1->x = op->x;
1689	tmp1->y = op->y;	1552	tmp1->y = op->y;
1690	insert_ob_in_map (tmp1, op->map, op, 0);	1553	insert_ob_in_map (tmp1, op->map, op, 0);
1691	}	1554	}
…		…
1699	*/	1562	*/
1700		1563
1701	object *	1564	object *
1702	get_split_ob (object *orig_ob, uint32 nr)	1565	get_split_ob (object *orig_ob, uint32 nr)
1703	{	1566	{
1704	object *	1567	object *newob;
1705	newob;
1706	int
1707	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1708		1569
1709	if (orig_ob->nrof < nr)	1570	if (orig_ob->nrof < nr)
1710	{	1571	{
1711	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);
1712	return NULL;	1573	return NULL;
1713	}	1574	}
		1575
1714	newob = object_create_clone (orig_ob);	1576	newob = object_create_clone (orig_ob);
		1577
1715	if ((orig_ob->nrof -= nr) < 1)	1578	if ((orig_ob->nrof -= nr) < 1)
1716	{	1579	orig_ob->destroy (1);
1717	if (!is_removed)
1718	remove_ob (orig_ob);
1719	free_object2 (orig_ob, 1);
1720	}
1721	else if (!is_removed)	1580	else if (!is_removed)
1722	{	1581	{
1723	if (orig_ob->env != NULL)	1582	if (orig_ob->env != NULL)
1724	sub_weight (orig_ob->env, orig_ob->weight * nr);	1583	sub_weight (orig_ob->env, orig_ob->weight * nr);
1725	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)
…		…
1727	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.");
1728	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");
1729	return NULL;	1588	return NULL;
1730	}	1589	}
1731	}	1590	}
		1591
1732	newob->nrof = nr;	1592	newob->nrof = nr;
1733		1593
1734	return newob;	1594	return newob;
1735	}	1595	}
1736		1596
…		…
1743	*/	1603	*/
1744		1604
1745	object *	1605	object *
1746	decrease_ob_nr (object *op, uint32 i)	1606	decrease_ob_nr (object *op, uint32 i)
1747	{	1607	{
1748	object *	1608	object *tmp;
1749	tmp;
1750	player *	1609	player *pl;
1751	pl;
1752		1610
1753	if (i == 0) /* objects with op->nrof require this check */	1611	if (i == 0) /* objects with op->nrof require this check */
1754	return op;	1612	return op;
1755		1613
1756	if (i > op->nrof)	1614	if (i > op->nrof)
1757	i = op->nrof;	1615	i = op->nrof;
1758		1616
1759	if (QUERY_FLAG (op, FLAG_REMOVED))	1617	if (QUERY_FLAG (op, FLAG_REMOVED))
1760	{
1761	op->nrof -= i;	1618	op->nrof -= i;
1762	}
1763	else if (op->env != NULL)	1619	else if (op->env)
1764	{	1620	{
1765	/* is this object in the players inventory, or sub container	1621	/* is this object in the players inventory, or sub container
1766	* therein?	1622	* therein?
1767	*/	1623	*/
1768	tmp = is_player_inv (op->env);	1624	tmp = is_player_inv (op->env);
…		…
1774	*/	1630	*/
1775	if (!tmp)	1631	if (!tmp)
1776	{	1632	{
1777	for (pl = first_player; pl; pl = pl->next)	1633	for (pl = first_player; pl; pl = pl->next)
1778	if (pl->ob->container == op->env)	1634	if (pl->ob->container == op->env)
		1635	{
		1636	tmp = pl->ob;
1779	break;	1637	break;
1780	if (pl)	1638	}
1781	tmp = pl->ob;
1782	else
1783	tmp = NULL;
1784	}	1639	}
1785		1640
1786	if (i < op->nrof)	1641	if (i < op->nrof)
1787	{	1642	{
1788	sub_weight (op->env, op->weight * i);	1643	sub_weight (op->env, op->weight * i);
1789	op->nrof -= i;	1644	op->nrof -= i;
1790	if (tmp)	1645	if (tmp)
1791	{
1792	esrv_send_item (tmp, op);	1646	esrv_send_item (tmp, op);
1793	}
1794	}	1647	}
1795	else	1648	else
1796	{	1649	{
1797	remove_ob (op);	1650	op->remove ();
1798	op->nrof = 0;	1651	op->nrof = 0;
1799	if (tmp)	1652	if (tmp)
1800	{
1801	esrv_del_item (tmp->contr, op->count);	1653	esrv_del_item (tmp->contr, op->count);
1802	}
1803	}	1654	}
1804	}	1655	}
1805	else	1656	else
1806	{	1657	{
1807	object *
1808	above = op->above;	1658	object *above = op->above;
1809		1659
1810	if (i < op->nrof)	1660	if (i < op->nrof)
1811	{
1812	op->nrof -= i;	1661	op->nrof -= i;
1813	}
1814	else	1662	else
1815	{	1663	{
1816	remove_ob (op);	1664	op->remove ();
1817	op->nrof = 0;	1665	op->nrof = 0;
1818	}	1666	}
		1667
1819	/* Since we just removed op, op->above is null */	1668	/* Since we just removed op, op->above is null */
1820	for (tmp = above; tmp != NULL; tmp = tmp->above)	1669	for (tmp = above; tmp; tmp = tmp->above)
1821	if (tmp->type == PLAYER)	1670	if (tmp->type == PLAYER)
1822	{	1671	{
1823	if (op->nrof)	1672	if (op->nrof)
1824	esrv_send_item (tmp, op);	1673	esrv_send_item (tmp, op);
1825	else	1674	else
1826	esrv_del_item (tmp->contr, op->count);	1675	esrv_del_item (tmp->contr, op->count);
1827	}	1676	}
1828	}	1677	}
1829		1678
1830	if (op->nrof)	1679	if (op->nrof)
1831	{
1832	return op;	1680	return op;
1833	}
1834	else	1681	else
1835	{	1682	{
1836	free_object (op);	1683	op->destroy ();
1837	return NULL;	1684	return 0;
1838	}	1685	}
1839	}	1686	}
1840		1687
1841	/*	1688	/*
1842	* add_weight(object, weight) adds the specified weight to an object,	1689	* add_weight(object, weight) adds the specified weight to an object,
…		…
1847	add_weight (object *op, signed long weight)	1694	add_weight (object *op, signed long weight)
1848	{	1695	{
1849	while (op != NULL)	1696	while (op != NULL)
1850	{	1697	{
1851	if (op->type == CONTAINER)	1698	if (op->type == CONTAINER)
1852	{
1853	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1699	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1854	}	1700
1855	op->carrying += weight;	1701	op->carrying += weight;
1856	op = op->env;	1702	op = op->env;
1857	}	1703	}
1858	}	1704	}
1859		1705
		1706	object *
		1707	insert_ob_in_ob (object *op, object *where)
		1708	{
		1709	if (!where)
		1710	{
		1711	char *dump = dump_object (op);
		1712	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1713	free (dump);
		1714	return op;
		1715	}
		1716
		1717	if (where->head)
		1718	{
		1719	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1720	where = where->head;
		1721	}
		1722
		1723	return where->insert (op);
		1724	}
		1725
1860	/*	1726	/*
1861	* insert_ob_in_ob(op,environment):	1727	* env->insert (op)
1862	* This function inserts the object op in the linked list	1728	* This function inserts the object op in the linked list
1863	* inside the object environment.	1729	* inside the object environment.
1864	*	1730	*
1865	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1866	* the inventory at the last position or next to other objects of the same
1867	* type.
1868	* Frank: Now sorted by type, archetype and magic!
1869	*
1870	* The function returns now pointer to inserted item, and return value can	1731	* The function returns now pointer to inserted item, and return value can
1871	* be != op, if items are merged. -Tero	1732	* be != op, if items are merged. -Tero
1872	*/	1733	*/
1873		1734
1874	object *	1735	object *
1875	insert_ob_in_ob (object *op, object *where)	1736	object::insert (object *op)
1876	{	1737	{
1877	object *	1738	object *tmp, *otmp;
1878	tmp, *
1879	otmp;
1880		1739
1881	if (!QUERY_FLAG (op, FLAG_REMOVED))	1740	if (!QUERY_FLAG (op, FLAG_REMOVED))
1882	{	1741	op->remove ();
1883	dump_object (op);	1742
1884	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1885	return op;
1886	}
1887	if (where == NULL)
1888	{
1889	dump_object (op);
1890	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1891	return op;
1892	}
1893	if (where->head)
1894	{
1895	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1896	where = where->head;
1897	}
1898	if (op->more)	1743	if (op->more)
1899	{	1744	{
1900	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1745	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1901	return op;	1746	return op;
1902	}	1747	}
		1748
1903	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1749	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1904	CLEAR_FLAG (op, FLAG_REMOVED);	1750	CLEAR_FLAG (op, FLAG_REMOVED);
1905	if (op->nrof)	1751	if (op->nrof)
1906	{	1752	{
1907	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1753	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1908	if (CAN_MERGE (tmp, op))	1754	if (object::can_merge (tmp, op))
1909	{	1755	{
1910	/* return the original object and remove inserted object	1756	/* return the original object and remove inserted object
1911	(client needs the original object) */	1757	(client needs the original object) */
1912	tmp->nrof += op->nrof;	1758	tmp->nrof += op->nrof;
1913	/* Weight handling gets pretty funky. Since we are adding to	1759	/* Weight handling gets pretty funky. Since we are adding to
1914	* tmp->nrof, we need to increase the weight.	1760	* tmp->nrof, we need to increase the weight.
1915	*/	1761	*/
1916	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1917	SET_FLAG (op, FLAG_REMOVED);	1763	SET_FLAG (op, FLAG_REMOVED);
1918	free_object (op); /* free the inserted object */	1764	op->destroy (); /* free the inserted object */
1919	op = tmp;	1765	op = tmp;
1920	remove_ob (op); /* and fix old object's links */	1766	op->remove (); /* and fix old object's links */
1921	CLEAR_FLAG (op, FLAG_REMOVED);	1767	CLEAR_FLAG (op, FLAG_REMOVED);
1922	break;	1768	break;
1923	}	1769	}
1924		1770
1925	/* I assume combined objects have no inventory	1771	/* I assume combined objects have no inventory
1926	* We add the weight - this object could have just been removed	1772	* We add the weight - this object could have just been removed
1927	* (if it was possible to merge). calling remove_ob will subtract	1773	* (if it was possible to merge). calling remove_ob will subtract
1928	* the weight, so we need to add it in again, since we actually do	1774	* the weight, so we need to add it in again, since we actually do
1929	* the linking below	1775	* the linking below
1930	*/	1776	*/
1931	add_weight (where, op->weight * op->nrof);	1777	add_weight (this, op->weight * op->nrof);
1932	}	1778	}
1933	else	1779	else
1934	add_weight (where, (op->weight + op->carrying));	1780	add_weight (this, (op->weight + op->carrying));
1935		1781
1936	otmp = is_player_inv (where);	1782	otmp = is_player_inv (this);
1937	if (otmp && otmp->contr != NULL)	1783	if (otmp && otmp->contr)
1938	{
1939	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1784	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1940	fix_player (otmp);	1785	fix_player (otmp);
1941	}
1942		1786
1943	op->map = NULL;	1787	op->map = NULL;
1944	op->env = where;	1788	op->env = this;
1945	op->above = NULL;	1789	op->above = NULL;
1946	op->below = NULL;	1790	op->below = NULL;
1947	op->x = 0, op->y = 0;	1791	op->x = 0, op->y = 0;
1948		1792
1949	/* reset the light list and los of the players on the map */	1793	/* reset the light list and los of the players on the map */
1950	if ((op->glow_radius != 0) && where->map)	1794	if ((op->glow_radius != 0) && map)
1951	{	1795	{
1952	#ifdef DEBUG_LIGHTS	1796	#ifdef DEBUG_LIGHTS
1953	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1797	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1954	#endif /* DEBUG_LIGHTS */	1798	#endif /* DEBUG_LIGHTS */
1955	if (MAP_DARKNESS (where->map))	1799	if (MAP_DARKNESS (map))
1956	update_all_los (where->map, where->x, where->y);	1800	update_all_los (map, x, y);
1957	}	1801	}
1958		1802
1959	/* Client has no idea of ordering so lets not bother ordering it here.	1803	/* Client has no idea of ordering so lets not bother ordering it here.
1960	* It sure simplifies this function...	1804	* It sure simplifies this function...
1961	*/	1805	*/
1962	if (where->inv == NULL)	1806	if (!inv)
1963	where->inv = op;	1807	inv = op;
1964	else	1808	else
1965	{	1809	{
1966	op->below = where->inv;	1810	op->below = inv;
1967	op->below->above = op;	1811	op->below->above = op;
1968	where->inv = op;	1812	inv = op;
1969	}	1813	}
		1814
1970	return op;	1815	return op;
1971	}	1816	}
1972		1817
1973	/*	1818	/*
1974	* Checks if any objects has a move_type that matches objects	1819	* Checks if any objects has a move_type that matches objects
…		…
1993		1838
1994	int	1839	int
1995	check_move_on (object *op, object *originator)	1840	check_move_on (object *op, object *originator)
1996	{	1841	{
1997	object *tmp;	1842	object *tmp;
1998	tag_t tag;
1999	mapstruct *m = op->map;	1843	maptile *m = op->map;
2000	int x = op->x, y = op->y;	1844	int x = op->x, y = op->y;
2001		1845
2002	MoveType move_on, move_slow, move_block;	1846	MoveType move_on, move_slow, move_block;
2003		1847
2004	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1848	if (QUERY_FLAG (op, FLAG_NO_APPLY))
2005	return 0;	1849	return 0;
2006
2007	tag = op->count;
2008		1850
2009	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1851	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
2010	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1852	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
2011	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1853	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
2012		1854
…		…
2055	{	1897	{
2056	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1898	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2057	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1899	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2058	{	1900	{
2059		1901
		1902	float
2060	float diff = tmp->move_slow_penalty * FABS (op->speed);	1903	diff = tmp->move_slow_penalty * FABS (op->speed);
2061		1904
2062	if (op->type == PLAYER)	1905	if (op->type == PLAYER)
2063	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1906	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
2064	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1907	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2065	diff /= 4.0;	1908	diff /= 4.0;
…		…
2072	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1915	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2073	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1916	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2074	{	1917	{
2075	move_apply (tmp, op, originator);	1918	move_apply (tmp, op, originator);
2076		1919
2077	if (was_destroyed (op, tag))	1920	if (op->destroyed ())
2078	return 1;	1921	return 1;
2079		1922
2080	/* what the person/creature stepped onto has moved the object	1923	/* what the person/creature stepped onto has moved the object
2081	* someplace new. Don't process any further - if we did,	1924	* someplace new. Don't process any further - if we did,
2082	* have a feeling strange problems would result.	1925	* have a feeling strange problems would result.
…		…
2094	* a matching archetype at the given map and coordinates.	1937	* a matching archetype at the given map and coordinates.
2095	* The first matching object is returned, or NULL if none.	1938	* The first matching object is returned, or NULL if none.
2096	*/	1939	*/
2097		1940
2098	object *	1941	object *
2099	present_arch (const archetype *at, mapstruct *m, int x, int y)	1942	present_arch (const archetype *at, maptile *m, int x, int y)
2100	{	1943	{
2101	object *	1944	object *
2102	tmp;	1945	tmp;
2103		1946
2104	if (m == NULL || out_of_map (m, x, y))	1947	if (m == NULL || out_of_map (m, x, y))
…		…
2117	* a matching type variable at the given map and coordinates.	1960	* a matching type variable at the given map and coordinates.
2118	* The first matching object is returned, or NULL if none.	1961	* The first matching object is returned, or NULL if none.
2119	*/	1962	*/
2120		1963
2121	object *	1964	object *
2122	present (unsigned char type, mapstruct *m, int x, int y)	1965	present (unsigned char type, maptile *m, int x, int y)
2123	{	1966	{
2124	object *	1967	object *
2125	tmp;	1968	tmp;
2126		1969
2127	if (out_of_map (m, x, y))	1970	if (out_of_map (m, x, y))
…		…
2267	* the archetype because that isn't correct if the monster has been	2110	* the archetype because that isn't correct if the monster has been
2268	* customized, changed states, etc.	2111	* customized, changed states, etc.
2269	*/	2112	*/
2270		2113
2271	int	2114	int
2272	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2115	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2273	{	2116	{
2274	int	2117	int
2275	i,	2118	i,
2276	index = 0, flag;	2119	index = 0, flag;
2277	static int	2120	static int
…		…
2298	return -1;	2141	return -1;
2299	return altern[RANDOM () % index];	2142	return altern[RANDOM () % index];
2300	}	2143	}
2301		2144
2302	/*	2145	/*
2303	* find_first_free_spot(archetype, mapstruct, x, y) works like	2146	* find_first_free_spot(archetype, maptile, x, y) works like
2304	* find_free_spot(), but it will search max number of squares.	2147	* find_free_spot(), but it will search max number of squares.
2305	* But it will return the first available spot, not a random choice.	2148	* But it will return the first available spot, not a random choice.
2306	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2149	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2307	*/	2150	*/
2308		2151
2309	int	2152	int
2310	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2153	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2311	{	2154	{
2312	int	2155	int
2313	i;	2156	i;
2314		2157
2315	for (i = 0; i < SIZEOFFREE; i++)	2158	for (i = 0; i < SIZEOFFREE; i++)
…		…
2379	* because we have to know what movement the thing looking to move	2222	* because we have to know what movement the thing looking to move
2380	* there is capable of.	2223	* there is capable of.
2381	*/	2224	*/
2382		2225
2383	int	2226	int
2384	find_dir (mapstruct *m, int x, int y, object *exclude)	2227	find_dir (maptile *m, int x, int y, object *exclude)
2385	{	2228	{
2386	int	2229	int
2387	i,	2230	i,
2388	max = SIZEOFFREE, mflags;	2231	max = SIZEOFFREE, mflags;
2389	sint16	2232
2390	nx,	2233	sint16 nx, ny;
2391	ny;
2392	object *	2234	object *
2393	tmp;	2235	tmp;
2394	mapstruct *	2236	maptile *
2395	mp;	2237	mp;
2396	MoveType	2238
2397	blocked,	2239	MoveType blocked, move_type;
2398	move_type;
2399		2240
2400	if (exclude && exclude->head)	2241	if (exclude && exclude->head)
2401	{	2242	{
2402	exclude = exclude->head;	2243	exclude = exclude->head;
2403	move_type = exclude->move_type;	2244	move_type = exclude->move_type;
…		…
2608	* Modified to be map tile aware -.MSW	2449	* Modified to be map tile aware -.MSW
2609	*/	2450	*/
2610		2451
2611		2452
2612	int	2453	int
2613	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2454	can_see_monsterP (maptile *m, int x, int y, int dir)
2614	{	2455	{
2615	sint16	2456	sint16 dx, dy;
2616	dx,
2617	dy;
2618	int	2457	int
2619	mflags;	2458	mflags;
2620		2459
2621	if (dir < 0)	2460	if (dir < 0)
2622	return 0; /* exit condition: invalid direction */	2461	return 0; /* exit condition: invalid direction */
…		…
2669	* create clone from object to another	2508	* create clone from object to another
2670	*/	2509	*/
2671	object *	2510	object *
2672	object_create_clone (object *asrc)	2511	object_create_clone (object *asrc)
2673	{	2512	{
2674	object *
2675	dst = NULL, *tmp, *src, *part, *prev, *item;	2513	object *dst = 0, *tmp, *src, *part, *prev, *item;
2676		2514
2677	if (!asrc)	2515	if (!asrc)
2678	return NULL;	2516	return 0;
		2517
2679	src = asrc;	2518	src = asrc;
2680	if (src->head)	2519	if (src->head)
2681	src = src->head;	2520	src = src->head;
2682		2521
2683	prev = NULL;	2522	prev = 0;
2684	for (part = src; part; part = part->more)	2523	for (part = src; part; part = part->more)
2685	{	2524	{
2686	tmp = get_object ();	2525	tmp = part->clone ();
2687	copy_object (part, tmp);
2688	tmp->x -= src->x;	2526	tmp->x -= src->x;
2689	tmp->y -= src->y;	2527	tmp->y -= src->y;
		2528
2690	if (!part->head)	2529	if (!part->head)
2691	{	2530	{
2692	dst = tmp;	2531	dst = tmp;
2693	tmp->head = NULL;	2532	tmp->head = 0;
2694	}	2533	}
2695	else	2534	else
2696	{	2535	{
2697	tmp->head = dst;	2536	tmp->head = dst;
2698	}	2537	}
		2538
2699	tmp->more = NULL;	2539	tmp->more = 0;
		2540
2700	if (prev)	2541	if (prev)
2701	prev->more = tmp;	2542	prev->more = tmp;
		2543
2702	prev = tmp;	2544	prev = tmp;
2703	}	2545	}
2704		2546
2705	/*** copy inventory ***/
2706	for (item = src->inv; item; item = item->below)	2547	for (item = src->inv; item; item = item->below)
2707	{
2708	(void) insert_ob_in_ob (object_create_clone (item), dst);	2548	insert_ob_in_ob (object_create_clone (item), dst);
2709	}
2710		2549
2711	return dst;	2550	return dst;
2712	}	2551	}
2713		2552
2714	/* return true if the object was destroyed, 0 otherwise */
2715	int
2716	was_destroyed (const object *op, tag_t old_tag)
2717	{
2718	/* checking for FLAG_FREED isn't necessary, but makes this function more
2719	* robust */
2720	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2721	}
2722
2723	/* GROS - Creates an object using a string representing its content. */	2553	/* GROS - Creates an object using a string representing its content. */
2724
2725	/* Basically, we save the content of the string to a temp file, then call */	2554	/* Basically, we save the content of the string to a temp file, then call */
2726
2727	/* load_object on it. I admit it is a highly inefficient way to make things, */	2555	/* load_object on it. I admit it is a highly inefficient way to make things, */
2728
2729	/* but it was simple to make and allows reusing the load_object function. */	2556	/* but it was simple to make and allows reusing the load_object function. */
2730
2731	/* Remember not to use load_object_str in a time-critical situation. */	2557	/* Remember not to use load_object_str in a time-critical situation. */
2732
2733	/* Also remember that multiparts objects are not supported for now. */	2558	/* Also remember that multiparts objects are not supported for now. */
2734		2559
2735	object *	2560	object *
2736	load_object_str (const char *obstr)	2561	load_object_str (const char *obstr)
2737	{	2562	{
2738	object *	2563	object *op;
2739	op;
2740	char
2741	filename[MAX_BUF];	2564	char filename[MAX_BUF];
2742		2565
2743	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2566	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2744		2567
2745	FILE *
2746	tempfile = fopen (filename, "w");	2568	FILE *tempfile = fopen (filename, "w");
2747		2569
2748	if (tempfile == NULL)	2570	if (tempfile == NULL)
2749	{	2571	{
2750	LOG (llevError, "Error - Unable to access load object temp file\n");	2572	LOG (llevError, "Error - Unable to access load object temp file\n");
2751	return NULL;	2573	return NULL;
2752	};	2574	}
		2575
2753	fprintf (tempfile, obstr);	2576	fprintf (tempfile, obstr);
2754	fclose (tempfile);	2577	fclose (tempfile);
2755		2578
2756	op = get_object ();	2579	op = object::create ();
2757		2580
2758	object_thawer	2581	object_thawer thawer (filename);
2759	thawer (filename);
2760		2582
2761	if (thawer)	2583	if (thawer)
2762	load_object (thawer, op, 0);	2584	load_object (thawer, op, 0);
2763		2585
2764	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2586	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2772	* returns NULL if no match.	2594	* returns NULL if no match.
2773	*/	2595	*/
2774	object *	2596	object *
2775	find_obj_by_type_subtype (const object *who, int type, int subtype)	2597	find_obj_by_type_subtype (const object *who, int type, int subtype)
2776	{	2598	{
2777	object *	2599	object *tmp;
2778	tmp;
2779		2600
2780	for (tmp = who->inv; tmp; tmp = tmp->below)	2601	for (tmp = who->inv; tmp; tmp = tmp->below)
2781	if (tmp->type == type && tmp->subtype == subtype)	2602	if (tmp->type == type && tmp->subtype == subtype)
2782	return tmp;	2603	return tmp;
2783		2604
…		…
2791	* do the desired thing.	2612	* do the desired thing.
2792	*/	2613	*/
2793	key_value *	2614	key_value *
2794	get_ob_key_link (const object *ob, const char *key)	2615	get_ob_key_link (const object *ob, const char *key)
2795	{	2616	{
2796	key_value *	2617	key_value *link;
2797	link;
2798		2618
2799	for (link = ob->key_values; link != NULL; link = link->next)	2619	for (link = ob->key_values; link != NULL; link = link->next)
2800	{
2801	if (link->key == key)	2620	if (link->key == key)
2802	{
2803	return link;	2621	return link;
2804	}
2805	}
2806		2622
2807	return NULL;	2623	return NULL;
2808	}	2624	}
2809		2625
2810	/*	2626	/*
…		…
2815	* The returned string is shared.	2631	* The returned string is shared.
2816	*/	2632	*/
2817	const char *	2633	const char *
2818	get_ob_key_value (const object *op, const char *const key)	2634	get_ob_key_value (const object *op, const char *const key)
2819	{	2635	{
2820	key_value *	2636	key_value *link;
2821	link;	2637	shstr_cmp canonical_key (key);
2822	const char *
2823	canonical_key;
2824		2638
2825	canonical_key = shstr::find (key);
2826
2827	if (canonical_key == NULL)	2639	if (!canonical_key)
2828	{	2640	{
2829	/* 1. There being a field named key on any object	2641	/* 1. There being a field named key on any object
2830	* implies there'd be a shared string to find.	2642	* implies there'd be a shared string to find.
2831	* 2. Since there isn't, no object has this field.	2643	* 2. Since there isn't, no object has this field.
2832	* 3. Therefore, *this* object doesn't have this field.	2644	* 3. Therefore, *this* object doesn't have this field.
2833	*/	2645	*/
2834	return NULL;	2646	return 0;
2835	}	2647	}
2836		2648
2837	/* This is copied from get_ob_key_link() above -	2649	/* This is copied from get_ob_key_link() above -
2838	* only 4 lines, and saves the function call overhead.	2650	* only 4 lines, and saves the function call overhead.
2839	*/	2651	*/
2840	for (link = op->key_values; link != NULL; link = link->next)	2652	for (link = op->key_values; link; link = link->next)
2841	{
2842	if (link->key == canonical_key)	2653	if (link->key == canonical_key)
2843	{
2844	return link->value;	2654	return link->value;
2845	}	2655
2846	}
2847	return NULL;	2656	return 0;
2848	}	2657	}
2849		2658
2850		2659
2851	/*	2660	/*
2852	* Updates the canonical_key in op to value.	2661	* Updates the canonical_key in op to value.
…		…
2888	if (last)	2697	if (last)
2889	last->next = field->next;	2698	last->next = field->next;
2890	else	2699	else
2891	op->key_values = field->next;	2700	op->key_values = field->next;
2892		2701
2893	delete
2894	field;	2702	delete field;
2895	}	2703	}
2896	}	2704	}
2897	return TRUE;	2705	return TRUE;
2898	}	2706	}
2899	/* IF we get here, key doesn't exist */	2707	/* IF we get here, key doesn't exist */
…		…
2934	* Returns TRUE on success.	2742	* Returns TRUE on success.
2935	*/	2743	*/
2936	int	2744	int
2937	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2745	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2938	{	2746	{
2939	shstr
2940	key_ (key);	2747	shstr key_ (key);
2941		2748
2942	return set_ob_key_value_s (op, key_, value, add_key);	2749	return set_ob_key_value_s (op, key_, value, add_key);
2943	}	2750	}
		2751
		2752	object::depth_iterator::depth_iterator (object *container)
		2753	: iterator_base (container)
		2754	{
		2755	while (item->inv)
		2756	item = item->inv;
		2757	}
		2758
		2759	void
		2760	object::depth_iterator::next ()
		2761	{
		2762	if (item->below)
		2763	{
		2764	item = item->below;
		2765
		2766	while (item->inv)
		2767	item = item->inv;
		2768	}
		2769	else
		2770	item = item->env;
		2771	}
		2772
		2773	// return a suitable string describing an objetc in enough detail to find it
		2774	const char *
		2775	object::debug_desc (char *info) const
		2776	{
		2777	char info2[256 * 3];
		2778	char *p = info;
		2779
		2780	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2781	count,
		2782	&name,
		2783	title ? " " : "",
		2784	title ? (const char *)title : "");
		2785
		2786	if (env)
		2787	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2788
		2789	if (map)
		2790	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2791
		2792	return info;
		2793	}
		2794
		2795	const char *
		2796	object::debug_desc () const
		2797	{
		2798	static char info[256 * 3];
		2799	return debug_desc (info);
		2800	}
		2801

Diff Legend

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