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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 2006 UTC

1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 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.
…		…
281	op = op->env;	352	op = op->env;
282	return op;	353	return op;
283	}	354	}
284		355
285	/*	356	/*
286	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
287	* a better check. We basically keeping traversing up until we can't
288	* or find a player.
289	*/
290
291	object *
292	is_player_inv (object *op)
293	{
294	for (; op != NULL && op->type != PLAYER; op = op->env)
295	if (op->env == op)
296	op->env = NULL;
297	return op;
298	}
299
300	/*
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.	358	* Some error messages.
303	* 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.
304	*/	360	*/
305		361
306	void	362	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)	363	dump_object (object *op)
362	{	364	{
363	if (op == NULL)	365	if (!op)
364	{	366	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		367
372	void	368	object_freezer freezer;
373	dump_all_objects (void)	369	save_object (freezer, op, 3);
374	{	370	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	}	371	}
383		372
384	/*	373	/*
385	* 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
386	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
406	*/	395	*/
407		396
408	object *	397	object *
409	find_object (tag_t i)	398	find_object (tag_t i)
410	{	399	{
411	object *op;	400	for (object *op = object::first; op; op = op->next)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	401	if (op->count == i)
415	break;	402	return op;
		403
416	return op;	404	return 0;
417	}	405	}
418		406
419	/*	407	/*
420	* 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.
421	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
423	*/	411	*/
424		412
425	object *	413	object *
426	find_object_name (const char *str)	414	find_object_name (const char *str)
427	{	415	{
428	const char *name = shstr::find (str);	416	shstr_cmp str_ (str);
429	object *op;	417	object *op;
430		418
431	for (op = objects; op != NULL; op = op->next)	419	for (op = object::first; op != NULL; op = op->next)
432	if (&op->name == name)	420	if (op->name == str_)
433	break;	421	break;
434		422
435	return op;	423	return op;
436	}	424	}
437		425
…		…
440	{	428	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}	430	}
443		431
444	/*	432	/*
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	433	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	434	* skill and experience objects.
485	*/	435	*/
486	void	436	void
487	set_owner (object *op, object *owner)	437	object::set_owner (object *owner)
488	{	438	{
489	if (owner == NULL || op == NULL)	439	if (!owner)
490	return;	440	return;
491		441
492	/* next line added to allow objects which own objects */	442	/* next line added to allow objects which own objects */
493	/* 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
494	* with the fireball owning a poison cloud which then owned the	444	* with the fireball owning a poison cloud which then owned the
495	* 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
496	* freed and then another object replacing it. Since the ownercounts	446	* 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.	447	* didn't match, this check is valid and I believe that cause is valid.
498	*/	448	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	449	while (owner->owner)
500	owner = owner->owner;	450	owner = owner->owner;
501		451
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;	452	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{
532	/* players don't have owners - they own themselves. Update
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;
539	}
540	set_owner (op, owner);
541
542	}	453	}
543		454
544	/* Zero the key_values on op, decrementing the shared-string	455	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	456	* refcounts and freeing the links.
546	*/	457	*/
…		…
556	}	467	}
557		468
558	op->key_values = 0;	469	op->key_values = 0;
559	}	470	}
560		471
561	void object::clear ()
562	{
563	attachable_base::clear ();
564
565	free_key_values (this);
566
567	name = 0;
568	name_pl = 0;
569	title = 0;
570	race = 0;
571	slaying = 0;
572	skill = 0;
573	msg = 0;
574	lore = 0;
575	custom_name = 0;
576	materialname = 0;
577
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
579
580	SET_FLAG (this, FLAG_REMOVED);
581	}
582
583	void object::clone (object *destination)
584	{
585	*(object_copy *) destination = *this;
586	*(object_pod *) destination = *this;
587
588	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*	472	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */
615
616	op->expmul = 1.0;
617	op->face = blank_face;
618	op->attacked_by_count = -1;
619
620	if (settings.casting_time)
621	op->casting_time = -1;
622	}
623
624	/*
625	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
626	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
627	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	478	* will point at garbage.
631	*/	479	*/
632
633	void	480	void
634	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
635	{	482	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
638		485
639	op2->clone (op);	486	*(object_copy *)dst = *this;
		487	*(object_pod *)dst = *this;
		488
		489	if (self || cb)
		490	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
640		491
641	if (is_freed)	492	if (is_freed)
642	SET_FLAG (op, FLAG_FREED);	493	SET_FLAG (dst, FLAG_FREED);
		494
643	if (is_removed)	495	if (is_removed)
644	SET_FLAG (op, FLAG_REMOVED);	496	SET_FLAG (dst, FLAG_REMOVED);
645		497
646	if (op2->speed < 0)	498	if (speed < 0)
647	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	499	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
648		500
649	/* Copy over key_values, if any. */	501	/* Copy over key_values, if any. */
650	if (op2->key_values)	502	if (key_values)
651	{	503	{
652	key_value *tail = 0;	504	key_value *tail = 0;
653	key_value *i;	505	key_value *i;
654		506
655	op->key_values = 0;	507	dst->key_values = 0;
656		508
657	for (i = op2->key_values; i; i = i->next)	509	for (i = key_values; i; i = i->next)
658	{	510	{
659	key_value *new_link = new key_value;	511	key_value *new_link = new key_value;
660		512
661	new_link->next = 0;	513	new_link->next = 0;
662	new_link->key = i->key;	514	new_link->key = i->key;
663	new_link->value = i->value;	515	new_link->value = i->value;
664		516
665	/* Try and be clever here, too. */	517	/* Try and be clever here, too. */
666	if (!op->key_values)	518	if (!dst->key_values)
667	{	519	{
668	op->key_values = new_link;	520	dst->key_values = new_link;
669	tail = new_link;	521	tail = new_link;
670	}	522	}
671	else	523	else
672	{	524	{
673	tail->next = new_link;	525	tail->next = new_link;
674	tail = new_link;	526	tail = new_link;
675	}	527	}
676	}	528	}
677	}	529	}
678		530
679	update_ob_speed (op);	531	update_ob_speed (dst);
		532	}
		533
		534	object *
		535	object::clone ()
		536	{
		537	object *neu = create ();
		538	copy_to (neu);
		539	return neu;
680	}	540	}
681		541
682	/*	542	/*
683	* If an object with the IS_TURNABLE() flag needs to be turned due	543	* If an object with the IS_TURNABLE() flag needs to be turned due
684	* to the closest player being on the other side, this function can	544	* to the closest player being on the other side, this function can
…		…
697	/*	557	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	558	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	559	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	560	* This function needs to be called whenever the speed of an object changes.
701	*/	561	*/
702
703	void	562	void
704	update_ob_speed (object *op)	563	update_ob_speed (object *op)
705	{	564	{
706	extern int arch_init;	565	extern int arch_init;
707		566
…		…
716	abort ();	575	abort ();
717	#else	576	#else
718	op->speed = 0;	577	op->speed = 0;
719	#endif	578	#endif
720	}	579	}
		580
