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.74 by root, Wed Dec 20 09:14:21 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.
…		…
274	op = op->env;	352	op = op->env;
275	return op;	353	return op;
276	}	354	}
277		355
278	/*	356	/*
279	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
280	* a better check. We basically keeping traversing up until we can't
281	* or find a player.
282	*/
283
284	object *
285	is_player_inv (object *op)
286	{
287	for (; op != NULL && op->type != PLAYER; op = op->env)
288	if (op->env == op)
289	op->env = NULL;
290	return op;
291	}
292
293	/*
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	358	* Some error messages.
296	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
297	*/	360	*/
298		361
299	void	362	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)	363	dump_object (object *op)
355	{	364	{
356	if (op == NULL)	365	if (!op)
357	{	366	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		367
365	void	368	object_freezer freezer;
366	dump_all_objects (void)	369	save_object (freezer, op, 3);
367	{	370	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	}	371	}
376		372
377	/*	373	/*
378	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
379	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
399	*/	395	*/
400		396
401	object *	397	object *
402	find_object (tag_t i)	398	find_object (tag_t i)
403	{	399	{
404	object *op;	400	for (object *op = object::first; op; op = op->next)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	401	if (op->count == i)
408	break;	402	return op;
		403
409	return op;	404	return 0;
410	}	405	}
411		406
412	/*	407	/*
413	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
414	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
416	*/	411	*/
417		412
418	object *	413	object *
419	find_object_name (const char *str)	414	find_object_name (const char *str)
420	{	415	{
421	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
422	object *op;	417	object *op;
423		418
424	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
425	if (&op->name == name)	420	if (op->name == str_)
426	break;	421	break;
427		422
428	return op;	423	return op;
429	}	424	}
430		425
…		…
433	{	428	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	430	}
436		431
437	/*	432	/*
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	433	* Sets the owner and sets the skill and exp pointers to owner's current
477	* skill and experience objects.	434	* skill and experience objects.
478	*/	435	*/
479	void	436	void
480	set_owner (object *op, object *owner)	437	object::set_owner (object *owner)
481	{	438	{
482	if (owner == NULL || op == NULL)	439	if (!owner)
483	return;	440	return;
484		441
485	/* next line added to allow objects which own objects */	442	/* next line added to allow objects which own objects */
486	/* Add a check for ownercounts in here, as I got into an endless loop	443	/* 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	444	* with the fireball owning a poison cloud which then owned the
488	* fireball. I believe that was caused by one of the objects getting	445	* fireball. I believe that was caused by one of the objects getting
489	* freed and then another object replacing it. Since the ownercounts	446	* 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.	447	* didn't match, this check is valid and I believe that cause is valid.
491	*/	448	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	449	while (owner->owner)
493	owner = owner->owner;	450	owner = owner->owner;
494		451
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;	452	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	}	453	}
535		454
536	/* Zero the key_values on op, decrementing the shared-string	455	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	456	* refcounts and freeing the links.
538	*/	457	*/
…		…
554	{	473	{
555	attachable_base::clear ();	474	attachable_base::clear ();
556		475
557	free_key_values (this);	476	free_key_values (this);
558		477
559	clear_owner (this);	478	owner = 0;
560
561	name = 0;	479	name = 0;
562	name_pl = 0;	480	name_pl = 0;
563	title = 0;	481	title = 0;
564	race = 0;	482	race = 0;
565	slaying = 0;	483	slaying = 0;
566	skill = 0;	484	skill = 0;
567	msg = 0;	485	msg = 0;
568	lore = 0;	486	lore = 0;
569	custom_name = 0;	487	custom_name = 0;
570	materialname = 0;	488	materialname = 0;
		489	contr = 0;
		490	below = 0;
		491	above = 0;
		492	inv = 0;
		493	container = 0;
		494	env = 0;
		495	more = 0;
		496	head = 0;
		497	map = 0;
		498	active_next = 0;
		499	active_prev = 0;
571		500
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
573		502
574	SET_FLAG (this, FLAG_REMOVED);	503	SET_FLAG (this, FLAG_REMOVED);
575	}
576		504
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 */	505	/* What is not cleared is next, prev, and count */
609		506
610	op->expmul = 1.0;	507	expmul = 1.0;
611	op->face = blank_face;	508	face = blank_face;
612	op->attacked_by_count = -1;
613		509
614	if (settings.casting_time)	510	if (settings.casting_time)
615	op->casting_time = -1;	511	casting_time = -1;
616	}	512	}
617		513
618	/*	514	/*
619	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
620	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
621	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
622	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
623	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
624	* will point at garbage.	520	* will point at garbage.
625	*/	521	*/
626
627	void	522	void
628	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
629	{	524	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
632		527
633	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
634		533
635	if (is_freed)	534	if (is_freed)
636	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
637	if (is_removed)	537	if (is_removed)
638	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
639		539
640	if (op2->speed < 0)	540	if (speed < 0)
641	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
642		542
643	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
644	if (op2->key_values)	544	if (key_values)
645	{	545	{
646	key_value *tail = 0;	546	key_value *tail = 0;
647	key_value *i;	547	key_value *i;
648		548
649	op->key_values = 0;	549	dst->key_values = 0;
650		550
651	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
652	{	552	{
653	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
654		554
655	new_link->next = 0;	555	new_link->next = 0;
656	new_link->key = i->key;	556	new_link->key = i->key;
657	new_link->value = i->value;	557	new_link->value = i->value;
658		558
659	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
660	if (!op->key_values)	560	if (!dst->key_values)
661	{	561	{
662	op->key_values = new_link;	562	dst->key_values = new_link;
663	tail = new_link;	563	tail = new_link;
664	}	564	}
665	else	565	else
666	{	566	{
667	tail->next = new_link;	567	tail->next = new_link;
668	tail = new_link;	568	tail = new_link;
669	}	569	}
670	}	570	}
671	}	571	}
672		572
673	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
674	}	582	}
675		583
676	/*	584	/*
677	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
678	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
691	/*	599	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	600	* 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.	601	* 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.	602	* This function needs to be called whenever the speed of an object changes.
695	*/	603	*/
696
697	void	604	void
698	update_ob_speed (object *op)	605	update_ob_speed (object *op)
699	{	606	{
700	extern int arch_init;	607	extern int arch_init;
701		608
…		…
710	abort ();	617	abort ();
711	#else	618	#else
712	op->speed = 0;	619	op->speed = 0;
713	#endif	620	#endif
714	}	621	}
		622
