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

Diff Legend

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