721	if (arch_init)	581	if (arch_init)
722	{
723	return;	582	return;
724	}	583
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	584	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{	585	{
727	/* If already on active list, don't do anything */	586	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)	587	if (op->active_next || op->active_prev || op == active_objects)
729	return;	588	return;
730		589
731	/* process_events() expects us to insert the object at the beginning	590	/* process_events() expects us to insert the object at the beginning
732	* of the list. */	591	* of the list. */
733	op->active_next = active_objects;	592	op->active_next = active_objects;
		593
734	if (op->active_next != NULL)	594	if (op->active_next != NULL)
735	op->active_next->active_prev = op;	595	op->active_next->active_prev = op;
		596
736	active_objects = op;	597	active_objects = op;
737	}	598	}
738	else	599	else
739	{	600	{
740	/* If not on the active list, nothing needs to be done */	601	/* If not on the active list, nothing needs to be done */
…		…
742	return;	603	return;
743		604
744	if (op->active_prev == NULL)	605	if (op->active_prev == NULL)
745	{	606	{
746	active_objects = op->active_next;	607	active_objects = op->active_next;
		608
747	if (op->active_next != NULL)	609	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;	610	op->active_next->active_prev = NULL;
749	}	611	}
750	else	612	else
751	{	613	{
752	op->active_prev->active_next = op->active_next;	614	op->active_prev->active_next = op->active_next;
		615
753	if (op->active_next)	616	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;	617	op->active_next->active_prev = op->active_prev;
755	}	618	}
		619
756	op->active_next = NULL;	620	op->active_next = NULL;
757	op->active_prev = NULL;	621	op->active_prev = NULL;
758	}	622	}
759	}	623	}
760		624
…		…
788	op->active_next = NULL;	652	op->active_next = NULL;
789	op->active_prev = NULL;	653	op->active_prev = NULL;
790	}	654	}
791		655
792	/*	656	/*
793	* update_object() updates the array which represents the map.	657	* update_object() updates the the map.
794	* It takes into account invisible objects (and represent squares covered	658	* It takes into account invisible objects (and represent squares covered
795	* by invisible objects by whatever is below them (unless it's another	659	* by invisible objects by whatever is below them (unless it's another
796	* invisible object, etc...)	660	* invisible object, etc...)
797	* If the object being updated is beneath a player, the look-window	661	* If the object being updated is beneath a player, the look-window
798	* of that player is updated (this might be a suboptimal way of	662	* of that player is updated (this might be a suboptimal way of
799	* updating that window, though, since update_object() is called _often_)	663	* updating that window, though, since update_object() is called _often_)
800	*	664	*
801	* action is a hint of what the caller believes need to be done.	665	* action is a hint of what the caller believes need to be done.
802	* For example, if the only thing that has changed is the face (due to
803	* an animation), we don't need to call update_position until that actually
804	* comes into view of a player. OTOH, many other things, like addition/removal
805	* of walls or living creatures may need us to update the flags now.
806	* current action are:	666	* current action are:
807	* UP_OBJ_INSERT: op was inserted	667	* UP_OBJ_INSERT: op was inserted
808	* UP_OBJ_REMOVE: op was removed	668	* UP_OBJ_REMOVE: op was removed
809	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	669	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
810	* as that is easier than trying to look at what may have changed.	670	* as that is easier than trying to look at what may have changed.
811	* UP_OBJ_FACE: only the objects face has changed.	671	* UP_OBJ_FACE: only the objects face has changed.
812	*/	672	*/
813
814	void	673	void
815	update_object (object *op, int action)	674	update_object (object *op, int action)
816	{	675	{
817	int update_now = 0, flags;
818	MoveType move_on, move_off, move_block, move_slow;	676	MoveType move_on, move_off, move_block, move_slow;
819		677
820	if (op == NULL)	678	if (op == NULL)
821	{	679	{
822	/* this should never happen */	680	/* this should never happen */
823	LOG (llevDebug, "update_object() called for NULL object.\n");	681	LOG (llevDebug, "update_object() called for NULL object.\n");
824	return;	682	return;
825	}	683	}
826		684
827	if (op->env != NULL)	685	if (op->env)
828	{	686	{
829	/* Animation is currently handled by client, so nothing	687	/* Animation is currently handled by client, so nothing
830	* to do in this case.	688	* to do in this case.
831	*/	689	*/
832	return;	690	return;
…		…
846	abort ();	704	abort ();
847	#endif	705	#endif
848	return;	706	return;
849	}	707	}
850		708
851	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	709	mapspace &m = op->ms ();
852	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
853	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
854	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
855	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
856	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
857		710
		711	if (m.flags_ & P_NEED_UPDATE)
		712	/* nop */;
858	if (action == UP_OBJ_INSERT)	713	else if (action == UP_OBJ_INSERT)
859	{	714	{
		715	// this is likely overkill, TODO: revisit (schmorp)
860	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	716	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
861	update_now = 1;
862
863	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	717	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
864	update_now = 1;	718	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
865		719	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		720	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
866	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	721	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
867	update_now = 1;
868
869	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
870	update_now = 1;
871
872	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
873	update_now = 1;
874
875	if ((move_on | op->move_on) != move_on)	722	|| (m.move_on | op->move_on ) != m.move_on
876	update_now = 1;
877
878	if ((move_off | op->move_off) != move_off)	723	|| (m.move_off | op->move_off ) != m.move_off
879	update_now = 1;	724	|| (m.move_slow | op->move_slow) != m.move_slow
880
881	/* This isn't perfect, but I don't expect a lot of objects to	725	/* This isn't perfect, but I don't expect a lot of objects to
882	* to have move_allow right now.	726	* to have move_allow right now.
883	*/	727	*/
884	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	728	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
885	update_now = 1;	729	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
886		730	m.flags_ = P_NEED_UPDATE;
887	if ((move_slow | op->move_slow) != move_slow)
888	update_now = 1;
889	}	731	}
890	/* if the object is being removed, we can't make intelligent	732	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	733	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	734	* that is being removed.
893	*/	735	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	736	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
895	{	737	m.flags_ = P_NEED_UPDATE;
896	update_now = 1;
897	}
898	else if (action == UP_OBJ_FACE)	738	else if (action == UP_OBJ_FACE)
899	{
900	/* Nothing to do for that case */	739	/* Nothing to do for that case */ ;
901	}
902	else	740	else
903	{
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	741	LOG (llevError, "update_object called with invalid action: %d\n", action);
905	}
906		742
907	if (update_now)
908	{
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
910	update_position (op->map, op->x, op->y);
911	}
912
913	if (op->more != NULL)	743	if (op->more)
914	update_object (op->more, action);	744	update_object (op->more, action);
915	}	745	}
916		746
917	static	747	object::vector object::mortals;
918	std::vector < object *>	748	object::vector object::objects; // not yet used
919	mortals;	749	object *object::first;
920		750
921	void object::free_mortals ()	751	void object::free_mortals ()
922	{	752	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)	753	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
924	delete *	754	if ((*i)->refcnt)
		755	++i; // further delay freeing
		756	else
925	i;	757	{
926		758	delete *i;
927	mortals.clear ();	759	mortals.erase (i);
		760	}