715	if (arch_init)	623	if (arch_init)
716	{
717	return;	624	return;
718	}	625
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{	627	{
721	/* If already on active list, don't do anything */	628	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)	629	if (op->active_next || op->active_prev || op == active_objects)
723	return;	630	return;
724		631
725	/* process_events() expects us to insert the object at the beginning	632	/* process_events() expects us to insert the object at the beginning
726	* of the list. */	633	* of the list. */
727	op->active_next = active_objects;	634	op->active_next = active_objects;
		635
728	if (op->active_next != NULL)	636	if (op->active_next != NULL)
729	op->active_next->active_prev = op;	637	op->active_next->active_prev = op;
		638
730	active_objects = op;	639	active_objects = op;
731	}	640	}
732	else	641	else
733	{	642	{
734	/* If not on the active list, nothing needs to be done */	643	/* If not on the active list, nothing needs to be done */
…		…
736	return;	645	return;
737		646
738	if (op->active_prev == NULL)	647	if (op->active_prev == NULL)
739	{	648	{
740	active_objects = op->active_next;	649	active_objects = op->active_next;
		650
741	if (op->active_next != NULL)	651	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;	652	op->active_next->active_prev = NULL;
743	}	653	}
744	else	654	else
745	{	655	{
746	op->active_prev->active_next = op->active_next;	656	op->active_prev->active_next = op->active_next;
		657
747	if (op->active_next)	658	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;	659	op->active_next->active_prev = op->active_prev;
749	}	660	}
		661
750	op->active_next = NULL;	662	op->active_next = NULL;
751	op->active_prev = NULL;	663	op->active_prev = NULL;
752	}	664	}
753	}	665	}
754		666
…		…
879	update_now = 1;	791	update_now = 1;
880		792
881	if ((move_slow | op->move_slow) != move_slow)	793	if ((move_slow | op->move_slow) != move_slow)
882	update_now = 1;	794	update_now = 1;
883	}	795	}
		796
884	/* if the object is being removed, we can't make intelligent	797	/* if the object is being removed, we can't make intelligent
885	* decisions, because remove_ob can't really pass the object	798	* decisions, because remove_ob can't really pass the object
886	* that is being removed.	799	* that is being removed.
887	*/	800	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	802	update_now = 1;
890	else if (action == UP_OBJ_FACE)	803	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	804	/* Nothing to do for that case */ ;
892	else	805	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	806	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		807
895	if (update_now)	808	if (update_now)
896	{	809	{
…		…
900		813
901	if (op->more != NULL)	814	if (op->more != NULL)
902	update_object (op->more, action);	815	update_object (op->more, action);
903	}	816	}
904		817
905	static unordered_vector<object *> mortals;	818	object::vector object::mortals;
906	static std::vector<object *> freed;	819	object::vector object::objects; // not yet used
		820	object *object::first;
907		821
908	void object::free_mortals ()	822	void object::free_mortals ()
909	{	823	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
911	if (!(*i)->refcount)	825	if ((*i)->refcnt)
		826	++i; // further delay freeing
		827	else
912	{	828	{
913	freed.push_back (*i);	829	delete *i;
914	mortals.erase (i);	830	mortals.erase (i);
915	}	831	}
916	else
917	++i;
918	}	832	}
919		833
920	object::object ()	834	object::object ()
921	{	835	{
922	SET_FLAG (this, FLAG_REMOVED);	836	SET_FLAG (this, FLAG_REMOVED);
923		837
924	expmul = 1.0;	838	expmul = 1.0;
925	face = blank_face;	839	face = blank_face;
926	attacked_by_count = -1;
927	}	840	}
928		841
929	object::~object ()	842	object::~object ()
930	{	843	{
931	free_key_values (this);	844	free_key_values (this);
932	}	845	}
933		846
934	void object::link ()	847	void object::link ()
935	{	848	{
936	count = ++ob_count;	849	count = ++ob_count;
		850	uuid = gen_uuid ();
937		851
938	prev = 0;	852	prev = 0;
939	next = objects;	853	next = object::first;
940		854
941	if (objects)	855	if (object::first)
942	objects->prev = this;	856	object::first->prev = this;
943		857
944	objects = this;	858	object::first = this;
945	}	859	}
946		860
947	void object::unlink ()	861	void object::unlink ()
948	{	862	{
949	count = 0;	863	if (this == object::first)
		864	object::first = next;
950		865
951	/* Remove this object from the list of used objects */	866	/* Remove this object from the list of used objects */
952	if (prev)
953	{
954	prev->next = next;	867	if (prev) prev->next = next;
		868	if (next) next->prev = prev;
		869
955	prev = 0;	870	prev = 0;
956	}
957
958	if (next)
959	{
960	next->prev = prev;
961	next = 0;	871	next = 0;
962	}
963
964	if (this == objects)
965	objects = next;
966	}	872	}
967		873
968	object *object::create ()	874	object *object::create ()
969	{	875	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	876	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 ();	877	op->link ();
983	return op;	878	return op;
984	}	879	}
985		880
986	/*	881	/*
…		…
988	* it from the list of used objects, and puts it on the list of	883	* it from the list of used objects, and puts it on the list of
989	* free objects. The IS_FREED() flag is set in the object.	884	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for	885	* The object must have been removed by remove_ob() first for
991	* this function to succeed.	886	* this function to succeed.
992	*	887	*
993	* If free_inventory is set, free inventory as well. Else drop items in	888	* If destroy_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.	889	* inventory to the ground.
995	*/	890	*/
996	void object::free (bool free_inventory)	891	void object::destroy (bool destroy_inventory)
997	{	892	{
		893	if (QUERY_FLAG (this, FLAG_FREED))
		894	return;
		895
		896	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		897	remove_friendly_object (this);
		898
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	899	if (!QUERY_FLAG (this, FLAG_REMOVED))
999	{	900	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		901
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))	902	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		903
1020	if (more)	904	if (more)
1021	{	905	{
1022	more->free (free_inventory);	906	more->destroy (destroy_inventory);
1023	more = 0;	907	more = 0;
1024	}	908	}
1025		909
1026	if (inv)	910	if (inv)
1027	{	911	{
1028	/* Only if the space blocks everything do we not process -	912	/* Only if the space blocks everything do we not process -
1029	* if some form of movement is allowed, let objects	913	* if some form of movement is allowed, let objects
1030	* drop on that space.	914	* drop on that space.
1031	*/	915	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1033	{	917	{
1034	object *	918	object *op = inv;
1035	op = inv;
1036		919
1037	while (op)	920	while (op)
1038	{	921	{
1039	object *
1040	tmp = op->below;	922	object *tmp = op->below;
1041
1042	remove_ob (op);
1043	op->free (free_inventory);	923	op->destroy (destroy_inventory);
1044	op = tmp;	924	op = tmp;
1045	}	925	}
1046	}	926	}
1047	else	927	else
1048	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
1049	object *	929	object *op = inv;
1050	op = inv;
1051		930
1052	while (op)	931	while (op)
1053	{	932	{
1054	object *
1055	tmp = op->below;	933	object *tmp = op->below;
1056		934
1057	remove_ob (op);	935	op->remove ();
1058		936
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	937	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))	938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1061	free_object (op);	939	op->destroy ();
1062	else	940	else
1063	{	941	{
1064	op->x = x;	942	op->x = x;
1065	op->y = y;	943	op->y = y;
1066	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1069	op = tmp;	947	op = tmp;
1070	}	948	}
1071	}	949	}
1072	}	950	}
1073		951
1074	clear_owner (this);	952	// hack to ensure that freed objects still have a valid map
		953	{
		954	static maptile *freed_map; // freed objects are moved here to avoid crashes
		955
		956	if (!freed_map)
		957	{
		958	freed_map = new maptile;
		959
		960	freed_map->name = "/internal/freed_objects_map";
		961	freed_map->width = 3;
		962	freed_map->height = 3;
		963
		964	freed_map->allocate ();
		965	}
		966
		967	map = freed_map;
		968	x = 1;
		969	y = 1;
		970	}
		971
		972	// clear those pointers that likely might have circular references to us
		973	owner = 0;
		974	enemy = 0;
		975	attacked_by = 0;
		976
		977	// only relevant for players(?), but make sure of it anyways
		978	contr = 0;
1075		979
1076	/* Remove object from the active list */	980	/* Remove object from the active list */
1077	speed = 0;	981	speed = 0;
1078	update_ob_speed (this);	982	update_ob_speed (this);
1079		983
1080	unlink ();	984	unlink ();
1081		985
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);	986	mortals.push_back (this);
1085	}	987	}
1086		988
1087	/*	989	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	990	* sub_weight() recursively (outwards) subtracts a number from the
1089	* weight of an object (and what is carried by it's environment(s)).	991	* weight of an object (and what is carried by it's environment(s)).
1090	*/	992	*/
1091
1092	void	993	void
1093	sub_weight (object *op, signed long weight)	994	sub_weight (object *op, signed long weight)
1094	{	995	{
1095	while (op != NULL)	996	while (op != NULL)
1096	{	997	{
1097	if (op->type == CONTAINER)	998	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	1000
1101	op->carrying -= weight;	1001	op->carrying -= weight;
1102	op = op->env;	1002	op = op->env;
1103	}	1003	}
1104	}	1004	}
1105		1005
1106	/* remove_ob(op):	1006	/* op->remove ():
1107	* This function removes the object op from the linked list of objects	1007	* This function removes the object op from the linked list of objects
1108	* which it is currently tied to. When this function is done, the	1008	* which it is currently tied to. When this function is done, the
1109	* object will have no environment. If the object previously had an	1009	* object will have no environment. If the object previously had an
1110	* environment, the x and y coordinates will be updated to	1010	* environment, the x and y coordinates will be updated to
1111	* the previous environment.	1011	* the previous environment.
1112	* Beware: This function is called from the editor as well!	1012	* Beware: This function is called from the editor as well!
1113	*/	1013	*/
1114
1115	void	1014	void
1116	remove_ob (object *op)	1015	object::remove ()
1117	{	1016	{
1118	object *tmp, *last = NULL;	1017	object *tmp, *last = 0;
1119	object *otmp;	1018	object *otmp;
1120		1019
1121	tag_t tag;
1122	int check_walk_off;	1020	int check_walk_off;
1123	mapstruct *m;
1124		1021
1125	sint16 x, y;
1126
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1128	{	1023	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		1024
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);	1025	SET_FLAG (this, FLAG_REMOVED);
		1026
		1027	if (more)
		1028	more->remove ();
1149		1029
1150	/*	1030	/*
1151	* In this case, the object to be removed is in someones	1031	* In this case, the object to be removed is in someones
1152	* inventory.	1032	* inventory.
1153	*/	1033	*/
1154	if (op->env != NULL)	1034	if (env)
1155	{	1035	{
1156	if (op->nrof)	1036	if (nrof)
1157	sub_weight (op->env, op->weight * op->nrof);	1037	sub_weight (env, weight * nrof);
1158	else	1038	else
1159	sub_weight (op->env, op->weight + op->carrying);	1039	sub_weight (env, weight + carrying);
1160		1040
1161	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1162	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1163	* to save cpu time.	1043	* to save cpu time.
1164	*/	1044	*/
1165	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1166	fix_player (otmp);	1046	fix_player (otmp);
1167		1047
1168	if (op->above != NULL)	1048	if (above != NULL)
1169	op->above->below = op->below;	1049	above->below = below;
1170	else	1050	else
1171	op->env->inv = op->below;	1051	env->inv = below;
1172		1052
1173	if (op->below != NULL)	1053	if (below != NULL)
1174	op->below->above = op->above;	1054	below->above = above;
1175		1055
1176	/* we set up values so that it could be inserted into	1056	/* we set up values so that it could be inserted into
1177	* the map, but we don't actually do that - it is up	1057	* the map, but we don't actually do that - it is up
1178	* to the caller to decide what we want to do.	1058	* to the caller to decide what we want to do.
1179	*/	1059	*/
1180	op->x = op->env->x, op->y = op->env->y;	1060	x = env->x, y = env->y;
1181	op->map = op->env->map;	1061	map = env->map;
1182	op->above = NULL, op->below = NULL;	1062	above = 0, below = 0;
1183	op->env = NULL;	1063	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	{	1064	}
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1065	else if (map)
1198	op->map->path, op->x, op->y);	1066	{
1199	/* in old days, we used to set x and y to 0 and continue.	1067	/* Re did the following section of code - it looks like it had
1200	* it seems if we get into this case, something is probablye	1068	* lots of logic for things we no longer care about
1201	* screwed up and should be fixed.
1202	*/	1069	*/
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		1070
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 */	1071	/* link the object above us */
1216	if (op->above)	1072	if (above)
1217	op->above->below = op->below;	1073	above->below = below;
1218	else	1074	else
1219	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1220		1076
1221	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1222	if (op->below)	1078	if (below)
1223	op->below->above = op->above;	1079	below->above = above;
1224	else	1080	else
1225	{	1081	{
1226	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1227	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1228	* evident	1084	* 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	*/	1085	*/
1263	if (tmp->container == op)	1086	if (GET_MAP_OB (map, x, y) != this)
1264	{	1087	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	1088	char *dump = dump_object (this);
1266	tmp->container = NULL;	1089	LOG (llevError,
		1090	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);
		1091	free (dump);
		1092	dump = dump_object (GET_MAP_OB (map, x, y));
		1093	LOG (llevError, "%s\n", dump);
		1094	free (dump);
1267	}	1095	}
1268		1096
1269	tmp->contr->socket.update_look = 1;	1097	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	{	1098	}
1274	move_apply (tmp, op, NULL);
1275		1099
1276	if (was_destroyed (op, tag))	1100	above = 0;
		1101	below = 0;
		1102
		1103	if (map->in_memory == MAP_SAVING)
		1104	return;
		1105
		1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1107
		1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
		1109	{
		1110	/* No point updating the players look faces if he is the object
		1111	* being removed.
		1112	*/
		1113
		1114	if (tmp->type == PLAYER && tmp != this)
1277	{	1115	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1116	/* If a container that the player is currently using somehow gets
		1117	* removed (most likely destroyed), update the player view
		1118	* appropriately.
		1119	*/
		1120	if (tmp->container == this)
		1121	{
		1122	CLEAR_FLAG (this, FLAG_APPLIED);
		1123	tmp->container = 0;
		1124	}
		1125
		1126	tmp->contr->socket->floorbox_update ();
1279	}	1127	}
		1128
		1129	/* See if player moving off should effect something */
		1130	if (check_walk_off
		1131	&& ((move_type & tmp->move_off)
		1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1133	{
		1134	move_apply (tmp, this, 0);
		1135
		1136	if (destroyed ())
		1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1138	}
1281		1139
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1141
1284	if (tmp->above == tmp)	1142	if (tmp->above == tmp)
1285	tmp->above = NULL;	1143	tmp->above = 0;
1286		1144
1287	last = tmp;	1145	last = tmp;
1288	}	1146	}
1289		1147
1290	/* last == NULL of there are no objects on this space */	1148	/* last == NULL of there are no objects on this space */
1291	if (last == NULL)	1149	if (!last)
1292	{	1150	{
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295	* those out anyways, and if there are any flags set right now, they won't	1153	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.	1154	* be correct anyways.
1297	*/	1155	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);	1157	update_position (map, x, y);
1300	}	1158	}
1301	else	1159	else
1302	update_object (last, UP_OBJ_REMOVE);	1160	update_object (last, UP_OBJ_REMOVE);
1303		1161
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1305	update_all_los (op->map, op->x, op->y);	1163	update_all_los (map, x, y);
		1164	}
1306	}	1165	}
1307		1166
1308	/*	1167	/*
1309	* merge_ob(op,top):	1168	* merge_ob(op,top):
1310	*	1169	*
1311	* This function goes through all objects below and including top, and	1170	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1171	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1172	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1173	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1174	*/
1316
1317	object *	1175	object *
1318	merge_ob (object *op, object *top)	1176	merge_ob (object *op, object *top)
1319	{	1177	{
1320	if (!op->nrof)	1178	if (!op->nrof)
1321	return 0;	1179	return 0;
		1180
1322	if (top == NULL)	1181	if (top == NULL)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1182	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1183
1324	for (; top != NULL; top = top->below)	1184	for (; top != NULL; top = top->below)
1325	{	1185	{
1326	if (top == op)	1186	if (top == op)
1327	continue;	1187	continue;
1328	if (CAN_MERGE (op, top))	1188
		1189	if (object::can_merge (op, top))
1329	{	1190	{
1330	top->nrof += op->nrof;	1191	top->nrof += op->nrof;
1331		1192
1332	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1333	op->weight = 0; /* Don't want any adjustements now */	1194	op->weight = 0; /* Don't want any adjustements now */
1334	remove_ob (op);	1195	op->destroy ();
1335	free_object (op);
1336	return top;	1196	return top;
1337	}	1197	}
1338	}	1198	}
		1199
1339	return NULL;	1200	return 0;
1340	}	1201	}
1341		1202
1342	/*	1203	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1205	* job preparing multi-part monsters
1345	*/	1206	*/
1346	object *	1207	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1209	{
1349	object *	1210	object *tmp;
1350	tmp;
1351		1211
1352	if (op->head)	1212	if (op->head)
1353	op = op->head;	1213	op = op->head;
		1214
1354	for (tmp = op; tmp; tmp = tmp->more)	1215	for (tmp = op; tmp; tmp = tmp->more)
1355	{	1216	{
1356	tmp->x = x + tmp->arch->clone.x;	1217	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1218	tmp->y = y + tmp->arch->clone.y;
1358	}	1219	}
		1220
1359	return insert_ob_in_map (op, m, originator, flag);	1221	return insert_ob_in_map (op, m, originator, flag);
1360	}	1222	}
1361		1223
1362	/*	1224	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1225	* insert_ob_in_map (op, map, originator, flag):
…		…
1379	* NULL if 'op' was destroyed	1241	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1242	* just 'op' otherwise
1381	*/	1243	*/
1382		1244
1383	object *	1245	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1247	{
1386	object *tmp, *top, *floor = NULL;	1248	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1249	sint16 x, y;
1388		1250
1389	if (QUERY_FLAG (op, FLAG_FREED))	1251	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1392	return NULL;	1254	return NULL;
1393	}	1255	}
1394		1256
1395	if (m == NULL)	1257	if (m == NULL)
1396	{	1258	{
1397	dump_object (op);	1259	char *dump = dump_object (op);
1398	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1261	free (dump);
1399	return op;	1262	return op;
1400	}	1263	}
1401		1264
1402	if (out_of_map (m, op->x, op->y))	1265	if (out_of_map (m, op->x, op->y))
1403	{	1266	{
1404	dump_object (op);	1267	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1406	#ifdef MANY_CORES	1269	#ifdef MANY_CORES
1407	/* Better to catch this here, as otherwise the next use of this object	1270	/* Better to catch this here, as otherwise the next use of this object
1408	* is likely to cause a crash. Better to find out where it is getting	1271	* is likely to cause a crash. Better to find out where it is getting
1409	* improperly inserted.	1272	* improperly inserted.
1410	*/	1273	*/
1411	abort ();	1274	abort ();
1412	#endif	1275	#endif
		1276	free (dump);
1413	return op;	1277	return op;
1414	}	1278	}
1415		1279
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1281	{
1418	dump_object (op);	1282	char *dump = dump_object (op);
1419	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1284	free (dump);
1420	return op;	1285	return op;
1421	}	1286	}
1422		1287
1423	if (op->more != NULL)	1288	if (op->more != NULL)
1424	{	1289	{
…		…
1462		1327
1463	/* this has to be done after we translate the coordinates.	1328	/* this has to be done after we translate the coordinates.
1464	*/	1329	*/
1465	if (op->nrof && !(flag & INS_NO_MERGE))	1330	if (op->nrof && !(flag & INS_NO_MERGE))
1466	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1467	if (CAN_MERGE (op, tmp))	1332	if (object::can_merge (op, tmp))
1468	{	1333	{
1469	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1470	remove_ob (tmp);	1335	tmp->destroy ();
1471	free_object (tmp);
1472	}	1336	}
1473		1337
1474	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1475	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1476		1340
…		…
1604	* it, so save a few ticks and start from there.	1468	* it, so save a few ticks and start from there.
1605	*/	1469	*/
1606	if (!(flag & INS_MAP_LOAD))	1470	if (!(flag & INS_MAP_LOAD))
1607	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1608	if (tmp->type == PLAYER)	1472	if (tmp->type == PLAYER)
1609	tmp->contr->socket.update_look = 1;	1473	tmp->contr->socket->floorbox_update ();
1610		1474
1611	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1612	* visible to others on this map. But update_all_los is really	1476	* visible to others on this map. But update_all_los is really
1613	* an inefficient way to do this, as it means los for all players	1477	* an inefficient way to do this, as it means los for all players
1614	* on the map will get recalculated. The players could very well	1478	* on the map will get recalculated. The players could very well
…		…
1622		1486
1623	/* updates flags (blocked, alive, no magic, etc) for this map space */	1487	/* updates flags (blocked, alive, no magic, etc) for this map space */
1624	update_object (op, UP_OBJ_INSERT);	1488	update_object (op, UP_OBJ_INSERT);
1625		1489
1626	/* Don't know if moving this to the end will break anything. However,	1490	/* Don't know if moving this to the end will break anything. However,
1627	* we want to have update_look set above before calling this.	1491	* we want to have floorbox_update called before calling this.
1628	*	1492	*
1629	* check_move_on() must be after this because code called from	1493	* check_move_on() must be after this because code called from
1630	* check_move_on() depends on correct map flags (so functions like	1494	* check_move_on() depends on correct map flags (so functions like
1631	* blocked() and wall() work properly), and these flags are updated by	1495	* blocked() and wall() work properly), and these flags are updated by
1632	* update_object().	1496	* update_object().
…		…
1654	* op is the object to insert it under: supplies x and the map.	1518	* op is the object to insert it under: supplies x and the map.
1655	*/	1519	*/
1656	void	1520	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1521	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1522	{
1659	object *tmp;	1523	object *
		1524	tmp;
1660	object *tmp1;	1525	object *
		1526	tmp1;
1661		1527
1662	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1663		1529
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1530	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1665	{
1666	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1667	{	1532	tmp->destroy ();
1668	remove_ob (tmp);
1669	free_object (tmp);
1670	}
1671	}
1672		1533
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1534	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1535
1675	tmp1->x = op->x;	1536	tmp1->x = op->x;
1676	tmp1->y = op->y;	1537	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1538	insert_ob_in_map (tmp1, op->map, op, 0);
1678	}	1539	}
…		…
1686	*/	1547	*/
1687		1548
1688	object *	1549	object *
1689	get_split_ob (object *orig_ob, uint32 nr)	1550	get_split_ob (object *orig_ob, uint32 nr)
1690	{	1551	{
1691	object *	1552	object *newob;
1692	newob;
1693	int
1694	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1695		1554
1696	if (orig_ob->nrof < nr)	1555	if (orig_ob->nrof < nr)
1697	{	1556	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1557	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1558	return NULL;
1700	}	1559	}
		1560
1701	newob = object_create_clone (orig_ob);	1561	newob = object_create_clone (orig_ob);
		1562
1702	if ((orig_ob->nrof -= nr) < 1)	1563	if ((orig_ob->nrof -= nr) < 1)
1703	{	1564	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)	1565	else if (!is_removed)
1709	{	1566	{
1710	if (orig_ob->env != NULL)	1567	if (orig_ob->env != NULL)
1711	sub_weight (orig_ob->env, orig_ob->weight * nr);	1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1712	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1569	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1571	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");	1572	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1573	return NULL;
1717	}	1574	}
1718	}	1575	}
		1576