928	}	761	}
929		762
930	object::object ()	763	object::object ()
931	{	764	{
932	SET_FLAG (this, FLAG_REMOVED);	765	SET_FLAG (this, FLAG_REMOVED);
933		766
934	expmul = 1.0;	767	expmul = 1.0;
935	face = blank_face;	768	face = blank_face;
936	attacked_by_count = -1;
937	}	769	}
938		770
939	object::~object ()	771	object::~object ()
940	{	772	{
941	free_key_values (this);	773	free_key_values (this);
942	}	774	}
943		775
944	void object::link ()	776	void object::link ()
945	{	777	{
946	count = ++ob_count;	778	count = ++ob_count;
		779	uuid = gen_uuid ();
947		780
948	prev = 0;	781	prev = 0;
949	next = objects;	782	next = object::first;
950		783
951	if (objects)	784	if (object::first)
952	objects->prev = this;	785	object::first->prev = this;
953		786
954	objects = this;	787	object::first = this;
955	}	788	}
956		789
957	void object::unlink ()	790	void object::unlink ()
958	{	791	{
959	count = 0;	792	if (this == object::first)
		793	object::first = next;
960		794
961	/* Remove this object from the list of used objects */	795	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;	796	if (prev) prev->next = next;
964	if (next)
965	next->prev = prev;	797	if (next) next->prev = prev;
966	if (this == objects)	798
967	objects = next;	799	prev = 0;
		800	next = 0;
968	}	801	}
969		802
970	object *object::create ()	803	object *object::create ()
971	{	804	{
972	object *
973	op = new object;	805	object *op = new object;
974
975	op->link ();	806	op->link ();
976	return op;	807	return op;
977	}	808	}
978		809
979	/*	810	/*
…		…
981	* it from the list of used objects, and puts it on the list of	812	* it from the list of used objects, and puts it on the list of
982	* free objects. The IS_FREED() flag is set in the object.	813	* free objects. The IS_FREED() flag is set in the object.
983	* The object must have been removed by remove_ob() first for	814	* The object must have been removed by remove_ob() first for
984	* this function to succeed.	815	* this function to succeed.
985	*	816	*
986	* If free_inventory is set, free inventory as well. Else drop items in	817	* If destroy_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.	818	* inventory to the ground.
988	*/	819	*/
989	void object::free (bool free_inventory)	820	void object::destroy (bool destroy_inventory)
990	{	821	{
		822	if (QUERY_FLAG (this, FLAG_FREED))
		823	return;
		824
		825	if (QUERY_FLAG (this, FLAG_FRIENDLY))
		826	remove_friendly_object (this);
		827
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	828	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	{	829	remove ();
993	LOG (llevDebug, "Free object called with non removed object\n");
994	dump_object (this);
995	#ifdef MANY_CORES
996	abort ();
997	#endif
998	}
999		830
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1001	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1003	remove_friendly_object (this);
1004	}
1005
1006	if (QUERY_FLAG (this, FLAG_FREED))	831	SET_FLAG (this, FLAG_FREED);
1007	{
1008	dump_object (this);
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1010	return;
1011	}
1012		832
1013	if (more)	833	if (more)
1014	{	834	{
1015	more->free (free_inventory);	835	more->destroy (destroy_inventory);
1016	more = 0;	836	more = 0;
1017	}	837	}
1018		838
1019	if (inv)	839	if (inv)
1020	{	840	{
1021	/* Only if the space blocks everything do we not process -	841	/* Only if the space blocks everything do we not process -
1022	* if some form of movement is allowed, let objects	842	* if some form of movement is allowed, let objects
1023	* drop on that space.	843	* drop on that space.
1024	*/	844	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	845	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1026	{	846	{
1027	object *	847	object *op = inv;
1028	op = inv;
1029		848
1030	while (op)	849	while (op)
1031	{	850	{
1032	object *
1033	tmp = op->below;	851	object *tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);	852	op->destroy (destroy_inventory);
1037	op = tmp;	853	op = tmp;
1038	}	854	}
1039	}	855	}
1040	else	856	else
1041	{ /* Put objects in inventory onto this space */	857	{ /* Put objects in inventory onto this space */
1042	object *	858	object *op = inv;
1043	op = inv;
1044		859
1045	while (op)	860	while (op)
1046	{	861	{
1047	object *
1048	tmp = op->below;	862	object *tmp = op->below;
1049		863
1050	remove_ob (op);	864	op->remove ();
1051		865
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	866	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	867	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1054	free_object (op);	868	op->destroy ();
1055	else	869	else
1056	{	870	{
1057	op->x = x;	871	op->x = x;
1058	op->y = y;	872	op->y = y;
1059	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	873	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1062	op = tmp;	876	op = tmp;
1063	}	877	}
1064	}	878	}
1065	}	879	}
1066		880
		881	// hack to ensure that freed objects still have a valid map
		882	{
		883	static maptile *freed_map; // freed objects are moved here to avoid crashes
		884
		885	if (!freed_map)
		886	{
		887	freed_map = new maptile;
		888
		889	freed_map->name = "/internal/freed_objects_map";
		890	freed_map->width = 3;
		891	freed_map->height = 3;
		892
		893	freed_map->allocate ();
		894	}
		895
		896	map = freed_map;
		897	x = 1;
		898	y = 1;
		899	}
		900
		901	// clear those pointers that likely might have circular references to us
		902	owner = 0;
		903	enemy = 0;
		904	attacked_by = 0;
		905
		906	// only relevant for players(?), but make sure of it anyways
		907	contr = 0;
		908
1067	/* Remove object from the active list */	909	/* Remove object from the active list */
1068	speed = 0;	910	speed = 0;
1069	update_ob_speed (this);	911	update_ob_speed (this);
1070		912
1071	unlink ();	913	unlink ();
1072		914
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);	915	mortals.push_back (this);
1076	}	916	}
1077		917
1078	/*	918	/*
1079	* sub_weight() recursively (outwards) subtracts a number from the	919	* sub_weight() recursively (outwards) subtracts a number from the
1080	* weight of an object (and what is carried by it's environment(s)).	920	* weight of an object (and what is carried by it's environment(s)).
1081	*/	921	*/
1082
1083	void	922	void
1084	sub_weight (object *op, signed long weight)	923	sub_weight (object *op, signed long weight)
1085	{	924	{
1086	while (op != NULL)	925	while (op != NULL)
1087	{	926	{
1088	if (op->type == CONTAINER)	927	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	928	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}	929
1092	op->carrying -= weight;	930	op->carrying -= weight;
1093	op = op->env;	931	op = op->env;
1094	}	932	}
1095	}	933	}
1096		934
1097	/* remove_ob(op):	935	/* op->remove ():
1098	* This function removes the object op from the linked list of objects	936	* This function removes the object op from the linked list of objects
1099	* which it is currently tied to. When this function is done, the	937	* which it is currently tied to. When this function is done, the
1100	* object will have no environment. If the object previously had an	938	* object will have no environment. If the object previously had an
1101	* environment, the x and y coordinates will be updated to	939	* environment, the x and y coordinates will be updated to
1102	* the previous environment.	940	* the previous environment.
1103	* Beware: This function is called from the editor as well!	941	* Beware: This function is called from the editor as well!
1104	*/	942	*/
1105
1106	void	943	void
1107	remove_ob (object *op)	944	object::remove ()
1108	{	945	{
		946	object *tmp, *last = 0;
1109	object *	947	object *otmp;
1110	tmp, *	948
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;	949	int check_walk_off;
1118	mapstruct *
1119	m;
1120	sint16
1121	x,
1122	y;
1123		950
1124
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	951	if (QUERY_FLAG (this, FLAG_REMOVED))
1126	{	952	return;
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		953
1130	/* Changed it to always dump core in this case. As has been learned
1131	* in the past, trying to recover from errors almost always
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)
1143	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);	954	SET_FLAG (this, FLAG_REMOVED);
		955
		956	if (more)
		957	more->remove ();
1146		958
1147	/*	959	/*
1148	* In this case, the object to be removed is in someones	960	* In this case, the object to be removed is in someones
1149	* inventory.	961	* inventory.
1150	*/	962	*/
1151	if (op->env != NULL)	963	if (env)
1152	{	964	{
1153	if (op->nrof)	965	if (nrof)
1154	sub_weight (op->env, op->weight * op->nrof);	966	sub_weight (env, weight * nrof);
1155	else	967	else
1156	sub_weight (op->env, op->weight + op->carrying);	968	sub_weight (env, weight + carrying);
1157		969
1158	/* NO_FIX_PLAYER is set when a great many changes are being	970	/* NO_FIX_PLAYER is set when a great many changes are being
1159	* made to players inventory. If set, avoiding the call	971	* made to players inventory. If set, avoiding the call
1160	* to save cpu time.	972	* to save cpu time.
1161	*/	973	*/
1162	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	974	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163	fix_player (otmp);	975	otmp->update_stats ();
1164		976
1165	if (op->above != NULL)	977	if (above != NULL)
1166	op->above->below = op->below;	978	above->below = below;
1167	else	979	else
1168	op->env->inv = op->below;	980	env->inv = below;
1169		981
1170	if (op->below != NULL)	982	if (below != NULL)
1171	op->below->above = op->above;	983	below->above = above;
1172		984
1173	/* we set up values so that it could be inserted into	985	/* we set up values so that it could be inserted into
1174	* the map, but we don't actually do that - it is up	986	* the map, but we don't actually do that - it is up
1175	* to the caller to decide what we want to do.	987	* to the caller to decide what we want to do.
1176	*/	988	*/
1177	op->x = op->env->x, op->y = op->env->y;	989	x = env->x, y = env->y;
1178	op->map = op->env->map;	990	map = env->map;
1179	op->above = NULL, op->below = NULL;	991	above = 0, below = 0;
1180	op->env = NULL;	992	env = 0;
1181	return;
1182	}
1183
1184	/* If we get here, we are removing it from a map */
1185	if (op->map == NULL)
1186	return;
1187
1188	x = op->x;
1189	y = op->y;
1190	m = get_map_from_coord (op->map, &x, &y);
1191
1192	if (!m)
1193	{	993	}
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	994	else if (map)
1195	op->map->path, op->x, op->y);	995	{
1196	/* in old days, we used to set x and y to 0 and continue.	996	/* Re did the following section of code - it looks like it had
1197	* it seems if we get into this case, something is probablye	997	* lots of logic for things we no longer care about
1198	* screwed up and should be fixed.
1199	*/	998	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207		999
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */	1000	/* link the object above us */
1213	if (op->above)	1001	if (above)
1214	op->above->below = op->below;	1002	above->below = below;
1215	else	1003	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1004	map->at (x, y).top = below; /* we were top, set new top */
1217		1005
1218	/* Relink the object below us, if there is one */	1006	/* Relink the object below us, if there is one */
1219	if (op->below)	1007	if (below)
1220	{
1221	op->below->above = op->above;	1008	below->above = above;
1222	}
1223	else	1009	else
1224	{
1225	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is
1227	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{	1010	{
1231	dump_object (op);	1011	/* Nothing below, which means we need to relink map object for this space
		1012	* use translated coordinates in case some oddness with map tiling is
		1013	* evident
		1014	*/
		1015	if (GET_MAP_OB (map, x, y) != this)
		1016	{
		1017	char *dump = dump_object (this);
		1018	LOG (llevError,
1232	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",	1019	"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);
1233	errmsg);	1020	free (dump);
1234	dump_object (GET_MAP_OB (m, x, y));	1021	dump = dump_object (GET_MAP_OB (map, x, y));
1235	LOG (llevError, "%s\n", errmsg);	1022	LOG (llevError, "%s\n", dump);
		1023	free (dump);
1236	}	1024	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241		1025
		1026	map->at (x, y).bottom = above; /* goes on above it. */
		1027	}
		1028
		1029	above = 0;
		1030	below = 0;
		1031
1242	if (op->map->in_memory == MAP_SAVING)	1032	if (map->in_memory == MAP_SAVING)
1243	return;	1033	return;
1244		1034
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1035	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
		1036
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1037	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1248	{
1249	/* No point updating the players look faces if he is the object
1250	* being removed.
1251	*/
1252
1253	if (tmp->type == PLAYER && tmp != op)
1254	{	1038	{
1255	/* If a container that the player is currently using somehow gets	1039	/* No point updating the players look faces if he is the object
1256	* removed (most likely destroyed), update the player view	1040	* being removed.
1257	* appropriately.
1258	*/	1041	*/
1259	if (tmp->container == op)	1042
		1043	if (tmp->type == PLAYER && tmp != this)
1260	{	1044	{
		1045	/* If a container that the player is currently using somehow gets
		1046	* removed (most likely destroyed), update the player view
		1047	* appropriately.
		1048	*/
		1049	if (tmp->container == this)
		1050	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1051	CLEAR_FLAG (this, FLAG_APPLIED);
1262	tmp->container = NULL;	1052	tmp->container = 0;
		1053	}
		1054
		1055	tmp->contr->ns->floorbox_update ();
1263	}	1056	}
1264	tmp->contr->socket.update_look = 1;	1057
1265	}
1266	/* See if player moving off should effect something */	1058	/* See if player moving off should effect something */
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1059	if (check_walk_off
1268	{	1060	&& ((move_type & tmp->move_off)
1269		1061	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1270	move_apply (tmp, op, NULL);
1271	if (was_destroyed (op, tag))
1272	{	1062	{
		1063	move_apply (tmp, this, 0);
		1064
		1065	if (destroyed ())
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1066	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1274	}	1067	}
1275	}
1276		1068
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1069	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1278		1070
1279	if (tmp->above == tmp)	1071	if (tmp->above == tmp)
1280	tmp->above = NULL;	1072	tmp->above = 0;
		1073
1281	last = tmp;	1074	last = tmp;
1282	}	1075	}
		1076
1283	/* last == NULL of there are no objects on this space */	1077	/* last == NULL of there are no objects on this space */
1284	if (last == NULL)	1078	if (!last)
1285	{	1079	map->at (x, y).flags_ = P_NEED_UPDATE;
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.
1290	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);
1293	}
1294	else	1080	else
1295	update_object (last, UP_OBJ_REMOVE);	1081	update_object (last, UP_OBJ_REMOVE);
1296		1082
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1083	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1298	update_all_los (op->map, op->x, op->y);	1084	update_all_los (map, x, y);
1299		1085	}
1300	}	1086	}
1301		1087
1302	/*	1088	/*
1303	* merge_ob(op,top):	1089	* merge_ob(op,top):
1304	*	1090	*
1305	* This function goes through all objects below and including top, and	1091	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1092	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1093	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1094	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1095	*/
1310
1311	object *	1096	object *
1312	merge_ob (object *op, object *top)	1097	merge_ob (object *op, object *top)
1313	{	1098	{
1314	if (!op->nrof)	1099	if (!op->nrof)
1315	return 0;	1100	return 0;
		1101
1316	if (top == NULL)	1102	if (top == NULL)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1103	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1104
1318	for (; top != NULL; top = top->below)	1105	for (; top != NULL; top = top->below)
1319	{	1106	{
1320	if (top == op)	1107	if (top == op)
1321	continue;	1108	continue;
1322	if (CAN_MERGE (op, top))	1109
		1110	if (object::can_merge (op, top))
1323	{	1111	{
1324	top->nrof += op->nrof;	1112	top->nrof += op->nrof;
1325		1113
1326	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1114	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1327	op->weight = 0; /* Don't want any adjustements now */	1115	op->weight = 0; /* Don't want any adjustements now */
1328	remove_ob (op);	1116	op->destroy ();
1329	free_object (op);
1330	return top;	1117	return top;
1331	}	1118	}
1332	}	1119	}
		1120
1333	return NULL;	1121	return 0;
1334	}	1122	}
1335		1123
1336	/*	1124	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1125	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1338	* job preparing multi-part monsters	1126	* job preparing multi-part monsters
1339	*/	1127	*/
1340	object *	1128	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1129	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342	{	1130	{
1343	object *	1131	object *tmp;
1344	tmp;
1345		1132
1346	if (op->head)	1133	if (op->head)
1347	op = op->head;	1134	op = op->head;
		1135
1348	for (tmp = op; tmp; tmp = tmp->more)	1136	for (tmp = op; tmp; tmp = tmp->more)
1349	{	1137	{
1350	tmp->x = x + tmp->arch->clone.x;	1138	tmp->x = x + tmp->arch->clone.x;
1351	tmp->y = y + tmp->arch->clone.y;	1139	tmp->y = y + tmp->arch->clone.y;
1352	}	1140	}
		1141
1353	return insert_ob_in_map (op, m, originator, flag);	1142	return insert_ob_in_map (op, m, originator, flag);
1354	}	1143	}
1355		1144
1356	/*	1145	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1146	* insert_ob_in_map (op, map, originator, flag):
…		…
1373	* NULL if 'op' was destroyed	1162	* NULL if 'op' was destroyed
1374	* just 'op' otherwise	1163	* just 'op' otherwise
1375	*/	1164	*/
1376		1165
1377	object *	1166	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1167	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1379	{	1168	{
1380	object *	1169	object *tmp, *top, *floor = NULL;
1381	tmp, *	1170	sint16 x, y;
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1171
1388	if (QUERY_FLAG (op, FLAG_FREED))	1172	if (QUERY_FLAG (op, FLAG_FREED))
1389	{	1173	{
1390	LOG (llevError, "Trying to insert freed object!\n");	1174	LOG (llevError, "Trying to insert freed object!\n");
1391	return NULL;	1175	return NULL;
1392	}	1176	}
		1177
1393	if (m == NULL)	1178	if (m == NULL)
1394	{	1179	{
1395	dump_object (op);	1180	char *dump = dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1181	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1182	free (dump);
1397	return op;	1183	return op;
1398	}	1184	}
		1185
1399	if (out_of_map (m, op->x, op->y))	1186	if (out_of_map (m, op->x, op->y))
1400	{	1187	{
1401	dump_object (op);	1188	char *dump = dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1189	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1403	#ifdef MANY_CORES	1190	#ifdef MANY_CORES
1404	/* Better to catch this here, as otherwise the next use of this object	1191	/* Better to catch this here, as otherwise the next use of this object
1405	* is likely to cause a crash. Better to find out where it is getting	1192	* is likely to cause a crash. Better to find out where it is getting
1406	* improperly inserted.	1193	* improperly inserted.
1407	*/	1194	*/
1408	abort ();	1195	abort ();
1409	#endif	1196	#endif
		1197	free (dump);
1410	return op;	1198	return op;
1411	}	1199	}
		1200
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))	1201	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{	1202	{
1414	dump_object (op);	1203	char *dump = dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1204	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1205	free (dump);
1416	return op;	1206	return op;
1417	}	1207	}
		1208
1418	if (op->more != NULL)	1209	if (op->more != NULL)
1419	{	1210	{
1420	/* The part may be on a different map. */	1211	/* The part may be on a different map. */
1421		1212
1422	object *
1423	more = op->more;	1213	object *more = op->more;
1424		1214
1425	/* We really need the caller to normalize coordinates - if	1215	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within	1216	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate	1217	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.	1218	* is clear wrong do we normalize it.
1429	*/	1219	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1220	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);	1221	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)	1222	else if (!more->map)
1435	{	1223	{
1436	/* For backwards compatibility - when not dealing with tiled maps,	1224	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.	1225	* more->map should always point to the parent.
1438	*/	1226	*/
…		…
1441		1229
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1230	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{	1231	{
1444	if (!op->head)	1232	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1233	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1234
1446	return NULL;	1235	return NULL;
1447	}	1236	}
1448	}	1237	}
		1238
1449	CLEAR_FLAG (op, FLAG_REMOVED);	1239	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1240
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1241	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1242	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1243	* need extra work
…		…
1457	y = op->y;	1247	y = op->y;
1458		1248
1459	/* this has to be done after we translate the coordinates.	1249	/* this has to be done after we translate the coordinates.
1460	*/	1250	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1251	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1252	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1464	if (CAN_MERGE (op, tmp))	1253	if (object::can_merge (op, tmp))
1465	{	1254	{
1466	op->nrof += tmp->nrof;	1255	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1256	tmp->destroy ();
1468	free_object (tmp);
1469	}	1257	}
1470	}
1471		1258
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1259	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1260	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1261
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1262	if (!QUERY_FLAG (op, FLAG_ALIVE))
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1263	CLEAR_FLAG (op, FLAG_NO_STEAL);
1476		1264
1477	if (flag & INS_BELOW_ORIGINATOR)	1265	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1266	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1267	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1268	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1269	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1270	abort ();
1483	}	1271	}
		1272