1719	newob->nrof = nr;	1577	newob->nrof = nr;
1720		1578
1721	return newob;	1579	return newob;
1722	}	1580	}
1723		1581
…		…
1730	*/	1588	*/
1731		1589
1732	object *	1590	object *
1733	decrease_ob_nr (object *op, uint32 i)	1591	decrease_ob_nr (object *op, uint32 i)
1734	{	1592	{
1735	object *	1593	object *tmp;
1736	tmp;
1737	player *	1594	player *pl;
1738	pl;
1739		1595
1740	if (i == 0) /* objects with op->nrof require this check */	1596	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1597	return op;
1742		1598
1743	if (i > op->nrof)	1599	if (i > op->nrof)
1744	i = op->nrof;	1600	i = op->nrof;
1745		1601
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1603	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1604	else if (op->env)
1751	{	1605	{
1752	/* is this object in the players inventory, or sub container	1606	/* is this object in the players inventory, or sub container
1753	* therein?	1607	* therein?
1754	*/	1608	*/
1755	tmp = is_player_inv (op->env);	1609	tmp = op->in_player ();
1756	/* nope. Is this a container the player has opened?	1610	/* nope. Is this a container the player has opened?
1757	* If so, set tmp to that player.	1611	* If so, set tmp to that player.
1758	* IMO, searching through all the players will mostly	1612	* IMO, searching through all the players will mostly
1759	* likely be quicker than following op->env to the map,	1613	* likely be quicker than following op->env to the map,
1760	* and then searching the map for a player.	1614	* and then searching the map for a player.
1761	*/	1615	*/
1762	if (!tmp)	1616	if (!tmp)
1763	{	1617	{
1764	for (pl = first_player; pl; pl = pl->next)	1618	for (pl = first_player; pl; pl = pl->next)
1765	if (pl->ob->container == op->env)	1619	if (pl->ob->container == op->env)
		1620	{
		1621	tmp = pl->ob;
1766	break;	1622	break;
1767	if (pl)	1623	}
1768	tmp = pl->ob;
1769	else
1770	tmp = NULL;
1771	}	1624	}
1772		1625
1773	if (i < op->nrof)	1626	if (i < op->nrof)
1774	{	1627	{
1775	sub_weight (op->env, op->weight * i);	1628	sub_weight (op->env, op->weight * i);
1776	op->nrof -= i;	1629	op->nrof -= i;
1777	if (tmp)	1630	if (tmp)
1778	{
1779	esrv_send_item (tmp, op);	1631	esrv_send_item (tmp, op);
1780	}
1781	}	1632	}
1782	else	1633	else
1783	{	1634	{
1784	remove_ob (op);	1635	op->remove ();
1785	op->nrof = 0;	1636	op->nrof = 0;
1786	if (tmp)	1637	if (tmp)
1787	{
1788	esrv_del_item (tmp->contr, op->count);	1638	esrv_del_item (tmp->contr, op->count);
1789	}
1790	}	1639	}
1791	}	1640	}
1792	else	1641	else
1793	{	1642	{
1794	object *
1795	above = op->above;	1643	object *above = op->above;
1796		1644
1797	if (i < op->nrof)	1645	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1646	op->nrof -= i;
1800	}
1801	else	1647	else
1802	{	1648	{
1803	remove_ob (op);	1649	op->remove ();
1804	op->nrof = 0;	1650	op->nrof = 0;
1805	}	1651	}
		1652
1806	/* Since we just removed op, op->above is null */	1653	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1654	for (tmp = above; tmp; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1655	if (tmp->type == PLAYER)
1809	{	1656	{
1810	if (op->nrof)	1657	if (op->nrof)
1811	esrv_send_item (tmp, op);	1658	esrv_send_item (tmp, op);
1812	else	1659	else
1813	esrv_del_item (tmp->contr, op->count);	1660	esrv_del_item (tmp->contr, op->count);
1814	}	1661	}
1815	}	1662	}
1816		1663
1817	if (op->nrof)	1664	if (op->nrof)
1818	{
1819	return op;	1665	return op;
1820	}
1821	else	1666	else
1822	{	1667	{
1823	free_object (op);	1668	op->destroy ();
1824	return NULL;	1669	return 0;
1825	}	1670	}
1826	}	1671	}
1827		1672
1828	/*	1673	/*
1829	* add_weight(object, weight) adds the specified weight to an object,	1674	* add_weight(object, weight) adds the specified weight to an object,
…		…
1834	add_weight (object *op, signed long weight)	1679	add_weight (object *op, signed long weight)
1835	{	1680	{
1836	while (op != NULL)	1681	while (op != NULL)
1837	{	1682	{
1838	if (op->type == CONTAINER)	1683	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1684	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1685
1842	op->carrying += weight;	1686	op->carrying += weight;
1843	op = op->env;	1687	op = op->env;
1844	}	1688	}
1845	}	1689	}
1846		1690
		1691	object *
		1692	insert_ob_in_ob (object *op, object *where)
		1693	{
		1694	if (!where)
		1695	{
		1696	char *dump = dump_object (op);
		1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1698	free (dump);
		1699	return op;
		1700	}
		1701
		1702	if (where->head)
		1703	{
		1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1705	where = where->head;
		1706	}
		1707
		1708	return where->insert (op);
		1709	}
		1710
1847	/*	1711	/*
1848	* insert_ob_in_ob(op,environment):	1712	* env->insert (op)
1849	* This function inserts the object op in the linked list	1713	* This function inserts the object op in the linked list
1850	* inside the object environment.	1714	* inside the object environment.
1851	*	1715	*
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	1716	* The function returns now pointer to inserted item, and return value can
1858	* be != op, if items are merged. -Tero	1717	* be != op, if items are merged. -Tero
1859	*/	1718	*/
1860		1719
1861	object *	1720	object *
1862	insert_ob_in_ob (object *op, object *where)	1721	object::insert (object *op)
1863	{	1722	{
1864	object *	1723	object *tmp, *otmp;
1865	tmp, *
1866	otmp;
1867		1724
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1726	op->remove ();
1870	dump_object (op);	1727
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)	1728	if (op->more)
1886	{	1729	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1730	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1731	return op;
1889	}	1732	}
		1733
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1735	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1736	if (op->nrof)
1893	{	1737	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1895	if (CAN_MERGE (tmp, op))	1739	if (object::can_merge (tmp, op))
1896	{	1740	{
1897	/* return the original object and remove inserted object	1741	/* return the original object and remove inserted object
1898	(client needs the original object) */	1742	(client needs the original object) */
1899	tmp->nrof += op->nrof;	1743	tmp->nrof += op->nrof;
1900	/* Weight handling gets pretty funky. Since we are adding to	1744	/* Weight handling gets pretty funky. Since we are adding to
1901	* tmp->nrof, we need to increase the weight.	1745	* tmp->nrof, we need to increase the weight.
1902	*/	1746	*/
1903	add_weight (where, op->weight * op->nrof);	1747	add_weight (this, op->weight * op->nrof);
1904	SET_FLAG (op, FLAG_REMOVED);	1748	SET_FLAG (op, FLAG_REMOVED);
1905	free_object (op); /* free the inserted object */	1749	op->destroy (); /* free the inserted object */
1906	op = tmp;	1750	op = tmp;
1907	remove_ob (op); /* and fix old object's links */	1751	op->remove (); /* and fix old object's links */
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1752	CLEAR_FLAG (op, FLAG_REMOVED);
1909	break;	1753	break;
1910	}	1754	}
1911		1755
1912	/* I assume combined objects have no inventory	1756	/* I assume combined objects have no inventory
1913	* We add the weight - this object could have just been removed	1757	* We add the weight - this object could have just been removed
1914	* (if it was possible to merge). calling remove_ob will subtract	1758	* (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	1759	* the weight, so we need to add it in again, since we actually do
1916	* the linking below	1760	* the linking below
1917	*/	1761	*/
1918	add_weight (where, op->weight * op->nrof);	1762	add_weight (this, op->weight * op->nrof);
1919	}	1763	}
1920	else	1764	else
1921	add_weight (where, (op->weight + op->carrying));	1765	add_weight (this, (op->weight + op->carrying));
1922		1766
1923	otmp = is_player_inv (where);	1767	otmp = this->in_player ();
1924	if (otmp && otmp->contr != NULL)	1768	if (otmp && otmp->contr)
1925	{
1926	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1927	fix_player (otmp);	1770	fix_player (otmp);
1928	}
1929		1771
1930	op->map = NULL;	1772	op->map = 0;
1931	op->env = where;	1773	op->env = this;
1932	op->above = NULL;	1774	op->above = 0;
1933	op->below = NULL;	1775	op->below = 0;
1934	op->x = 0, op->y = 0;	1776	op->x = 0, op->y = 0;
1935		1777
1936	/* reset the light list and los of the players on the map */	1778	/* reset the light list and los of the players on the map */
1937	if ((op->glow_radius != 0) && where->map)	1779	if ((op->glow_radius != 0) && map)
1938	{	1780	{
1939	#ifdef DEBUG_LIGHTS	1781	#ifdef DEBUG_LIGHTS
1940	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1941	#endif /* DEBUG_LIGHTS */	1783	#endif /* DEBUG_LIGHTS */
1942	if (MAP_DARKNESS (where->map))	1784	if (MAP_DARKNESS (map))
1943	update_all_los (where->map, where->x, where->y);	1785	update_all_los (map, x, y);
1944	}	1786	}
1945		1787
1946	/* Client has no idea of ordering so lets not bother ordering it here.	1788	/* Client has no idea of ordering so lets not bother ordering it here.
1947	* It sure simplifies this function...	1789	* It sure simplifies this function...
1948	*/	1790	*/
1949	if (where->inv == NULL)	1791	if (!inv)
1950	where->inv = op;	1792	inv = op;
1951	else	1793	else
1952	{	1794	{
1953	op->below = where->inv;	1795	op->below = inv;
1954	op->below->above = op;	1796	op->below->above = op;
1955	where->inv = op;	1797	inv = op;
1956	}	1798	}
		1799