1484	op->above = originator;	1273	op->above = originator;
1485	op->below = originator->below;	1274	op->below = originator->below;
		1275
1486	if (op->below)	1276	if (op->below)
1487	op->below->above = op;	1277	op->below->above = op;
1488	else	1278	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);	1279	op->ms ().bottom = op;
		1280
1490	/* since *below* originator, no need to update top */	1281	/* since *below* originator, no need to update top */
1491	originator->below = op;	1282	originator->below = op;
1492	}	1283	}
1493	else	1284	else
1494	{	1285	{
1495	/* If there are other objects, then */	1286	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1287	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1497	{	1288	{
1498	object *
1499	last = NULL;	1289	object *last = NULL;
1500		1290
1501	/*	1291	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1292	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1293	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1294	* Generally, we want to put the new object on top. But if
…		…
1513		1303
1514	while (top != NULL)	1304	while (top != NULL)
1515	{	1305	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1306	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1517	floor = top;	1307	floor = top;
		1308
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1309	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1519	{	1310	{
1520	/* We insert above top, so we want this object below this */	1311	/* We insert above top, so we want this object below this */
1521	top = top->below;	1312	top = top->below;
1522	break;	1313	break;
1523	}	1314	}
		1315
1524	last = top;	1316	last = top;
1525	top = top->above;	1317	top = top->above;
1526	}	1318	}
		1319
1527	/* Don't want top to be NULL, so set it to the last valid object */	1320	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;	1321	top = last;
1529		1322
1530	/* We let update_position deal with figuring out what the space	1323	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1324	* looks like instead of lots of conditions here.
…		…
1537	* If INS_ON_TOP is used, don't do this processing	1330	* If INS_ON_TOP is used, don't do this processing
1538	* Need to find the object that in fact blocks view, otherwise	1331	* Need to find the object that in fact blocks view, otherwise
1539	* stacking is a bit odd.	1332	* stacking is a bit odd.
1540	*/	1333	*/
1541	if (!(flag & INS_ON_TOP) &&	1334	if (!(flag & INS_ON_TOP) &&
1542	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1335	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1543	{	1336	{
1544	for (last = top; last != floor; last = last->below)	1337	for (last = top; last != floor; last = last->below)
1545	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1338	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1546	break;	1339	break;
1547	/* Check to see if we found the object that blocks view,	1340	/* Check to see if we found the object that blocks view,
…		…
1551	*/	1344	*/
1552	if (last && last->below && last != floor)	1345	if (last && last->below && last != floor)
1553	top = last->below;	1346	top = last->below;
1554	}	1347	}
1555	} /* If objects on this space */	1348	} /* If objects on this space */
		1349
1556	if (flag & INS_MAP_LOAD)	1350	if (flag & INS_MAP_LOAD)
1557	top = GET_MAP_TOP (op->map, op->x, op->y);	1351	top = GET_MAP_TOP (op->map, op->x, op->y);
		1352
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1353	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1354	top = floor;
1560		1355
1561	/* Top is the object that our object (op) is going to get inserted above.	1356	/* Top is the object that our object (op) is going to get inserted above.
1562	*/	1357	*/
1563		1358
1564	/* First object on this space */	1359	/* First object on this space */
1565	if (!top)	1360	if (!top)
1566	{	1361	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);	1362	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1363
1568	if (op->above)	1364	if (op->above)
1569	op->above->below = op;	1365	op->above->below = op;
		1366
1570	op->below = NULL;	1367	op->below = NULL;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1368	op->ms ().bottom = op;
1572	}	1369	}
1573	else	1370	else
1574	{ /* get inserted into the stack above top */	1371	{ /* get inserted into the stack above top */
1575	op->above = top->above;	1372	op->above = top->above;
		1373
1576	if (op->above)	1374	if (op->above)
1577	op->above->below = op;	1375	op->above->below = op;
		1376
1578	op->below = top;	1377	op->below = top;
1579	top->above = op;	1378	top->above = op;
1580	}	1379	}
		1380
1581	if (op->above == NULL)	1381	if (op->above == NULL)
1582	SET_MAP_TOP (op->map, op->x, op->y, op);	1382	op->ms ().top = op;
1583	} /* else not INS_BELOW_ORIGINATOR */	1383	} /* else not INS_BELOW_ORIGINATOR */
1584		1384
1585	if (op->type == PLAYER)	1385	if (op->type == PLAYER)
1586	op->contr->do_los = 1;	1386	op->contr->do_los = 1;
1587		1387
1588	/* If we have a floor, we know the player, if any, will be above	1388	/* If we have a floor, we know the player, if any, will be above
1589	* it, so save a few ticks and start from there.	1389	* it, so save a few ticks and start from there.
1590	*/	1390	*/
1591	if (!(flag & INS_MAP_LOAD))	1391	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1392	if (object *pl = op->ms ().player ())
1593	{	1393	pl->contr->ns->floorbox_update ();
1594	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;
1596	}
1597		1394
1598	/* If this object glows, it may affect lighting conditions that are	1395	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1396	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1397	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1398	* on the map will get recalculated. The players could very well
…		…
1605	* of effect may be sufficient.	1402	* of effect may be sufficient.
1606	*/	1403	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1404	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1608	update_all_los (op->map, op->x, op->y);	1405	update_all_los (op->map, op->x, op->y);
1609		1406
1610
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1407	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1408	update_object (op, UP_OBJ_INSERT);
1613		1409
1614
1615	/* Don't know if moving this to the end will break anything. However,	1410	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1411	* we want to have floorbox_update called before calling this.
1617	*	1412	*
1618	* check_move_on() must be after this because code called from	1413	* check_move_on() must be after this because code called from
1619	* check_move_on() depends on correct map flags (so functions like	1414	* check_move_on() depends on correct map flags (so functions like
1620	* blocked() and wall() work properly), and these flags are updated by	1415	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1416	* update_object().
1622	*/	1417	*/
1623		1418
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1419	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1420	if (!(flag & INS_NO_WALK_ON) && !op->head)
1627	{	1421	{
1628	if (check_move_on (op, originator))	1422	if (check_move_on (op, originator))
1629	return NULL;	1423	return NULL;
1630		1424
…		…
1633	*/	1427	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1428	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1429	if (check_move_on (tmp, originator))
1636	return NULL;	1430	return NULL;
1637	}	1431	}
		1432
1638	return op;	1433	return op;
1639	}	1434	}
1640		1435
1641	/* this function inserts an object in the map, but if it	1436	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1437	* finds an object of its own type, it'll remove that one first.
1643	* op is the object to insert it under: supplies x and the map.	1438	* op is the object to insert it under: supplies x and the map.
1644	*/	1439	*/
1645	void	1440	void
1646	replace_insert_ob_in_map (const char *arch_string, object *op)	1441	replace_insert_ob_in_map (const char *arch_string, object *op)
1647	{	1442	{
1648	object *	1443	object *tmp, *tmp1;
1649	tmp;
1650	object *
1651	tmp1;
1652		1444
1653	/* first search for itself and remove any old instances */	1445	/* first search for itself and remove any old instances */
1654		1446
1655	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1447	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1656	{
1657	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1448	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1658	{	1449	tmp->destroy ();
1659	remove_ob (tmp);
1660	free_object (tmp);
1661	}
1662	}
1663		1450
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1451	tmp1 = arch_to_object (archetype::find (arch_string));
1665
1666		1452
1667	tmp1->x = op->x;	1453	tmp1->x = op->x;
1668	tmp1->y = op->y;	1454	tmp1->y = op->y;
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1455	insert_ob_in_map (tmp1, op->map, op, 0);
1670	}	1456	}
…		…
1678	*/	1464	*/
1679		1465
1680	object *	1466	object *
1681	get_split_ob (object *orig_ob, uint32 nr)	1467	get_split_ob (object *orig_ob, uint32 nr)
1682	{	1468	{
1683	object *	1469	object *newob;
1684	newob;
1685	int
1686	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1470	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1687		1471
1688	if (orig_ob->nrof < nr)	1472	if (orig_ob->nrof < nr)
1689	{	1473	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1474	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;	1475	return NULL;
1692	}	1476	}
		1477
1693	newob = object_create_clone (orig_ob);	1478	newob = object_create_clone (orig_ob);
		1479
1694	if ((orig_ob->nrof -= nr) < 1)	1480	if ((orig_ob->nrof -= nr) < 1)
1695	{	1481	orig_ob->destroy (1);
1696	if (!is_removed)
1697	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);
1699	}
1700	else if (!is_removed)	1482	else if (!is_removed)
1701	{	1483	{
1702	if (orig_ob->env != NULL)	1484	if (orig_ob->env != NULL)
1703	sub_weight (orig_ob->env, orig_ob->weight * nr);	1485	sub_weight (orig_ob->env, orig_ob->weight * nr);
1704	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1486	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1488	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1489	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;	1490	return NULL;
1709	}	1491	}
1710	}	1492	}
		1493