1957	return op;	1800	return op;
1958	}	1801	}
1959		1802
1960	/*	1803	/*
1961	* Checks if any objects has a move_type that matches objects	1804	* Checks if any objects has a move_type that matches objects
…		…
1980		1823
1981	int	1824	int
1982	check_move_on (object *op, object *originator)	1825	check_move_on (object *op, object *originator)
1983	{	1826	{
1984	object *tmp;	1827	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1828	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1829	int x = op->x, y = op->y;
1988		1830
1989	MoveType move_on, move_slow, move_block;	1831	MoveType move_on, move_slow, move_block;
1990		1832
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1833	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1834	return 0;
1993
1994	tag = op->count;
1995		1835
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1836	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1997	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1837	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1998	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1838	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1839
…		…
2042	{	1882	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1883	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))	1884	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1885	{
2046		1886
		1887	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1888	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1889
2049	if (op->type == PLAYER)	1890	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1891	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)))	1892	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1893	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1900	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))	1901	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	1902	{
2062	move_apply (tmp, op, originator);	1903	move_apply (tmp, op, originator);
2063		1904
2064	if (was_destroyed (op, tag))	1905	if (op->destroyed ())
2065	return 1;	1906	return 1;
2066		1907
2067	/* what the person/creature stepped onto has moved the object	1908	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1909	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1910	* have a feeling strange problems would result.
…		…
2081	* a matching archetype at the given map and coordinates.	1922	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1923	* The first matching object is returned, or NULL if none.
2083	*/	1924	*/
2084		1925
2085	object *	1926	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1927	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1928	{
2088	object *	1929	object *
2089	tmp;	1930	tmp;
2090		1931
2091	if (m == NULL || out_of_map (m, x, y))	1932	if (m == NULL || out_of_map (m, x, y))
…		…
2104	* a matching type variable at the given map and coordinates.	1945	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
2106	*/	1947	*/
2107		1948
2108	object *	1949	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	1950	present (unsigned char type, maptile *m, int x, int y)
2110	{	1951	{
2111	object *	1952	object *
2112	tmp;	1953	tmp;
2113		1954
2114	if (out_of_map (m, x, y))	1955	if (out_of_map (m, x, y))
…		…
2254	* the archetype because that isn't correct if the monster has been	2095	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	2096	* customized, changed states, etc.
2256	*/	2097	*/
2257		2098
2258	int	2099	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	2101	{
2261	int	2102	int
2262	i,	2103	i,
2263	index = 0, flag;	2104	index = 0, flag;
2264	static int	2105	static int
…		…
2276	* if the space being examined only has a wall to the north and empty	2117	* if the space being examined only has a wall to the north and empty
2277	* spaces in all the other directions, this will reduce the search space	2118	* spaces in all the other directions, this will reduce the search space
2278	* to only the spaces immediately surrounding the target area, and	2119	* to only the spaces immediately surrounding the target area, and
2279	* won't look 2 spaces south of the target space.	2120	* won't look 2 spaces south of the target space.
2280	*/	2121	*/
2281	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2282	stop = maxfree[i];	2123	stop = maxfree[i];
2283	}	2124	}
		2125
2284	if (!index)	2126	if (!index)
2285	return -1;	2127	return -1;
		2128
2286	return altern[RANDOM () % index];	2129	return altern[RANDOM () % index];
2287	}	2130	}
2288		2131
2289	/*	2132	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	2135	* But it will return the first available spot, not a random choice.
2293	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2137	*/
2295		2138
2296	int	2139	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2141	{
2299	int	2142	int
2300	i;	2143	i;
2301		2144
2302	for (i = 0; i < SIZEOFFREE; i++)	2145	for (i = 0; i < SIZEOFFREE; i++)
…		…
2366	* because we have to know what movement the thing looking to move	2209	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2210	* there is capable of.
2368	*/	2211	*/
2369		2212
2370	int	2213	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2214	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2215	{
2373	int	2216	int
2374	i,	2217	i,
2375	max = SIZEOFFREE, mflags;	2218	max = SIZEOFFREE, mflags;
2376	sint16	2219
2377	nx,	2220	sint16 nx, ny;
2378	ny;
2379	object *	2221	object *
2380	tmp;	2222	tmp;
2381	mapstruct *	2223	maptile *
2382	mp;	2224	mp;
2383	MoveType	2225
2384	blocked,	2226	MoveType blocked, move_type;
2385	move_type;
2386		2227
2387	if (exclude && exclude->head)	2228	if (exclude && exclude->head)
2388	{	2229	{
2389	exclude = exclude->head;	2230	exclude = exclude->head;
2390	move_type = exclude->move_type;	2231	move_type = exclude->move_type;
…		…
2595	* Modified to be map tile aware -.MSW	2436	* Modified to be map tile aware -.MSW
2596	*/	2437	*/
2597		2438
2598		2439
2599	int	2440	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2441	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2442	{
2602	sint16	2443	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int	2444	int
2606	mflags;	2445	mflags;
2607		2446
2608	if (dir < 0)	2447	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2448	return 0; /* exit condition: invalid direction */
…		…
2656	* create clone from object to another	2495	* create clone from object to another
2657	*/	2496	*/
2658	object *	2497	object *
2659	object_create_clone (object *asrc)	2498	object_create_clone (object *asrc)
2660	{	2499	{
2661	object *
2662	dst = NULL, *tmp, *src, *part, *prev, *item;	2500	object *dst = 0, *tmp, *src, *part, *prev, *item;
2663		2501
2664	if (!asrc)	2502	if (!asrc)
2665	return NULL;	2503	return 0;
		2504
2666	src = asrc;	2505	src = asrc;
2667	if (src->head)	2506	if (src->head)
2668	src = src->head;	2507	src = src->head;
2669		2508
2670	prev = NULL;	2509	prev = 0;
2671	for (part = src; part; part = part->more)	2510	for (part = src; part; part = part->more)
2672	{	2511	{
2673	tmp = get_object ();	2512	tmp = part->clone ();
2674	copy_object (part, tmp);
2675	tmp->x -= src->x;	2513	tmp->x -= src->x;
2676	tmp->y -= src->y;	2514	tmp->y -= src->y;
		2515
2677	if (!part->head)	2516	if (!part->head)
2678	{	2517	{
2679	dst = tmp;	2518	dst = tmp;
2680	tmp->head = NULL;	2519	tmp->head = 0;
2681	}	2520	}
2682	else	2521	else
2683	{	2522	{
2684	tmp->head = dst;	2523	tmp->head = dst;
2685	}	2524	}
		2525
2686	tmp->more = NULL;	2526	tmp->more = 0;
		2527
2687	if (prev)	2528	if (prev)
2688	prev->more = tmp;	2529	prev->more = tmp;
		2530
2689	prev = tmp;	2531	prev = tmp;
2690	}	2532	}
2691		2533
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2534	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2535	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2536
2698	return dst;	2537	return dst;
2699	}	2538	}
2700		2539
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. */	2540	/* 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 */	2541	/* 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, */	2542	/* 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. */	2543	/* 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. */	2544	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2545	/* Also remember that multiparts objects are not supported for now. */
2721		2546
2722	object *	2547	object *
2723	load_object_str (const char *obstr)	2548	load_object_str (const char *obstr)
2724	{	2549	{
2725	object *	2550	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2551	char filename[MAX_BUF];
2729		2552
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2554
2732	FILE *
2733	tempfile = fopen (filename, "w");	2555	FILE *tempfile = fopen (filename, "w");
2734		2556
2735	if (tempfile == NULL)	2557	if (tempfile == NULL)
2736	{	2558	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2560	return NULL;
2739	};	2561	}
		2562
2740	fprintf (tempfile, obstr);	2563	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2564	fclose (tempfile);
2742		2565
2743	op = get_object ();	2566	op = object::create ();
2744		2567
2745	object_thawer	2568	object_thawer thawer (filename);
2746	thawer (filename);
2747		2569
2748	if (thawer)	2570	if (thawer)
2749	load_object (thawer, op, 0);	2571	load_object (thawer, op, 0);
2750		2572
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2573	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2581	* returns NULL if no match.
2760	*/	2582	*/
2761	object *	2583	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2584	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2585	{
2764	object *	2586	object *tmp;
2765	tmp;
2766		2587
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2588	for (tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2589	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2590	return tmp;
2770		2591
…		…
2778	* do the desired thing.	2599	* do the desired thing.
2779	*/	2600	*/
2780	key_value *	2601	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2602	get_ob_key_link (const object *ob, const char *key)
2782	{	2603	{
2783	key_value *	2604	key_value *link;
2784	link;
2785		2605
2786	for (link = ob->key_values; link != NULL; link = link->next)	2606	for (link = ob->key_values; link != NULL; link = link->next)
2787	{
2788	if (link->key == key)	2607	if (link->key == key)
2789	{
2790	return link;	2608	return link;
2791	}
2792	}
2793		2609
2794	return NULL;	2610	return NULL;
2795	}	2611	}
2796		2612
2797	/*	2613	/*
…		…
2802	* The returned string is shared.	2618	* The returned string is shared.
2803	*/	2619	*/
2804	const char *	2620	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2621	get_ob_key_value (const object *op, const char *const key)
2806	{	2622	{
2807	key_value *	2623	key_value *link;
2808	link;	2624	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2625
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2626	if (!canonical_key)
2815	{	2627	{
2816	/* 1. There being a field named key on any object	2628	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2629	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2630	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2631	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2632	*/
2821	return NULL;	2633	return 0;
2822	}	2634	}
2823		2635
2824	/* This is copied from get_ob_key_link() above -	2636	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2637	* only 4 lines, and saves the function call overhead.
2826	*/	2638	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2639	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2640	if (link->key == canonical_key)
2830	{
2831	return link->value;	2641	return link->value;
2832	}	2642
2833	}
2834	return NULL;	2643	return 0;
2835	}	2644	}
2836		2645
2837		2646
2838	/*	2647	/*
2839	* Updates the canonical_key in op to value.	2648	* Updates the canonical_key in op to value.
…		…
2875	if (last)	2684	if (last)
2876	last->next = field->next;	2685	last->next = field->next;
2877	else	2686	else
2878	op->key_values = field->next;	2687	op->key_values = field->next;
2879		2688
2880	delete
2881	field;	2689	delete field;
2882	}	2690	}
2883	}	2691	}
2884	return TRUE;	2692	return TRUE;
2885	}	2693	}
2886	/* IF we get here, key doesn't exist */	2694	/* IF we get here, key doesn't exist */
…		…
2921	* Returns TRUE on success.	2729	* Returns TRUE on success.
2922	*/	2730	*/
2923	int	2731	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2732	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2733	{
2926	shstr
2927	key_ (key);	2734	shstr key_ (key);
2928		2735
2929	return set_ob_key_value_s (op, key_, value, add_key);	2736	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2737	}
		2738
		2739	object::depth_iterator::depth_iterator (object *container)
		2740	: iterator_base (container)
		2741	{
		2742	while (item->inv)
		2743	item = item->inv;
		2744	}
		2745
		2746	void
		2747	object::depth_iterator::next ()
		2748	{
		2749	if (item->below)
		2750	{
		2751	item = item->below;
		2752
		2753	while (item->inv)
		2754	item = item->inv;
		2755	}
		2756	else
		2757	item = item->env;
		2758	}
		2759
		2760	// return a suitable string describing an objetc in enough detail to find it
		2761	const char *
		2762	object::debug_desc (char *info) const
		2763	{
		2764	char info2[256 * 3];
		2765	char *p = info;
		2766
		2767	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2768	count,
		2769	&name,
		2770	title ? " " : "",
		2771	title ? (const char *)title : "");
		2772
		2773	if (env)
		2774	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2775
		2776	if (map)
		2777	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2778
		2779	return info;
		2780	}
		2781
		2782	const char *
		2783	object::debug_desc () const
		2784	{
		2785	static char info[256 * 3];
		2786	return debug_desc (info);
		2787	}
		2788

Diff Legend

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