1711	newob->nrof = nr;	1494	newob->nrof = nr;
1712		1495
1713	return newob;	1496	return newob;
1714	}	1497	}
1715		1498
…		…
1722	*/	1505	*/
1723		1506
1724	object *	1507	object *
1725	decrease_ob_nr (object *op, uint32 i)	1508	decrease_ob_nr (object *op, uint32 i)
1726	{	1509	{
1727	object *	1510	object *tmp;
1728	tmp;
1729	player *	1511	player *pl;
1730	pl;
1731		1512
1732	if (i == 0) /* objects with op->nrof require this check */	1513	if (i == 0) /* objects with op->nrof require this check */
1733	return op;	1514	return op;
1734		1515
1735	if (i > op->nrof)	1516	if (i > op->nrof)
1736	i = op->nrof;	1517	i = op->nrof;
1737		1518
1738	if (QUERY_FLAG (op, FLAG_REMOVED))	1519	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;	1520	op->nrof -= i;
1741	}
1742	else if (op->env != NULL)	1521	else if (op->env)
1743	{	1522	{
1744	/* is this object in the players inventory, or sub container	1523	/* is this object in the players inventory, or sub container
1745	* therein?	1524	* therein?
1746	*/	1525	*/
1747	tmp = is_player_inv (op->env);	1526	tmp = op->in_player ();
1748	/* nope. Is this a container the player has opened?	1527	/* nope. Is this a container the player has opened?
1749	* If so, set tmp to that player.	1528	* If so, set tmp to that player.
1750	* IMO, searching through all the players will mostly	1529	* IMO, searching through all the players will mostly
1751	* likely be quicker than following op->env to the map,	1530	* likely be quicker than following op->env to the map,
1752	* and then searching the map for a player.	1531	* and then searching the map for a player.
1753	*/	1532	*/
1754	if (!tmp)	1533	if (!tmp)
1755	{	1534	{
1756	for (pl = first_player; pl; pl = pl->next)	1535	for (pl = first_player; pl; pl = pl->next)
1757	if (pl->ob->container == op->env)	1536	if (pl->ob->container == op->env)
		1537	{
		1538	tmp = pl->ob;
1758	break;	1539	break;
1759	if (pl)	1540	}
1760	tmp = pl->ob;
1761	else
1762	tmp = NULL;
1763	}	1541	}
1764		1542
1765	if (i < op->nrof)	1543	if (i < op->nrof)
1766	{	1544	{
1767	sub_weight (op->env, op->weight * i);	1545	sub_weight (op->env, op->weight * i);
1768	op->nrof -= i;	1546	op->nrof -= i;
1769	if (tmp)	1547	if (tmp)
1770	{
1771	esrv_send_item (tmp, op);	1548	esrv_send_item (tmp, op);
1772	}
1773	}	1549	}
1774	else	1550	else
1775	{	1551	{
1776	remove_ob (op);	1552	op->remove ();
1777	op->nrof = 0;	1553	op->nrof = 0;
1778	if (tmp)	1554	if (tmp)
1779	{
1780	esrv_del_item (tmp->contr, op->count);	1555	esrv_del_item (tmp->contr, op->count);
1781	}
1782	}	1556	}
1783	}	1557	}
1784	else	1558	else
1785	{	1559	{
1786	object *
1787	above = op->above;	1560	object *above = op->above;
1788		1561
1789	if (i < op->nrof)	1562	if (i < op->nrof)
1790	{
1791	op->nrof -= i;	1563	op->nrof -= i;
1792	}
1793	else	1564	else
1794	{	1565	{
1795	remove_ob (op);	1566	op->remove ();
1796	op->nrof = 0;	1567	op->nrof = 0;
1797	}	1568	}
		1569
1798	/* Since we just removed op, op->above is null */	1570	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)	1571	for (tmp = above; tmp; tmp = tmp->above)
1800	if (tmp->type == PLAYER)	1572	if (tmp->type == PLAYER)
1801	{	1573	{
1802	if (op->nrof)	1574	if (op->nrof)
1803	esrv_send_item (tmp, op);	1575	esrv_send_item (tmp, op);
1804	else	1576	else
1805	esrv_del_item (tmp->contr, op->count);	1577	esrv_del_item (tmp->contr, op->count);
1806	}	1578	}
1807	}	1579	}
1808		1580
1809	if (op->nrof)	1581	if (op->nrof)
1810	{
1811	return op;	1582	return op;
1812	}
1813	else	1583	else
1814	{	1584	{
1815	free_object (op);	1585	op->destroy ();
1816	return NULL;	1586	return 0;
1817	}	1587	}
1818	}	1588	}
1819		1589
1820	/*	1590	/*
1821	* add_weight(object, weight) adds the specified weight to an object,	1591	* add_weight(object, weight) adds the specified weight to an object,
…		…
1826	add_weight (object *op, signed long weight)	1596	add_weight (object *op, signed long weight)
1827	{	1597	{
1828	while (op != NULL)	1598	while (op != NULL)
1829	{	1599	{
1830	if (op->type == CONTAINER)	1600	if (op->type == CONTAINER)
1831	{
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1601	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}	1602
1834	op->carrying += weight;	1603	op->carrying += weight;
1835	op = op->env;	1604	op = op->env;
1836	}	1605	}
1837	}	1606	}
1838		1607
		1608	object *
		1609	insert_ob_in_ob (object *op, object *where)
		1610	{
		1611	if (!where)
		1612	{
		1613	char *dump = dump_object (op);
		1614	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1615	free (dump);
		1616	return op;
		1617	}
		1618
		1619	if (where->head)
		1620	{
		1621	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1622	where = where->head;
		1623	}
		1624
		1625	return where->insert (op);
		1626	}
		1627
1839	/*	1628	/*
1840	* insert_ob_in_ob(op,environment):	1629	* env->insert (op)
1841	* This function inserts the object op in the linked list	1630	* This function inserts the object op in the linked list
1842	* inside the object environment.	1631	* inside the object environment.
1843	*	1632	*
1844	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1845	* the inventory at the last position or next to other objects of the same
1846	* type.
1847	* Frank: Now sorted by type, archetype and magic!
1848	*
1849	* The function returns now pointer to inserted item, and return value can	1633	* The function returns now pointer to inserted item, and return value can
1850	* be != op, if items are merged. -Tero	1634	* be != op, if items are merged. -Tero
1851	*/	1635	*/
1852		1636
1853	object *	1637	object *
1854	insert_ob_in_ob (object *op, object *where)	1638	object::insert (object *op)
1855	{	1639	{
1856	object *	1640	object *tmp, *otmp;
1857	tmp, *
1858	otmp;
1859		1641
1860	if (!QUERY_FLAG (op, FLAG_REMOVED))	1642	if (!QUERY_FLAG (op, FLAG_REMOVED))
1861	{	1643	op->remove ();
1862	dump_object (op);	1644
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;
1865	}
1866	if (where == NULL)
1867	{
1868	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;
1871	}
1872	if (where->head)
1873	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;
1876	}
1877	if (op->more)	1645	if (op->more)
1878	{	1646	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1647	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1648	return op;
1881	}	1649	}
		1650
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1651	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1652	CLEAR_FLAG (op, FLAG_REMOVED);
1884	if (op->nrof)	1653	if (op->nrof)
1885	{	1654	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1655	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1887	if (CAN_MERGE (tmp, op))	1656	if (object::can_merge (tmp, op))
1888	{	1657	{
1889	/* return the original object and remove inserted object	1658	/* return the original object and remove inserted object
1890	(client needs the original object) */	1659	(client needs the original object) */
1891	tmp->nrof += op->nrof;	1660	tmp->nrof += op->nrof;
1892	/* Weight handling gets pretty funky. Since we are adding to	1661	/* Weight handling gets pretty funky. Since we are adding to
1893	* tmp->nrof, we need to increase the weight.	1662	* tmp->nrof, we need to increase the weight.
1894	*/	1663	*/
1895	add_weight (where, op->weight * op->nrof);	1664	add_weight (this, op->weight * op->nrof);
1896	SET_FLAG (op, FLAG_REMOVED);	1665	SET_FLAG (op, FLAG_REMOVED);
1897	free_object (op); /* free the inserted object */	1666	op->destroy (); /* free the inserted object */
1898	op = tmp;	1667	op = tmp;
1899	remove_ob (op); /* and fix old object's links */	1668	op->remove (); /* and fix old object's links */
1900	CLEAR_FLAG (op, FLAG_REMOVED);	1669	CLEAR_FLAG (op, FLAG_REMOVED);
1901	break;	1670	break;
1902	}	1671	}
1903		1672
1904	/* I assume combined objects have no inventory	1673	/* I assume combined objects have no inventory
1905	* We add the weight - this object could have just been removed	1674	* We add the weight - this object could have just been removed
1906	* (if it was possible to merge). calling remove_ob will subtract	1675	* (if it was possible to merge). calling remove_ob will subtract
1907	* the weight, so we need to add it in again, since we actually do	1676	* the weight, so we need to add it in again, since we actually do
1908	* the linking below	1677	* the linking below
1909	*/	1678	*/
1910	add_weight (where, op->weight * op->nrof);	1679	add_weight (this, op->weight * op->nrof);
1911	}	1680	}
1912	else	1681	else
1913	add_weight (where, (op->weight + op->carrying));	1682	add_weight (this, (op->weight + op->carrying));
1914		1683
1915	otmp = is_player_inv (where);	1684	otmp = this->in_player ();
1916	if (otmp && otmp->contr != NULL)	1685	if (otmp && otmp->contr)
1917	{
1918	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1686	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1919	fix_player (otmp);	1687	otmp->update_stats ();
1920	}
1921		1688
1922	op->map = NULL;	1689	op->map = 0;
1923	op->env = where;	1690	op->env = this;
1924	op->above = NULL;	1691	op->above = 0;
1925	op->below = NULL;	1692	op->below = 0;
1926	op->x = 0, op->y = 0;	1693	op->x = 0, op->y = 0;
1927		1694
1928	/* reset the light list and los of the players on the map */	1695	/* reset the light list and los of the players on the map */
1929	if ((op->glow_radius != 0) && where->map)	1696	if ((op->glow_radius != 0) && map)
1930	{	1697	{
1931	#ifdef DEBUG_LIGHTS	1698	#ifdef DEBUG_LIGHTS
1932	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1699	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1933	#endif /* DEBUG_LIGHTS */	1700	#endif /* DEBUG_LIGHTS */
1934	if (MAP_DARKNESS (where->map))	1701	if (MAP_DARKNESS (map))
1935	update_all_los (where->map, where->x, where->y);	1702	update_all_los (map, x, y);
1936	}	1703	}
1937		1704
1938	/* Client has no idea of ordering so lets not bother ordering it here.	1705	/* Client has no idea of ordering so lets not bother ordering it here.
1939	* It sure simplifies this function...	1706	* It sure simplifies this function...
1940	*/	1707	*/
1941	if (where->inv == NULL)	1708	if (!inv)
1942	where->inv = op;	1709	inv = op;
1943	else	1710	else
1944	{	1711	{
1945	op->below = where->inv;	1712	op->below = inv;
1946	op->below->above = op;	1713	op->below->above = op;
1947	where->inv = op;	1714	inv = op;
1948	}	1715	}
		1716
1949	return op;	1717	return op;
1950	}	1718	}
1951		1719
1952	/*	1720	/*
1953	* Checks if any objects has a move_type that matches objects	1721	* Checks if any objects has a move_type that matches objects
…		…
1971	*/	1739	*/
1972		1740
1973	int	1741	int
1974	check_move_on (object *op, object *originator)	1742	check_move_on (object *op, object *originator)
1975	{	1743	{
1976	object *	1744	object *tmp;
1977	tmp;	1745	maptile *m = op->map;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;	1746	int x = op->x, y = op->y;
1984	MoveType	1747
1985	move_on,	1748	MoveType move_on, move_slow, move_block;
1986	move_slow,
1987	move_block;
1988		1749
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1750	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1751	return 0;
1991
1992	tag = op->count;
1993		1752
1994	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1753	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1995	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1754	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1996	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1755	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1997		1756
…		…
2022	* we don't need to check all of them.	1781	* we don't need to check all of them.
2023	*/	1782	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1783	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;	1784	break;
2026	}	1785	}
		1786
2027	for (; tmp != NULL; tmp = tmp->below)	1787	for (; tmp; tmp = tmp->below)
2028	{	1788	{
2029	if (tmp == op)	1789	if (tmp == op)
2030	continue; /* Can't apply yourself */	1790	continue; /* Can't apply yourself */
2031		1791
2032	/* Check to see if one of the movement types should be slowed down.	1792	/* Check to see if one of the movement types should be slowed down.
…		…
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1800	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1801	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1802	{
2043		1803
2044	float	1804	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1805	diff = tmp->move_slow_penalty * FABS (op->speed);
		1806
2048	if (op->type == PLAYER)	1807	if (op->type == PLAYER)
2049	{
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1808	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)))	1809	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1810	diff /= 4.0;
2054	}	1811
2055	}
2056	op->speed_left -= diff;	1812	op->speed_left -= diff;
2057	}	1813	}
2058	}	1814	}
2059		1815
2060	/* Basically same logic as above, except now for actual apply. */	1816	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1817	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1818	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	1819	{
2064
2065	move_apply (tmp, op, originator);	1820	move_apply (tmp, op, originator);
		1821
2066	if (was_destroyed (op, tag))	1822	if (op->destroyed ())
2067	return 1;	1823	return 1;
2068		1824
2069	/* what the person/creature stepped onto has moved the object	1825	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1826	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	1827	* have a feeling strange problems would result.
2072	*/	1828	*/
2073	if (op->map != m || op->x != x || op->y != y)	1829	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1830	return 0;
2075	}	1831	}
2076	}	1832	}
		1833
2077	return 0;	1834	return 0;
2078	}	1835	}
2079		1836
2080	/*	1837	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	1838	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	1839	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	1840	* The first matching object is returned, or NULL if none.
2084	*/	1841	*/
2085		1842
2086	object *	1843	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	1844	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	1845	{
2089	object *	1846	object *
2090	tmp;	1847	tmp;
2091		1848
2092	if (m == NULL || out_of_map (m, x, y))	1849	if (m == NULL || out_of_map (m, x, y))
…		…
2105	* a matching type variable at the given map and coordinates.	1862	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	1863	* The first matching object is returned, or NULL if none.
2107	*/	1864	*/
2108		1865
2109	object *	1866	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	1867	present (unsigned char type, maptile *m, int x, int y)
2111	{	1868	{
2112	object *	1869	object *
2113	tmp;	1870	tmp;
2114		1871
2115	if (out_of_map (m, x, y))	1872	if (out_of_map (m, x, y))
…		…
2255	* the archetype because that isn't correct if the monster has been	2012	* the archetype because that isn't correct if the monster has been
2256	* customized, changed states, etc.	2013	* customized, changed states, etc.
2257	*/	2014	*/
2258		2015
2259	int	2016	int
2260	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2017	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2261	{	2018	{
2262	int	2019	int
2263	i,	2020	i,
2264	index = 0, flag;	2021	index = 0, flag;
2265	static int	2022	static int
…		…
2277	* if the space being examined only has a wall to the north and empty	2034	* if the space being examined only has a wall to the north and empty
2278	* spaces in all the other directions, this will reduce the search space	2035	* spaces in all the other directions, this will reduce the search space
2279	* to only the spaces immediately surrounding the target area, and	2036	* to only the spaces immediately surrounding the target area, and
2280	* won't look 2 spaces south of the target space.	2037	* won't look 2 spaces south of the target space.
2281	*/	2038	*/
2282	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2039	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2283	stop = maxfree[i];	2040	stop = maxfree[i];
2284	}	2041	}
		2042
2285	if (!index)	2043	if (!index)
2286	return -1;	2044	return -1;
		2045
2287	return altern[RANDOM () % index];	2046	return altern[RANDOM () % index];
2288	}	2047	}
2289		2048
2290	/*	2049	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	2050	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	2051	* find_free_spot(), but it will search max number of squares.
2293	* But it will return the first available spot, not a random choice.	2052	* But it will return the first available spot, not a random choice.
2294	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2053	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2295	*/	2054	*/
2296		2055
2297	int	2056	int
2298	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2057	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2299	{	2058	{
2300	int	2059	int
2301	i;	2060	i;
2302		2061
2303	for (i = 0; i < SIZEOFFREE; i++)	2062	for (i = 0; i < SIZEOFFREE; i++)
…		…
2367	* because we have to know what movement the thing looking to move	2126	* because we have to know what movement the thing looking to move
2368	* there is capable of.	2127	* there is capable of.
2369	*/	2128	*/
2370		2129
2371	int	2130	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2131	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2132	{
2374	int	2133	int
2375	i,	2134	i,
2376	max = SIZEOFFREE, mflags;	2135	max = SIZEOFFREE, mflags;
2377	sint16	2136
2378	nx,	2137	sint16 nx, ny;
2379	ny;
2380	object *	2138	object *
2381	tmp;	2139	tmp;
2382	mapstruct *	2140	maptile *
2383	mp;	2141	mp;
2384	MoveType	2142
2385	blocked,	2143	MoveType blocked, move_type;
2386	move_type;
2387		2144
2388	if (exclude && exclude->head)	2145	if (exclude && exclude->head)
2389	{	2146	{
2390	exclude = exclude->head;	2147	exclude = exclude->head;
2391	move_type = exclude->move_type;	2148	move_type = exclude->move_type;
…		…
2401	mp = m;	2158	mp = m;
2402	nx = x + freearr_x[i];	2159	nx = x + freearr_x[i];
2403	ny = y + freearr_y[i];	2160	ny = y + freearr_y[i];
2404		2161
2405	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2162	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2163
2406	if (mflags & P_OUT_OF_MAP)	2164	if (mflags & P_OUT_OF_MAP)
2407	{
2408	max = maxfree[i];	2165	max = maxfree[i];
2409	}
2410	else	2166	else
2411	{	2167	{
2412	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2168	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2413		2169
2414	if ((move_type & blocked) == move_type)	2170	if ((move_type & blocked) == move_type)
2415	{
2416	max = maxfree[i];	2171	max = maxfree[i];
2417	}
2418	else if (mflags & P_IS_ALIVE)	2172	else if (mflags & P_IS_ALIVE)
2419	{	2173	{
2420	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2174	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2421	{
2422	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2175	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2423	{
2424	break;	2176	break;
2425	}	2177
2426	}
2427	if (tmp)	2178	if (tmp)
2428	{
2429	return freedir[i];	2179	return freedir[i];
2430	}
2431	}	2180	}
2432	}	2181	}
2433	}	2182	}
		2183
2434	return 0;	2184	return 0;
2435	}	2185	}
2436		2186
2437	/*	2187	/*
2438	* distance(object 1, object 2) will return the square of the	2188	* distance(object 1, object 2) will return the square of the
…		…
2440	*/	2190	*/
2441		2191
2442	int	2192	int
2443	distance (const object *ob1, const object *ob2)	2193	distance (const object *ob1, const object *ob2)
2444	{	2194	{
2445	int	2195	int i;
2446	i;
2447		2196
2448	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2197	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2449	return i;	2198	return i;
2450	}	2199	}
2451		2200
…		…
2456	*/	2205	*/
2457		2206
2458	int	2207	int
2459	find_dir_2 (int x, int y)	2208	find_dir_2 (int x, int y)
2460	{	2209	{
2461	int	2210	int q;
2462	q;
2463		2211
2464	if (y)	2212	if (y)
2465	q = x * 100 / y;	2213	q = x * 100 / y;
2466	else if (x)	2214	else if (x)
2467	q = -300 * x;	2215	q = -300 * x;
…		…
2593	* find a path to that monster that we found. If not,	2341	* find a path to that monster that we found. If not,
2594	* we don't bother going toward it. Returns 1 if we	2342	* we don't bother going toward it. Returns 1 if we
2595	* can see a direct way to get it	2343	* can see a direct way to get it
2596	* Modified to be map tile aware -.MSW	2344	* Modified to be map tile aware -.MSW
2597	*/	2345	*/
2598
2599
2600	int	2346	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2347	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2348	{
2603	sint16	2349	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int
2607	mflags;	2350	int mflags;
2608		2351
2609	if (dir < 0)	2352	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2353	return 0; /* exit condition: invalid direction */
2611		2354
2612	dx = x + freearr_x[dir];	2355	dx = x + freearr_x[dir];
…		…
2625	return 0;	2368	return 0;
2626		2369
2627	/* yes, can see. */	2370	/* yes, can see. */
2628	if (dir < 9)	2371	if (dir < 9)
2629	return 1;	2372	return 1;
		2373
2630	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2374	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2631	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2375	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2376	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2632	}	2377	}
2633
2634
2635		2378
2636	/*	2379	/*
2637	* can_pick(picker, item): finds out if an object is possible to be	2380	* can_pick(picker, item): finds out if an object is possible to be
2638	* picked up by the picker. Returnes 1 if it can be	2381	* picked up by the picker. Returnes 1 if it can be
2639	* picked up, otherwise 0.	2382	* picked up, otherwise 0.
…		…
2650	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2393	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2651	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2394	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2652	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2395	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2653	}	2396	}
2654		2397
2655
2656	/*	2398	/*
2657	* create clone from object to another	2399	* create clone from object to another
2658	*/	2400	*/
2659	object *	2401	object *
2660	object_create_clone (object *asrc)	2402	object_create_clone (object *asrc)
2661	{	2403	{
2662	object *
2663	dst = NULL, *tmp, *src, *part, *prev, *item;	2404	object *dst = 0, *tmp, *src, *part, *prev, *item;
2664		2405
2665	if (!asrc)	2406	if (!asrc)
2666	return NULL;	2407	return 0;
		2408
2667	src = asrc;	2409	src = asrc;
2668	if (src->head)	2410	if (src->head)
2669	src = src->head;	2411	src = src->head;
2670		2412
2671	prev = NULL;	2413	prev = 0;
2672	for (part = src; part; part = part->more)	2414	for (part = src; part; part = part->more)
2673	{	2415	{
2674	tmp = get_object ();	2416	tmp = part->clone ();
2675	copy_object (part, tmp);
2676	tmp->x -= src->x;	2417	tmp->x -= src->x;
2677	tmp->y -= src->y;	2418	tmp->y -= src->y;
		2419
2678	if (!part->head)	2420	if (!part->head)
2679	{	2421	{
2680	dst = tmp;	2422	dst = tmp;
2681	tmp->head = NULL;	2423	tmp->head = 0;
2682	}	2424	}
2683	else	2425	else
2684	{
2685	tmp->head = dst;	2426	tmp->head = dst;
2686	}	2427
2687	tmp->more = NULL;	2428	tmp->more = 0;
		2429
2688	if (prev)	2430	if (prev)
2689	prev->more = tmp;	2431	prev->more = tmp;
		2432
2690	prev = tmp;	2433	prev = tmp;
2691	}	2434	}
2692		2435
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2436	for (item = src->inv; item; item = item->below)
2695	{
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);	2437	insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2438
2699	return dst;	2439	return dst;
2700	}	2440	}
2701		2441
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */	2442	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* Basically, we save the content of the string to a temp file, then call */	2443	/* Basically, we save the content of the string to a temp file, then call */
2714
2715	/* load_object on it. I admit it is a highly inefficient way to make things, */	2444	/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717	/* but it was simple to make and allows reusing the load_object function. */	2445	/* but it was simple to make and allows reusing the load_object function. */
2718
2719	/* Remember not to use load_object_str in a time-critical situation. */	2446	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */	2447	/* Also remember that multiparts objects are not supported for now. */
2722		2448
2723	object *	2449	object *
2724	load_object_str (const char *obstr)	2450	load_object_str (const char *obstr)
2725	{	2451	{
2726	object *	2452	object *op;
2727	op;
2728	char
2729	filename[MAX_BUF];	2453	char filename[MAX_BUF];
2730		2454
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2455	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732		2456
2733	FILE *
2734	tempfile = fopen (filename, "w");	2457	FILE *tempfile = fopen (filename, "w");
2735		2458
2736	if (tempfile == NULL)	2459	if (tempfile == NULL)
2737	{	2460	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");	2461	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;	2462	return NULL;
2740	};	2463	}
		2464
2741	fprintf (tempfile, obstr);	2465	fprintf (tempfile, obstr);
2742	fclose (tempfile);	2466	fclose (tempfile);
2743		2467
2744	op = get_object ();	2468	op = object::create ();
2745		2469
2746	object_thawer	2470	object_thawer thawer (filename);
2747	thawer (filename);
2748		2471
2749	if (thawer)	2472	if (thawer)
2750	load_object (thawer, op, 0);	2473	load_object (thawer, op, 0);
2751		2474
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2475	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2760	* returns NULL if no match.	2483	* returns NULL if no match.
2761	*/	2484	*/
2762	object *	2485	object *
2763	find_obj_by_type_subtype (const object *who, int type, int subtype)	2486	find_obj_by_type_subtype (const object *who, int type, int subtype)
2764	{	2487	{
2765	object *	2488	object *tmp;
2766	tmp;
2767		2489
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2490	for (tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2491	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2492	return tmp;
2771		2493
…		…
2779	* do the desired thing.	2501	* do the desired thing.
2780	*/	2502	*/
2781	key_value *	2503	key_value *
2782	get_ob_key_link (const object *ob, const char *key)	2504	get_ob_key_link (const object *ob, const char *key)
2783	{	2505	{
2784	key_value *	2506	key_value *link;
2785	link;
2786		2507
2787	for (link = ob->key_values; link != NULL; link = link->next)	2508	for (link = ob->key_values; link != NULL; link = link->next)
2788	{
2789	if (link->key == key)	2509	if (link->key == key)
2790	{
2791	return link;	2510	return link;
2792	}
2793	}
2794		2511
2795	return NULL;	2512	return NULL;
2796	}	2513	}
2797		2514
2798	/*	2515	/*
…		…
2803	* The returned string is shared.	2520	* The returned string is shared.
2804	*/	2521	*/
2805	const char *	2522	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2523	get_ob_key_value (const object *op, const char *const key)
2807	{	2524	{
2808	key_value *	2525	key_value *link;
2809	link;	2526	shstr_cmp canonical_key (key);
2810	const char *
2811	canonical_key;
2812		2527
2813	canonical_key = shstr::find (key);
2814
2815	if (canonical_key == NULL)	2528	if (!canonical_key)
2816	{	2529	{
2817	/* 1. There being a field named key on any object	2530	/* 1. There being a field named key on any object
2818	* implies there'd be a shared string to find.	2531	* implies there'd be a shared string to find.
2819	* 2. Since there isn't, no object has this field.	2532	* 2. Since there isn't, no object has this field.
2820	* 3. Therefore, *this* object doesn't have this field.	2533	* 3. Therefore, *this* object doesn't have this field.
2821	*/	2534	*/
2822	return NULL;	2535	return 0;
2823	}	2536	}
2824		2537
2825	/* This is copied from get_ob_key_link() above -	2538	/* This is copied from get_ob_key_link() above -
2826	* only 4 lines, and saves the function call overhead.	2539	* only 4 lines, and saves the function call overhead.
2827	*/	2540	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2541	for (link = op->key_values; link; link = link->next)
2829	{
2830	if (link->key == canonical_key)	2542	if (link->key == canonical_key)
2831	{
2832	return link->value;	2543	return link->value;
2833	}	2544
2834	}
2835	return NULL;	2545	return 0;
2836	}	2546	}
2837		2547
2838		2548
2839	/*	2549	/*
2840	* Updates the canonical_key in op to value.	2550	* Updates the canonical_key in op to value.
…		…
2876	if (last)	2586	if (last)
2877	last->next = field->next;	2587	last->next = field->next;
2878	else	2588	else
2879	op->key_values = field->next;	2589	op->key_values = field->next;
2880		2590
2881	delete
2882	field;	2591	delete field;
2883	}	2592	}
2884	}	2593	}
2885	return TRUE;	2594	return TRUE;
2886	}	2595	}
2887	/* IF we get here, key doesn't exist */	2596	/* IF we get here, key doesn't exist */
…		…
2922	* Returns TRUE on success.	2631	* Returns TRUE on success.
2923	*/	2632	*/
2924	int	2633	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2634	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2635	{
2927	shstr
2928	key_ (key);	2636	shstr key_ (key);
2929		2637
2930	return set_ob_key_value_s (op, key_, value, add_key);	2638	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2639	}
		2640
		2641	object::depth_iterator::depth_iterator (object *container)
		2642	: iterator_base (container)
		2643	{
		2644	while (item->inv)
		2645	item = item->inv;
		2646	}
		2647
		2648	void
		2649	object::depth_iterator::next ()
		2650	{
		2651	if (item->below)
		2652	{
		2653	item = item->below;
		2654
		2655	while (item->inv)
		2656	item = item->inv;
		2657	}
		2658	else
		2659	item = item->env;
		2660	}
		2661
		2662	// return a suitable string describing an objetc in enough detail to find it
		2663	const char *
		2664	object::debug_desc (char *info) const
		2665	{
		2666	char info2[256 * 3];
		2667	char *p = info;
		2668
		2669	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2670	count,
		2671	&name,
		2672	title ? " " : "",
		2673	title ? (const char *)title : "");
		2674
		2675	if (env)
		2676	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2677
		2678	if (map)
		2679	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2680
		2681	return info;
		2682	}
		2683
		2684	const char *
		2685	object::debug_desc () const
		2686	{
		2687	static char info[256 * 3];
		2688	return debug_desc (info);
		2689	}
		2690

Diff Legend

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