ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.28 by root, Mon Sep 11 12:10:21 2006 UTC vs.
Revision 1.114 by root, Sun Jan 14 22:06:05 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
3		3
		4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	Copyright (C) 1992 Frank Tore Johansen
6		7
7	This program is free software; you can redistribute it and/or modify	8	This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	it under the terms of the GNU General Public License as published by
…		…
16		17
17	You should have received a copy of the GNU General Public License	18	You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21
21	The authors can be reached via e-mail at crossfire-devel@real-time.com	22	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
…		…
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
33	#include <skills.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
		36	#include <bitset>
		37
36	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
		39	static UUID uuid;
		40	const uint64 UUID_SKIP = 1<<19;
37		41
38	object *objects; /* Pointer to the list of used objects */	42	objectvec objects;
39	object *active_objects; /* List of active objects that need to be processed */	43	activevec actives;
40		44
41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	47	};
44	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
50	int freedir[SIZEOFFREE] = {	54	int freedir[SIZEOFFREE] = {
51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	57	};
54		58
		59	static void
		60	write_uuid (void)
		61	{
		62	char filename1[MAX_BUF], filename2[MAX_BUF];
		63
		64	sprintf (filename1, "%s/uuid", settings.localdir);
		65	sprintf (filename2, "%s/uuid~", settings.localdir);
		66
		67	FILE *fp;
		68
		69	if (!(fp = fopen (filename2, "w")))
		70	{
		71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		72	return;
		73	}
		74
		75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		76	fclose (fp);
		77	rename (filename2, filename1);
		78	}
		79
		80	static void
		81	read_uuid (void)
		82	{
		83	char filename[MAX_BUF];
		84
		85	sprintf (filename, "%s/uuid", settings.localdir);
		86
		87	FILE *fp;
		88
		89	if (!(fp = fopen (filename, "r")))
		90	{
		91	if (errno == ENOENT)
		92	{
		93	LOG (llevInfo, "RESET uid to 1\n");
		94	uuid.seq = 0;
		95	write_uuid ();
		96	return;
		97	}
		98
		99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		100	_exit (1);
		101	}
		102
		103	int version;
		104	unsigned long long uid;
		105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		106	{
		107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		108	_exit (1);
		109	}
		110
		111	uuid.seq = uid;
		112	write_uuid ();
		113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
		114	fclose (fp);
		115	}
		116
		117	UUID
		118	gen_uuid ()
		119	{
		120	UUID uid;
		121
		122	uid.seq = ++uuid.seq;
		123
		124	if (!(uuid.seq & (UUID_SKIP - 1)))
		125	write_uuid ();
		126
		127	return uid;
		128	}
		129
		130	void
		131	init_uuid ()
		132	{
		133	read_uuid ();
		134	}
		135
55	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
56	static int	137	static int
57	compare_ob_value_lists_one (const object *wants, const object *has)	138	compare_ob_value_lists_one (const object *wants, const object *has)
58	{	139	{
59	key_value *wants_field;	140	key_value *wants_field;
…		…
62	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
63	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
64	*/	145	*/
65		146
66	/* For each field in wants, */	147	/* For each field in wants, */
67	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
68	{	149	{
69	key_value *has_field;	150	key_value *has_field;
70		151
71	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
72	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
106	*	187	*
107	* Note that this function appears a lot longer than the macro it	188	* Note that this function appears a lot longer than the macro it
108	* replaces - this is mostly for clarity - a decent compiler should hopefully	189	* replaces - this is mostly for clarity - a decent compiler should hopefully
109	* reduce this to the same efficiency.	190	* reduce this to the same efficiency.
110	*	191	*
111	* Check nrof variable *before* calling CAN_MERGE()	192	* Check nrof variable *before* calling can_merge()
112	*	193	*
113	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
114	* check weight	195	* check weight
115	*/	196	*/
116
117	bool object::can_merge (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
118	{	198	{
119	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
120	if ((ob1 == ob2) || (ob1->type != ob2->type))	200	if (ob1 == ob2
		201	|| ob1->type != ob2->type
		202	|| ob1->speed != ob2->speed
		203	|| ob1->value != ob2->value
		204	|| ob1->name != ob2->name)
121	return 0;	205	return 0;
122		206
123	if (ob1->speed != ob2->speed)	207	//TODO: this ain't working well, use nicer and correct overflow check
124	return 0;
125
126	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
127	* value could not be stored in a sint32 (which unfortunately sometimes is	209	* value could not be stored in a sint32 (which unfortunately sometimes is
128	* used to store nrof).	210	* used to store nrof).
129	*/	211	*/
130	if (ob1->nrof + ob2->nrof >= 1UL << 31)	212	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
140	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
141		223
142	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
143	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
144		226
145		227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
146	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	228	|| ob1->arch != ob2->arch
147	* being locked in inventory should prevent merging.
148	* 0x4 in flags3 is CLIENT_SENT
149	*/
150	if ((ob1->arch != ob2->arch) ||
151	(ob1->flags[0] != ob2->flags[0]) ||
152	(ob1->flags[1] != ob2->flags[1]) ||
153	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
154	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
155	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
156	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
157	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
158	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
159	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
160	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
161	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
162	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
163	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
164	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
165	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
166	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
167	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
168	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
169	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
170	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
171	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
172	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
173	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
174	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
175	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
176	return 0;	252	return 0;
177		253
178	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
179	* check all objects in the inventory.	255	* check all objects in the inventory.
180	*/	256	*/
…		…
183	/* if one object has inventory but the other doesn't, not equiv */	259	/* if one object has inventory but the other doesn't, not equiv */
184	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
185	return 0;	261	return 0;
186		262
187	/* Now check to see if the two inventory objects could merge */	263	/* Now check to see if the two inventory objects could merge */
188	if (!CAN_MERGE (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
189	return 0;	265	return 0;
190		266
191	/* inventory ok - still need to check rest of this object to see	267	/* inventory ok - still need to check rest of this object to see
192	* if it is valid.	268	* if it is valid.
193	*/	269	*/
…		…
202		278
203	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
204	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
205	* check?	281	* check?
206	*/	282	*/
207	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
208	return 0;	284	return 0;
209		285
210	switch (ob1->type)	286	switch (ob1->type)
211	{	287	{
212	case SCROLL:	288	case SCROLL:
213	if (ob1->level != ob2->level)	289	if (ob1->level != ob2->level)
214	return 0;	290	return 0;
215	break;	291	break;
216	}	292	}
217		293
218	if (ob1->key_values != NULL || ob2->key_values != NULL)	294	if (ob1->key_values != NULL || ob2->key_values != NULL)
219	{	295	{
220	/* At least one of these has key_values. */	296	/* At least one of these has key_values. */
…		…
254	{	330	{
255	if (inv->inv)	331	if (inv->inv)
256	sum_weight (inv);	332	sum_weight (inv);
257	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
258	}	334	}
		335
259	if (op->type == CONTAINER && op->stats.Str)	336	if (op->type == CONTAINER && op->stats.Str)
260	sum = (sum * (100 - op->stats.Str)) / 100;	337	sum = (sum * (100 - op->stats.Str)) / 100;
		338
261	if (op->carrying != sum)	339	if (op->carrying != sum)
262	op->carrying = sum;	340	op->carrying = sum;
		341
263	return sum;	342	return sum;
264	}	343	}
265		344
266	/**	345	/**
267	* Return the outermost environment object for a given object.	346	* Return the outermost environment object for a given object.
…		…
274	op = op->env;	353	op = op->env;
275	return op;	354	return op;
276	}	355	}
277		356
278	/*	357	/*
279	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
280	* a better check. We basically keeping traversing up until we can't
281	* or find a player.
282	*/
283
284	object *
285	is_player_inv (object *op)
286	{
287	for (; op != NULL && op->type != PLAYER; op = op->env)
288	if (op->env == op)
289	op->env = NULL;
290	return op;
291	}
292
293	/*
294	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
295	* Some error messages.	359	* Some error messages.
296	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
297	*/	361	*/
298		362
299	void	363	char *
300	dump_object2 (object *op)
301	{
302	errmsg[0] = 0;
303	return;
304	//TODO//D#d#
305	#if 0
306	char *cp;
307
308	/* object *tmp;*/
309
310	if (op->arch != NULL)
311	{
312	strcat (errmsg, "arch ");
313	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
314	strcat (errmsg, "\n");
315	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
316	strcat (errmsg, cp);
317	# if 0
318	/* Don't dump player diffs - they are too long, mostly meaningless, and
319	* will overflow the buffer.
320	* Changed so that we don't dump inventory either. This may
321	* also overflow the buffer.
322	*/
323	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
324	strcat (errmsg, cp);
325	for (tmp = op->inv; tmp; tmp = tmp->below)
326	dump_object2 (tmp);
327	# endif
328	strcat (errmsg, "end\n");
329	}
330	else
331	{
332	strcat (errmsg, "Object ");
333	if (op->name == NULL)
334	strcat (errmsg, "(null)");
335	else
336	strcat (errmsg, op->name);
337	strcat (errmsg, "\n");
338	# if 0
339	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
340	strcat (errmsg, cp);
341	for (tmp = op->inv; tmp; tmp = tmp->below)
342	dump_object2 (tmp);
343	# endif
344	strcat (errmsg, "end\n");
345	}
346	#endif
347	}
348
349	/*
350	* Dumps an object. Returns output in the static global errmsg array.
351	*/
352
353	void
354	dump_object (object *op)	364	dump_object (object *op)
355	{	365	{
356	if (op == NULL)	366	if (!op)
357	{	367	return strdup ("[NULLOBJ]");
358	strcpy (errmsg, "[NULL pointer]");
359	return;
360	}
361	errmsg[0] = '\0';
362	dump_object2 (op);
363	}
364		368
365	void	369	object_freezer freezer;
366	dump_all_objects (void)	370	save_object (freezer, op, 1);
367	{	371	return freezer.as_string ();
368	object *op;
369
370	for (op = objects; op != NULL; op = op->next)
371	{
372	dump_object (op);
373	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
374	}
375	}	372	}
376		373
377	/*	374	/*
378	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
379	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
…		…
395	}	392	}
396		393
397	/*	394	/*
398	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
399	*/	396	*/
400
401	object *	397	object *
402	find_object (tag_t i)	398	find_object (tag_t i)
403	{	399	{
404	object *op;	400	for_all_objects (op)
405
406	for (op = objects; op != NULL; op = op->next)
407	if (op->count == i)	401	if (op->count == i)
408	break;
409	return op;	402	return op;
		403
		404	return 0;
410	}	405	}
411		406
412	/*	407	/*
413	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
414	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
415	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
416	*/	411	*/
417
418	object *	412	object *
419	find_object_name (const char *str)	413	find_object_name (const char *str)
420	{	414	{
421	const char *name = shstr::find (str);	415	shstr_cmp str_ (str);
422	object *op;	416	object *op;
423		417
424	for (op = objects; op != NULL; op = op->next)	418	for_all_objects (op)
425	if (&op->name == name)	419	if (op->name == str_)
426	break;	420	break;
427		421
428	return op;	422	return op;
429	}	423	}
430		424
…		…
433	{	427	{
434	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
435	}	429	}
436		430
437	/*	431	/*
438	* Returns the object which this object marks as being the owner.
439	* A id-scheme is used to avoid pointing to objects which have been
440	* freed and are now reused. If this is detected, the owner is
441	* set to NULL, and NULL is returned.
442	* Changed 2004-02-12 - if the player is setting at the play again
443	* prompt, he is removed, and we don't want to treat him as an owner of
444	* anything, so check removed flag. I don't expect that this should break
445	* anything - once an object is removed, it is basically dead anyways.
446	*/
447
448	object *
449	get_owner (object *op)
450	{
451	if (op->owner == NULL)
452	return NULL;
453
454	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
455	return op->owner;
456
457	op->owner = NULL;
458	op->ownercount = 0;
459	return NULL;
460	}
461
462	void
463	clear_owner (object *op)
464	{
465	if (!op)
466	return;
467
468	if (op->owner && op->ownercount == op->owner->count)
469	op->owner->refcount--;
470
471	op->owner = NULL;
472	op->ownercount = 0;
473	}
474
475	/*
476	* Sets the owner and sets the skill and exp pointers to owner's current	432	* Sets the owner and sets the skill and exp pointers to owner's current
477	* skill and experience objects.	433	* skill and experience objects.
478	*/	434	*/
479	void	435	void
480	set_owner (object *op, object *owner)	436	object::set_owner (object *owner)
481	{	437	{
482	if (owner == NULL || op == NULL)	438	if (!owner)
483	return;	439	return;
484		440
485	/* next line added to allow objects which own objects */	441	/* next line added to allow objects which own objects */
486	/* Add a check for ownercounts in here, as I got into an endless loop	442	/* Add a check for ownercounts in here, as I got into an endless loop
487	* with the fireball owning a poison cloud which then owned the	443	* with the fireball owning a poison cloud which then owned the
488	* fireball. I believe that was caused by one of the objects getting	444	* fireball. I believe that was caused by one of the objects getting
489	* freed and then another object replacing it. Since the ownercounts	445	* freed and then another object replacing it. Since the ownercounts
490	* didn't match, this check is valid and I believe that cause is valid.	446	* didn't match, this check is valid and I believe that cause is valid.
491	*/	447	*/
492	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	448	while (owner->owner)
493	owner = owner->owner;	449	owner = owner->owner;
494		450
495	/* IF the owner still has an owner, we did not resolve to a final owner.
496	* so lets not add to that.
497	*/
498	if (owner->owner)
499	return;
500
501	op->owner = owner;	451	this->owner = owner;
502
503	op->ownercount = owner->count;
504	owner->refcount++;
505	}
506
507	/* Set the owner to clone's current owner and set the skill and experience
508	* objects to clone's objects (typically those objects that where the owner's
509	* current skill and experience objects at the time when clone's owner was
510	* set - not the owner's current skill and experience objects).
511	*
512	* Use this function if player created an object (e.g. fire bullet, swarm
513	* spell), and this object creates further objects whose kills should be
514	* accounted for the player's original skill, even if player has changed
515	* skills meanwhile.
516	*/
517	void
518	copy_owner (object *op, object *clone)
519	{
520	object *owner = get_owner (clone);
521
522	if (owner == NULL)
523	{
524	/* players don't have owners - they own themselves. Update
525	* as appropriate.
526	*/
527	if (clone->type == PLAYER)
528	owner = clone;
529	else
530	return;
531	}
532
533	set_owner (op, owner);
534	}	452	}
535		453
536	/* Zero the key_values on op, decrementing the shared-string	454	/* Zero the key_values on op, decrementing the shared-string
537	* refcounts and freeing the links.	455	* refcounts and freeing the links.
538	*/	456	*/
…		…
548	}	466	}
549		467
550	op->key_values = 0;	468	op->key_values = 0;
551	}	469	}
552		470
553	void object::clear ()
554	{
555	attachable_base::clear ();
556
557	free_key_values (this);
558
559	clear_owner (this);
560
561	name = 0;
562	name_pl = 0;
563	title = 0;
564	race = 0;
565	slaying = 0;
566	skill = 0;
567	msg = 0;
568	lore = 0;
569	custom_name = 0;
570	materialname = 0;
571
572	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
573
574	SET_FLAG (this, FLAG_REMOVED);
575	}
576
577	void object::clone (object *destination)
578	{
579	*(object_copy *) destination = *this;
580	*(object_pod *) destination = *this;
581
582	if (self || cb)
583	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
584	}
585
586	/*	471	/*
587	* clear_object() frees everything allocated by an object, and also
588	* clears all variables and flags to default settings.
589	*/
590
591	void
592	clear_object (object *op)
593	{
594	op->clear ();
595
596	op->contr = NULL;
597	op->below = NULL;
598	op->above = NULL;
599	op->inv = NULL;
600	op->container = NULL;
601	op->env = NULL;
602	op->more = NULL;
603	op->head = NULL;
604	op->map = NULL;
605	op->refcount = 0;
606	op->active_next = NULL;
607	op->active_prev = NULL;
608	/* What is not cleared is next, prev, and count */
609
610	op->expmul = 1.0;
611	op->face = blank_face;
612	op->attacked_by_count = -1;
613
614	if (settings.casting_time)
615	op->casting_time = -1;
616	}
617
618	/*
619	* copy object first frees everything allocated by the second object,	472	* copy_to first frees everything allocated by the dst object,
620	* and then copies the contends of the first object into the second	473	* and then copies the contents of itself into the second
621	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
622	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
623	* if the first object is freed, the pointers in the new object	476	* if the first object is freed, the pointers in the new object
624	* will point at garbage.	477	* will point at garbage.
625	*/	478	*/
626
627	void	479	void
628	copy_object (object *op2, object *op)	480	object::copy_to (object *dst)
629	{	481	{
630	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
631	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
632		484
633	op2->clone (op);	485	*(object_copy *)dst = *this;
634		486
635	if (is_freed)	487	if (is_freed)
636	SET_FLAG (op, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
		489
637	if (is_removed)	490	if (is_removed)
638	SET_FLAG (op, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
639		492
640	if (op2->speed < 0)	493	if (speed < 0)
641	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
642		495
643	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
644	if (op2->key_values)	497	if (key_values)
645	{	498	{
646	key_value *tail = 0;	499	key_value *tail = 0;
647	key_value *i;	500	key_value *i;
648		501
649	op->key_values = 0;	502	dst->key_values = 0;
650		503
651	for (i = op2->key_values; i; i = i->next)	504	for (i = key_values; i; i = i->next)
652	{	505	{
653	key_value *new_link = new key_value;	506	key_value *new_link = new key_value;
654		507
655	new_link->next = 0;	508	new_link->next = 0;
656	new_link->key = i->key;	509	new_link->key = i->key;
657	new_link->value = i->value;	510	new_link->value = i->value;
658		511
659	/* Try and be clever here, too. */	512	/* Try and be clever here, too. */
660	if (!op->key_values)	513	if (!dst->key_values)
661	{	514	{
662	op->key_values = new_link;	515	dst->key_values = new_link;
663	tail = new_link;	516	tail = new_link;
664	}	517	}
665	else	518	else
666	{	519	{
667	tail->next = new_link;	520	tail->next = new_link;
668	tail = new_link;	521	tail = new_link;
669	}	522	}
670	}	523	}
671	}	524	}
672		525
673	update_ob_speed (op);	526	dst->set_speed (dst->speed);
		527	}
		528
		529	object *
		530	object::clone ()
		531	{
		532	object *neu = create ();
		533	copy_to (neu);
		534	return neu;
674	}	535	}
675		536
676	/*	537	/*
677	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
678	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
679	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
680	*/	541	*/
681
682	void	542	void
683	update_turn_face (object *op)	543	update_turn_face (object *op)
684	{	544	{
685	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
686	return;	546	return;
		547
687	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
688	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
689	}	550	}
690		551
691	/*	552	/*
692	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
693	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
694	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
695	*/	556	*/
696
697	void	557	void
698	update_ob_speed (object *op)	558	object::set_speed (float speed)
699	{	559	{
700	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
701
702	/* No reason putting the archetypes objects on the speed list,
703	* since they never really need to be updated.
704	*/
705
706	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
707	{	561	{
708	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
709	#ifdef MANY_CORES
710	abort ();
711	#else
712	op->speed = 0;	563	speed = 0;
713	#endif
714	}
715	if (arch_init)
716	{	564	}
717	return;
718	}
719	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
720	{
721	/* If already on active list, don't do anything */
722	if (op->active_next || op->active_prev || op == active_objects)
723	return;
724		565
725	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
726	* of the list. */	567
727	op->active_next = active_objects;	568	if (has_active_speed ())
728	if (op->active_next != NULL)	569	activate ();
729	op->active_next->active_prev = op;
730	active_objects = op;
731	}
732	else	570	else
733	{	571	deactivate ();
734	/* If not on the active list, nothing needs to be done */
735	if (!op->active_next && !op->active_prev && op != active_objects)
736	return;
737
738	if (op->active_prev == NULL)
739	{
740	active_objects = op->active_next;
741	if (op->active_next != NULL)
742	op->active_next->active_prev = NULL;
743	}
744	else
745	{
746	op->active_prev->active_next = op->active_next;
747	if (op->active_next)
748	op->active_next->active_prev = op->active_prev;
749	}
750	op->active_next = NULL;
751	op->active_prev = NULL;
752	}
753	}	572	}
754		573
755	/* This function removes object 'op' from the list of active
756	* objects.
757	* This should only be used for style maps or other such
758	* reference maps where you don't want an object that isn't
759	* in play chewing up cpu time getting processed.
760	* The reverse of this is to call update_ob_speed, which
761	* will do the right thing based on the speed of the object.
762	*/
763	void
764	remove_from_active_list (object *op)
765	{
766	/* If not on the active list, nothing needs to be done */
767	if (!op->active_next && !op->active_prev && op != active_objects)
768	return;
769
770	if (op->active_prev == NULL)
771	{
772	active_objects = op->active_next;
773	if (op->active_next != NULL)
774	op->active_next->active_prev = NULL;
775	}
776	else
777	{
778	op->active_prev->active_next = op->active_next;
779	if (op->active_next)
780	op->active_next->active_prev = op->active_prev;
781	}
782	op->active_next = NULL;
783	op->active_prev = NULL;
784	}
785
786	/*	574	/*
787	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
788	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
789	* by invisible objects by whatever is below them (unless it's another	577	* by invisible objects by whatever is below them (unless it's another
790	* invisible object, etc...)	578	* invisible object, etc...)
791	* If the object being updated is beneath a player, the look-window	579	* If the object being updated is beneath a player, the look-window
792	* of that player is updated (this might be a suboptimal way of	580	* of that player is updated (this might be a suboptimal way of
793	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
794	*	582	*
795	* action is a hint of what the caller believes need to be done.	583	* action is a hint of what the caller believes need to be done.
796	* For example, if the only thing that has changed is the face (due to
797	* an animation), we don't need to call update_position until that actually
798	* comes into view of a player. OTOH, many other things, like addition/removal
799	* of walls or living creatures may need us to update the flags now.
800	* current action are:	584	* current action are:
801	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
802	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
803	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	587	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
804	* as that is easier than trying to look at what may have changed.	588	* as that is easier than trying to look at what may have changed.
805	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
806	*/	590	*/
807
808	void	591	void
809	update_object (object *op, int action)	592	update_object (object *op, int action)
810	{	593	{
811	int update_now = 0, flags;
812	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
813		595
814	if (op == NULL)	596	if (op == NULL)
815	{	597	{
816	/* this should never happen */	598	/* this should never happen */
817	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
818	return;	600	return;
819	}	601	}
820		602
821	if (op->env != NULL)	603	if (op->env)
822	{	604	{
823	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
824	* to do in this case.	606	* to do in this case.
825	*/	607	*/
826	return;	608	return;
…		…
831	*/	613	*/
832	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
833	return;	615	return;
834		616
835	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
836	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
837	{	619	{
838	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
839	#ifdef MANY_CORES	621	#ifdef MANY_CORES
840	abort ();	622	abort ();
841	#endif	623	#endif
842	return;	624	return;
843	}	625	}
844		626
845	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
846	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
847	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
848	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
849	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
850	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
851		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
852	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
853	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
854	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
855	update_now = 1;
856
857	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
858	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
859		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
860	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
861	update_now = 1;
862
863	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
864	update_now = 1;
865
866	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
867	update_now = 1;
868
869	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
870	update_now = 1;
871
872	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
873	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
874
875	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
876	* to have move_allow right now.	644	* to have move_allow right now.
877	*/	645	*/
878	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
879	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
880		648	m.flags_ = 0;
881	if ((move_slow | op->move_slow) != move_slow)
882	update_now = 1;
883	}	649	}
884	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
885	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
886	* that is being removed.	652	* that is being removed.
887	*/	653	*/
888	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
889	update_now = 1;	655	m.flags_ = 0;
890	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
891	/* Nothing to do for that case */;	657	/* Nothing to do for that case */ ;
892	else	658	else
893	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
894		660
895	if (update_now)
896	{
897	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
898	update_position (op->map, op->x, op->y);
899	}
900
901	if (op->more != NULL)	661	if (op->more)
902	update_object (op->more, action);	662	update_object (op->more, action);
903	}
904
905	static unordered_vector<object *> mortals;
906	static std::vector<object *> freed;
907
908	void object::free_mortals ()
909	{
910	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )
911	if (!(*i)->refcount)
912	{
913	freed.push_back (*i);
914	mortals.erase (i);
915	}
916	else
917	++i;
918	}	663	}
919		664
920	object::object ()	665	object::object ()
921	{	666	{
922	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
923		668
924	expmul = 1.0;	669	expmul = 1.0;
925	face = blank_face;	670	face = blank_face;
926	attacked_by_count = -1;
927	}	671	}
928		672
929	object::~object ()	673	object::~object ()
930	{	674	{
931	free_key_values (this);	675	free_key_values (this);
932	}	676	}
933		677
		678	static int object_count;
		679
934	void object::link ()	680	void object::link ()
935	{	681	{
		682	assert (!index);//D
		683	uuid = gen_uuid ();
936	count = ++ob_count;	684	count = ++object_count;
937		685
938	prev = 0;	686	refcnt_inc ();
939	next = objects;	687	objects.insert (this);
940
941	if (objects)
942	objects->prev = this;
943
944	objects = this;
945	}	688	}
946		689
947	void object::unlink ()	690	void object::unlink ()
948	{	691	{
949	count = 0;	692	assert (index);//D
		693	objects.erase (this);
		694	refcnt_dec ();
		695	}
950		696
951	/* Remove this object from the list of used objects */	697	void
952	if (prev)	698	object::activate ()
953	{	699	{
954	prev->next = next;	700	/* If already on active list, don't do anything */
955	prev = 0;	701	if (active)
		702	return;
		703
		704	if (has_active_speed ())
		705	actives.insert (this);
		706	}
		707
		708	void
		709	object::activate_recursive ()
		710	{
		711	activate ();
		712
		713	for (object *op = inv; op; op = op->below)
		714	op->activate_recursive ();
		715	}
		716
		717	/* This function removes object 'op' from the list of active
		718	* objects.
		719	* This should only be used for style maps or other such
		720	* reference maps where you don't want an object that isn't
		721	* in play chewing up cpu time getting processed.
		722	* The reverse of this is to call update_ob_speed, which
		723	* will do the right thing based on the speed of the object.
		724	*/
		725	void
		726	object::deactivate ()
		727	{
		728	/* If not on the active list, nothing needs to be done */
		729	if (!active)
		730	return;
		731
		732	actives.erase (this);
		733	}
		734
		735	void
		736	object::deactivate_recursive ()
		737	{
		738	for (object *op = inv; op; op = op->below)
		739	op->deactivate_recursive ();
		740
		741	deactivate ();
		742	}
		743
		744	void
		745	object::set_flag_inv (int flag, int value)
		746	{
		747	for (object *op = inv; op; op = op->below)
956	}	748	{
957		749	op->flag [flag] = value;
958	if (next)	750	op->set_flag_inv (flag, value);
959	{	751	}
960	next->prev = prev;	752	}
961	next = 0;	753
		754	/*
		755	* Remove and free all objects in the inventory of the given object.
		756	* object.c ?
		757	*/
		758	void
		759	object::destroy_inv (bool drop_to_ground)
		760	{
		761	// need to check first, because the checks below might segfault
		762	// as we might be on an invalid mapspace and crossfire code
		763	// is too buggy to ensure that the inventory is empty.
		764	// corollary: if you create arrows etc. with stuff in tis inventory,
		765	// cf will crash below with off-map x and y
		766	if (!inv)
		767	return;
		768
		769	/* Only if the space blocks everything do we not process -
		770	* if some form of movement is allowed, let objects
		771	* drop on that space.
		772	*/
		773	if (!drop_to_ground
		774	|| !map
		775	|| map->in_memory != MAP_IN_MEMORY
		776	|| ms ().move_block == MOVE_ALL)
962	}	777	{
		778	while (inv)
		779	{
		780	inv->destroy_inv (drop_to_ground);
		781	inv->destroy ();
		782	}
		783	}
		784	else
		785	{ /* Put objects in inventory onto this space */
		786	while (inv)
		787	{
		788	object *op = inv;
963		789
964	if (this == objects)	790	if (op->flag [FLAG_STARTEQUIP]
965	objects = next;	791	|| op->flag [FLAG_NO_DROP]
		792	|| op->type == RUNE
		793	|| op->type == TRAP
		794	|| op->flag [FLAG_IS_A_TEMPLATE]
		795	|| op->flag [FLAG_DESTROY_ON_DEATH])
		796	op->destroy ();
		797	else
		798	map->insert (op, x, y);
		799	}
		800	}
966	}	801	}
967		802
968	object *object::create ()	803	object *object::create ()
969	{	804	{
970	object *op;
971
972	if (freed.empty ())
973	op = new object;	805	object *op = new object;
974	else
975	{
976	// highly annoying, but the only way to get it stable right now
977	op = freed.back (); freed.pop_back ();
978	op->~object ();
979	new ((void *)op) object;
980	}
981
982	op->link ();	806	op->link ();
983	return op;	807	return op;
984	}	808	}
985		809
986	/*	810	void
987	* free_object() frees everything allocated by an object, removes	811	object::do_destroy ()
988	* it from the list of used objects, and puts it on the list of
989	* free objects. The IS_FREED() flag is set in the object.
990	* The object must have been removed by remove_ob() first for
991	* this function to succeed.
992	*
993	* If free_inventory is set, free inventory as well. Else drop items in
994	* inventory to the ground.
995	*/
996	void object::free (bool free_inventory)
997	{	812	{
998	if (!QUERY_FLAG (this, FLAG_REMOVED))	813	attachable::do_destroy ();
999	{
1000	LOG (llevDebug, "Free object called with non removed object\n");
1001	dump_object (this);
1002	#ifdef MANY_CORES
1003	abort ();
1004	#endif
1005	}
1006		814
1007	if (QUERY_FLAG (this, FLAG_FRIENDLY))	815	if (flag [FLAG_IS_LINKED])
1008	{	816	remove_button_link (this);
1009	LOG (llevMonster, "Warning: tried to free friendly object.\n");	817
		818	if (flag [FLAG_FRIENDLY])
1010	remove_friendly_object (this);	819	remove_friendly_object (this);
1011	}
1012		820
1013	if (QUERY_FLAG (this, FLAG_FREED))	821	if (!flag [FLAG_REMOVED])
		822	remove ();
		823
		824	destroy_inv (true);
		825
		826	deactivate ();
		827	unlink ();
		828
		829	flag [FLAG_FREED] = 1;
		830
		831	// hack to ensure that freed objects still have a valid map
		832	{
		833	static maptile *freed_map; // freed objects are moved here to avoid crashes
		834
		835	if (!freed_map)
1014	{	836	{
1015	dump_object (this);	837	freed_map = new maptile;
1016	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);	838
1017	return;	839	freed_map->name = "/internal/freed_objects_map";
		840	freed_map->width = 3;
		841	freed_map->height = 3;
		842
		843	freed_map->alloc ();
		844	freed_map->in_memory = MAP_IN_MEMORY;
1018	}	845	}
		846
		847	map = freed_map;
		848	x = 1;
		849	y = 1;
		850	}
		851
		852	head = 0;
1019		853
1020	if (more)	854	if (more)
1021	{	855	{
1022	more->free (free_inventory);	856	more->destroy ();
1023	more = 0;	857	more = 0;
1024	}	858	}
1025		859
1026	if (inv)	860	// clear those pointers that likely might have circular references to us
1027	{	861	owner = 0;
1028	/* Only if the space blocks everything do we not process -	862	enemy = 0;
1029	* if some form of movement is allowed, let objects	863	attacked_by = 0;
1030	* drop on that space.	864	}
1031	*/
1032	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1033	{
1034	object *
1035	op = inv;
1036		865
1037	while (op)	866	void
1038	{	867	object::destroy (bool destroy_inventory)
1039	object *	868	{
1040	tmp = op->below;	869	if (destroyed ())
		870	return;
1041		871
1042	remove_ob (op);	872	if (destroy_inventory)
1043	op->free (free_inventory);	873	destroy_inv (false);
1044	op = tmp;
1045	}
1046	}
1047	else
1048	{ /* Put objects in inventory onto this space */
1049	object *
1050	op = inv;
1051		874
1052	while (op)	875	attachable::destroy ();
1053	{
1054	object *
1055	tmp = op->below;
1056
1057	remove_ob (op);
1058
1059	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1060	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1061	free_object (op);
1062	else
1063	{
1064	op->x = x;
1065	op->y = y;
1066	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1067	}
1068
1069	op = tmp;
1070	}
1071	}
1072	}
1073
1074	clear_owner (this);
1075
1076	/* Remove object from the active list */
1077	speed = 0;
1078	update_ob_speed (this);
1079
1080	unlink ();
1081
1082	SET_FLAG (this, FLAG_FREED);
1083
1084	mortals.push_back (this);
1085	}	876	}
1086		877
1087	/*	878	/*
1088	* sub_weight() recursively (outwards) subtracts a number from the	879	* sub_weight() recursively (outwards) subtracts a number from the
1089	* weight of an object (and what is carried by it's environment(s)).	880	* weight of an object (and what is carried by it's environment(s)).
1090	*/	881	*/
1091
1092	void	882	void
1093	sub_weight (object *op, signed long weight)	883	sub_weight (object *op, signed long weight)
1094	{	884	{
1095	while (op != NULL)	885	while (op != NULL)
1096	{	886	{
1097	if (op->type == CONTAINER)	887	if (op->type == CONTAINER)
1098	{
1099	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	888	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1100	}	889
1101	op->carrying -= weight;	890	op->carrying -= weight;
1102	op = op->env;	891	op = op->env;
1103	}	892	}
1104	}	893	}
1105		894
1106	/* remove_ob(op):	895	/* op->remove ():
1107	* This function removes the object op from the linked list of objects	896	* This function removes the object op from the linked list of objects
1108	* which it is currently tied to. When this function is done, the	897	* which it is currently tied to. When this function is done, the
1109	* object will have no environment. If the object previously had an	898	* object will have no environment. If the object previously had an
1110	* environment, the x and y coordinates will be updated to	899	* environment, the x and y coordinates will be updated to
1111	* the previous environment.	900	* the previous environment.
1112	* Beware: This function is called from the editor as well!	901	* Beware: This function is called from the editor as well!
1113	*/	902	*/
1114
1115	void	903	void
1116	remove_ob (object *op)	904	object::remove ()
1117	{	905	{
1118	object *tmp, *last = NULL;	906	object *tmp, *last = 0;
1119	object *otmp;	907	object *otmp;
1120		908
1121	tag_t tag;
1122	int check_walk_off;
1123	mapstruct *m;
1124
1125	sint16 x, y;
1126
1127	if (QUERY_FLAG (op, FLAG_REMOVED))	909	if (QUERY_FLAG (this, FLAG_REMOVED))
1128	{	910	return;
1129	dump_object (op);
1130	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1131		911
1132	/* Changed it to always dump core in this case. As has been learned
1133	* in the past, trying to recover from errors almost always
1134	* make things worse, and this is a real error here - something
1135	* that should not happen.
1136	* Yes, if this was a mission critical app, trying to do something
1137	* to recover may make sense, but that is because failure of the app
1138	* may have other disastrous problems. Cf runs out of a script
1139	* so is easily enough restarted without any real problems.
1140	* MSW 2001-07-01
1141	*/
1142	abort ();
1143	}
1144
1145	if (op->more != NULL)
1146	remove_ob (op->more);
1147
1148	SET_FLAG (op, FLAG_REMOVED);	912	SET_FLAG (this, FLAG_REMOVED);
		913	INVOKE_OBJECT (REMOVE, this);
		914
		915	if (more)
		916	more->remove ();
1149		917
1150	/*	918	/*
1151	* In this case, the object to be removed is in someones	919	* In this case, the object to be removed is in someones
1152	* inventory.	920	* inventory.
1153	*/	921	*/
1154	if (op->env != NULL)	922	if (env)
1155	{	923	{
1156	if (op->nrof)	924	if (nrof)
1157	sub_weight (op->env, op->weight * op->nrof);	925	sub_weight (env, weight * nrof);
1158	else	926	else
1159	sub_weight (op->env, op->weight + op->carrying);	927	sub_weight (env, weight + carrying);
1160		928
1161	/* NO_FIX_PLAYER is set when a great many changes are being	929	/* NO_FIX_PLAYER is set when a great many changes are being
1162	* made to players inventory. If set, avoiding the call	930	* made to players inventory. If set, avoiding the call
1163	* to save cpu time.	931	* to save cpu time.
1164	*/	932	*/
1165	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	933	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1166	fix_player (otmp);	934	otmp->update_stats ();
1167		935
1168	if (op->above != NULL)	936	if (above)
1169	op->above->below = op->below;	937	above->below = below;
1170	else	938	else
1171	op->env->inv = op->below;	939	env->inv = below;
1172		940
1173	if (op->below != NULL)	941	if (below)
1174	op->below->above = op->above;	942	below->above = above;
1175		943
1176	/* we set up values so that it could be inserted into	944	/* we set up values so that it could be inserted into
1177	* the map, but we don't actually do that - it is up	945	* the map, but we don't actually do that - it is up
1178	* to the caller to decide what we want to do.	946	* to the caller to decide what we want to do.
1179	*/	947	*/
1180	op->x = op->env->x, op->y = op->env->y;	948	x = env->x, y = env->y;
1181	op->map = op->env->map;	949	map = env->map;
1182	op->above = NULL, op->below = NULL;	950	above = 0, below = 0;
1183	op->env = NULL;	951	env = 0;
1184	return;
1185	}
1186
1187	/* If we get here, we are removing it from a map */
1188	if (op->map == NULL)
1189	return;
1190
1191	x = op->x;
1192	y = op->y;
1193	m = get_map_from_coord (op->map, &x, &y);
1194
1195	if (!m)
1196	{	952	}
1197	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	953	else if (map)
1198	op->map->path, op->x, op->y);
1199	/* in old days, we used to set x and y to 0 and continue.
1200	* it seems if we get into this case, something is probablye
1201	* screwed up and should be fixed.
1202	*/
1203	abort ();
1204	}	954	{
1205	if (op->map != m)	955	if (type == PLAYER)
1206	{	956	{
1207	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	957	--map->players;
1208	op->map->path, m->path, op->x, op->y, x, y);	958	map->touch ();
1209	}	959	}
1210		960
1211	/* Re did the following section of code - it looks like it had	961	map->dirty = true;
1212	* lots of logic for things we no longer care about
1213	*/
1214		962
1215	/* link the object above us */	963	/* link the object above us */
1216	if (op->above)	964	if (above)
1217	op->above->below = op->below;	965	above->below = below;
1218	else	966	else
1219	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	967	map->at (x, y).top = below; /* we were top, set new top */
1220		968
1221	/* Relink the object below us, if there is one */	969	/* Relink the object below us, if there is one */
1222	if (op->below)	970	if (below)
1223	op->below->above = op->above;	971	below->above = above;
1224	else	972	else
1225	{	973	{
1226	/* Nothing below, which means we need to relink map object for this space	974	/* Nothing below, which means we need to relink map object for this space
1227	* use translated coordinates in case some oddness with map tiling is	975	* use translated coordinates in case some oddness with map tiling is
1228	* evident	976	* evident
1229	*/
1230	if (GET_MAP_OB (m, x, y) != op)
1231	{
1232	dump_object (op);
1233	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1234	errmsg);
1235	dump_object (GET_MAP_OB (m, x, y));
1236	LOG (llevError, "%s\n", errmsg);
1237	}
1238
1239	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1240	}
1241
1242	op->above = NULL;
1243	op->below = NULL;
1244
1245	if (op->map->in_memory == MAP_SAVING)
1246	return;
1247
1248	tag = op->count;
1249	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1250
1251	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1252	{
1253	/* No point updating the players look faces if he is the object
1254	* being removed.
1255	*/
1256
1257	if (tmp->type == PLAYER && tmp != op)
1258	{
1259	/* If a container that the player is currently using somehow gets
1260	* removed (most likely destroyed), update the player view
1261	* appropriately.
1262	*/	977	*/
1263	if (tmp->container == op)	978	if (GET_MAP_OB (map, x, y) != this)
1264	{	979	{
1265	CLEAR_FLAG (op, FLAG_APPLIED);	980	char *dump = dump_object (this);
1266	tmp->container = NULL;	981	LOG (llevError,
		982	"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);
		983	free (dump);
		984	dump = dump_object (GET_MAP_OB (map, x, y));
		985	LOG (llevError, "%s\n", dump);
		986	free (dump);
1267	}	987	}
1268		988
1269	tmp->contr->socket.update_look = 1;	989	map->at (x, y).bot = above; /* goes on above it. */
1270	}
1271	/* See if player moving off should effect something */
1272	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1273	{	990	}
1274	move_apply (tmp, op, NULL);
1275		991
1276	if (was_destroyed (op, tag))	992	above = 0;
		993	below = 0;
		994
		995	if (map->in_memory == MAP_SAVING)
		996	return;
		997
		998	int check_walk_off = !flag [FLAG_NO_APPLY];
		999
		1000	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
		1001	{
		1002	/* No point updating the players look faces if he is the object
		1003	* being removed.
		1004	*/
		1005
		1006	if (tmp->type == PLAYER && tmp != this)
1277	{	1007	{
1278	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1008	/* If a container that the player is currently using somehow gets
		1009	* removed (most likely destroyed), update the player view
		1010	* appropriately.
		1011	*/
		1012	if (tmp->container == this)
		1013	{
		1014	flag [FLAG_APPLIED] = 0;
		1015	tmp->container = 0;
		1016	}
		1017
		1018	if (tmp->contr->ns)
		1019	tmp->contr->ns->floorbox_update ();
1279	}	1020	}
		1021
		1022	/* See if object moving off should effect something */
		1023	if (check_walk_off
		1024	&& ((move_type & tmp->move_off)
		1025	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1026	{
		1027	move_apply (tmp, this, 0);
		1028
		1029	if (destroyed ())
		1030	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1280	}	1031	}
1281		1032
1282	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1033	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1283		1034	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1284	if (tmp->above == tmp)	1035	if (tmp->above == tmp)
1285	tmp->above = NULL;	1036	tmp->above = 0;
1286		1037
1287	last = tmp;	1038	last = tmp;
1288	}	1039	}
1289		1040
1290	/* last == NULL of there are no objects on this space */	1041	/* last == NULL if there are no objects on this space */
1291	if (last == NULL)	1042	//TODO: this makes little sense, why only update the topmost object?
1292	{	1043	if (!last)
1293	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1044	map->at (x, y).flags_ = 0;
1294	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1295	* those out anyways, and if there are any flags set right now, they won't
1296	* be correct anyways.
1297	*/
1298	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1299	update_position (op->map, op->x, op->y);
1300	}
1301	else	1045	else
1302	update_object (last, UP_OBJ_REMOVE);	1046	update_object (last, UP_OBJ_REMOVE);
1303		1047
1304	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1048	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1305	update_all_los (op->map, op->x, op->y);	1049	update_all_los (map, x, y);
		1050	}
1306	}	1051	}
1307		1052
1308	/*	1053	/*
1309	* merge_ob(op,top):	1054	* merge_ob(op,top):
1310	*	1055	*
1311	* This function goes through all objects below and including top, and	1056	* This function goes through all objects below and including top, and
1312	* merges op to the first matching object.	1057	* merges op to the first matching object.
1313	* If top is NULL, it is calculated.	1058	* If top is NULL, it is calculated.
1314	* Returns pointer to object if it succeded in the merge, otherwise NULL	1059	* Returns pointer to object if it succeded in the merge, otherwise NULL
1315	*/	1060	*/
1316
1317	object *	1061	object *
1318	merge_ob (object *op, object *top)	1062	merge_ob (object *op, object *top)
1319	{	1063	{
1320	if (!op->nrof)	1064	if (!op->nrof)
1321	return 0;	1065	return 0;
1322	if (top == NULL)	1066
		1067	if (top)
1323	for (top = op; top != NULL && top->above != NULL; top = top->above);	1068	for (top = op; top && top->above; top = top->above)
		1069	;
		1070
1324	for (; top != NULL; top = top->below)	1071	for (; top; top = top->below)
1325	{	1072	{
1326	if (top == op)	1073	if (top == op)
1327	continue;	1074	continue;
1328	if (CAN_MERGE (op, top))	1075
		1076	if (object::can_merge (op, top))
1329	{	1077	{
1330	top->nrof += op->nrof;	1078	top->nrof += op->nrof;
1331		1079
1332	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1080	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1333	op->weight = 0; /* Don't want any adjustements now */	1081	op->weight = 0; /* Don't want any adjustements now */
1334	remove_ob (op);	1082	op->destroy ();
1335	free_object (op);
1336	return top;	1083	return top;
1337	}	1084	}
1338	}	1085	}
		1086
1339	return NULL;	1087	return 0;
1340	}	1088	}
1341		1089
1342	/*	1090	/*
1343	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1091	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1344	* job preparing multi-part monsters	1092	* job preparing multi-part monsters
1345	*/	1093	*/
1346	object *	1094	object *
1347	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1095	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1348	{	1096	{
1349	object *
1350	tmp;
1351
1352	if (op->head)
1353	op = op->head;
1354	for (tmp = op; tmp; tmp = tmp->more)	1097	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1355	{	1098	{
1356	tmp->x = x + tmp->arch->clone.x;	1099	tmp->x = x + tmp->arch->clone.x;
1357	tmp->y = y + tmp->arch->clone.y;	1100	tmp->y = y + tmp->arch->clone.y;
1358	}	1101	}
		1102
1359	return insert_ob_in_map (op, m, originator, flag);	1103	return insert_ob_in_map (op, m, originator, flag);
1360	}	1104	}
1361		1105
1362	/*	1106	/*
1363	* insert_ob_in_map (op, map, originator, flag):	1107	* insert_ob_in_map (op, map, originator, flag):
…		…
1377	* Return value:	1121	* Return value:
1378	* new object if 'op' was merged with other object	1122	* new object if 'op' was merged with other object
1379	* NULL if 'op' was destroyed	1123	* NULL if 'op' was destroyed
1380	* just 'op' otherwise	1124	* just 'op' otherwise
1381	*/	1125	*/
1382
1383	object *	1126	object *
1384	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1127	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1385	{	1128	{
1386	object *tmp, *top, *floor = NULL;	1129	object *tmp, *top, *floor = NULL;
1387	sint16 x, y;	1130	sint16 x, y;
1388		1131
1389	if (QUERY_FLAG (op, FLAG_FREED))	1132	if (QUERY_FLAG (op, FLAG_FREED))
1390	{	1133	{
1391	LOG (llevError, "Trying to insert freed object!\n");	1134	LOG (llevError, "Trying to insert freed object!\n");
1392	return NULL;	1135	return NULL;
1393	}	1136	}
1394		1137
1395	if (m == NULL)	1138	if (!m)
1396	{	1139	{
1397	dump_object (op);	1140	char *dump = dump_object (op);
1398	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1142	free (dump);
1399	return op;	1143	return op;
1400	}	1144	}
1401		1145
1402	if (out_of_map (m, op->x, op->y))	1146	if (out_of_map (m, op->x, op->y))
1403	{	1147	{
1404	dump_object (op);	1148	char *dump = dump_object (op);
1405	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1149	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1406	#ifdef MANY_CORES	1150	#ifdef MANY_CORES
1407	/* Better to catch this here, as otherwise the next use of this object	1151	/* Better to catch this here, as otherwise the next use of this object
1408	* is likely to cause a crash. Better to find out where it is getting	1152	* is likely to cause a crash. Better to find out where it is getting
1409	* improperly inserted.	1153	* improperly inserted.
1410	*/	1154	*/
1411	abort ();	1155	abort ();
1412	#endif	1156	#endif
		1157	free (dump);
1413	return op;	1158	return op;
1414	}	1159	}
1415		1160
1416	if (!QUERY_FLAG (op, FLAG_REMOVED))	1161	if (!QUERY_FLAG (op, FLAG_REMOVED))
1417	{	1162	{
1418	dump_object (op);	1163	char *dump = dump_object (op);
1419	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1164	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1165	free (dump);
1420	return op;	1166	return op;
1421	}	1167	}
1422		1168
1423	if (op->more != NULL)	1169	if (op->more)
1424	{	1170	{
1425	/* The part may be on a different map. */	1171	/* The part may be on a different map. */
1426		1172
1427	object *more = op->more;	1173	object *more = op->more;
1428		1174
1429	/* We really need the caller to normalize coordinates - if	1175	/* We really need the caller to normalise coordinates - if
1430	* we set the map, that doesn't work if the location is within	1176	* we set the map, that doesn't work if the location is within
1431	* a map and this is straddling an edge. So only if coordinate	1177	* a map and this is straddling an edge. So only if coordinate
1432	* is clear wrong do we normalize it.	1178	* is clear wrong do we normalise it.
1433	*/	1179	*/
1434	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1180	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1435	more->map = get_map_from_coord (m, &more->x, &more->y);	1181	more->map = get_map_from_coord (m, &more->x, &more->y);
1436	else if (!more->map)	1182	else if (!more->map)
1437	{	1183	{
…		…
1444	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1190	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1445	{	1191	{
1446	if (!op->head)	1192	if (!op->head)
1447	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1193	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1448		1194
1449	return NULL;	1195	return 0;
1450	}	1196	}
1451	}	1197	}
1452		1198
1453	CLEAR_FLAG (op, FLAG_REMOVED);	1199	CLEAR_FLAG (op, FLAG_REMOVED);
1454		1200
…		…
1461	y = op->y;	1207	y = op->y;
1462		1208
1463	/* this has to be done after we translate the coordinates.	1209	/* this has to be done after we translate the coordinates.
1464	*/	1210	*/
1465	if (op->nrof && !(flag & INS_NO_MERGE))	1211	if (op->nrof && !(flag & INS_NO_MERGE))
1466	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1212	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1467	if (CAN_MERGE (op, tmp))	1213	if (object::can_merge (op, tmp))
1468	{	1214	{
1469	op->nrof += tmp->nrof;	1215	op->nrof += tmp->nrof;
1470	remove_ob (tmp);	1216	tmp->destroy ();
1471	free_object (tmp);
1472	}	1217	}
1473		1218
1474	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1219	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1475	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1220	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1476		1221
…		…
1489	op->below = originator->below;	1234	op->below = originator->below;
1490		1235
1491	if (op->below)	1236	if (op->below)
1492	op->below->above = op;	1237	op->below->above = op;
1493	else	1238	else
1494	SET_MAP_OB (op->map, op->x, op->y, op);	1239	op->ms ().bot = op;
1495		1240
1496	/* since *below* originator, no need to update top */	1241	/* since *below* originator, no need to update top */
1497	originator->below = op;	1242	originator->below = op;
1498	}	1243	}
1499	else	1244	else
1500	{	1245	{
1501	/* If there are other objects, then */	1246	/* If there are other objects, then */
1502	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1247	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1503	{	1248	{
1504	object *last = NULL;	1249	object *last = 0;
1505		1250
1506	/*	1251	/*
1507	* If there are multiple objects on this space, we do some trickier handling.	1252	* If there are multiple objects on this space, we do some trickier handling.
1508	* We've already dealt with merging if appropriate.	1253	* We've already dealt with merging if appropriate.
1509	* Generally, we want to put the new object on top. But if	1254	* Generally, we want to put the new object on top. But if
…		…
1513	* once we get to them. This reduces the need to traverse over all of	1258	* once we get to them. This reduces the need to traverse over all of
1514	* them when adding another one - this saves quite a bit of cpu time	1259	* them when adding another one - this saves quite a bit of cpu time
1515	* when lots of spells are cast in one area. Currently, it is presumed	1260	* when lots of spells are cast in one area. Currently, it is presumed
1516	* that flying non pickable objects are spell objects.	1261	* that flying non pickable objects are spell objects.
1517	*/	1262	*/
1518
1519	while (top != NULL)	1263	while (top)
1520	{	1264	{
1521	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1265	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1522	floor = top;	1266	floor = top;
1523		1267
1524	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1268	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1545	* If INS_ON_TOP is used, don't do this processing	1289	* If INS_ON_TOP is used, don't do this processing
1546	* Need to find the object that in fact blocks view, otherwise	1290	* Need to find the object that in fact blocks view, otherwise
1547	* stacking is a bit odd.	1291	* stacking is a bit odd.
1548	*/	1292	*/
1549	if (!(flag & INS_ON_TOP) &&	1293	if (!(flag & INS_ON_TOP) &&
1550	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1294	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1551	{	1295	{
1552	for (last = top; last != floor; last = last->below)	1296	for (last = top; last != floor; last = last->below)
1553	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1297	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1554	break;	1298	break;
1555	/* Check to see if we found the object that blocks view,	1299	/* Check to see if we found the object that blocks view,
…		…
1577	op->above = GET_MAP_OB (op->map, op->x, op->y);	1321	op->above = GET_MAP_OB (op->map, op->x, op->y);
1578		1322
1579	if (op->above)	1323	if (op->above)
1580	op->above->below = op;	1324	op->above->below = op;
1581		1325
1582	op->below = NULL;	1326	op->below = 0;
1583	SET_MAP_OB (op->map, op->x, op->y, op);	1327	op->ms ().bot = op;
1584	}	1328	}
1585	else	1329	else
1586	{ /* get inserted into the stack above top */	1330	{ /* get inserted into the stack above top */
1587	op->above = top->above;	1331	op->above = top->above;
1588		1332
…		…
1591		1335
1592	op->below = top;	1336	op->below = top;
1593	top->above = op;	1337	top->above = op;
1594	}	1338	}
1595		1339
1596	if (op->above == NULL)	1340	if (!op->above)
1597	SET_MAP_TOP (op->map, op->x, op->y, op);	1341	op->ms ().top = op;
1598	} /* else not INS_BELOW_ORIGINATOR */	1342	} /* else not INS_BELOW_ORIGINATOR */
1599		1343
1600	if (op->type == PLAYER)	1344	if (op->type == PLAYER)
		1345	{
1601	op->contr->do_los = 1;	1346	op->contr->do_los = 1;
		1347	++op->map->players;
		1348	op->map->touch ();
		1349	}
		1350
		1351	op->map->dirty = true;
1602		1352
1603	/* If we have a floor, we know the player, if any, will be above	1353	/* If we have a floor, we know the player, if any, will be above
1604	* it, so save a few ticks and start from there.	1354	* it, so save a few ticks and start from there.
1605	*/	1355	*/
1606	if (!(flag & INS_MAP_LOAD))	1356	if (!(flag & INS_MAP_LOAD))
1607	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1357	if (object *pl = op->ms ().player ())
1608	if (tmp->type == PLAYER)	1358	if (pl->contr->ns)
1609	tmp->contr->socket.update_look = 1;	1359	pl->contr->ns->floorbox_update ();
1610		1360
1611	/* If this object glows, it may affect lighting conditions that are	1361	/* If this object glows, it may affect lighting conditions that are
1612	* visible to others on this map. But update_all_los is really	1362	* visible to others on this map. But update_all_los is really
1613	* an inefficient way to do this, as it means los for all players	1363	* an inefficient way to do this, as it means los for all players
1614	* on the map will get recalculated. The players could very well	1364	* on the map will get recalculated. The players could very well
1615	* be far away from this change and not affected in any way -	1365	* be far away from this change and not affected in any way -
1616	* this should get redone to only look for players within range,	1366	* this should get redone to only look for players within range,
1617	* or just updating the P_NEED_UPDATE for spaces within this area	1367	* or just updating the P_UPTODATE for spaces within this area
1618	* of effect may be sufficient.	1368	* of effect may be sufficient.
1619	*/	1369	*/
1620	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1370	if (op->map->darkness && (op->glow_radius != 0))
1621	update_all_los (op->map, op->x, op->y);	1371	update_all_los (op->map, op->x, op->y);
1622		1372
1623	/* updates flags (blocked, alive, no magic, etc) for this map space */	1373	/* updates flags (blocked, alive, no magic, etc) for this map space */
1624	update_object (op, UP_OBJ_INSERT);	1374	update_object (op, UP_OBJ_INSERT);
1625		1375
		1376	INVOKE_OBJECT (INSERT, op);
		1377
1626	/* Don't know if moving this to the end will break anything. However,	1378	/* Don't know if moving this to the end will break anything. However,
1627	* we want to have update_look set above before calling this.	1379	* we want to have floorbox_update called before calling this.
1628	*	1380	*
1629	* check_move_on() must be after this because code called from	1381	* check_move_on() must be after this because code called from
1630	* check_move_on() depends on correct map flags (so functions like	1382	* check_move_on() depends on correct map flags (so functions like
1631	* blocked() and wall() work properly), and these flags are updated by	1383	* blocked() and wall() work properly), and these flags are updated by
1632	* update_object().	1384	* update_object().
…		…
1634		1386
1635	/* if this is not the head or flag has been passed, don't check walk on status */	1387	/* if this is not the head or flag has been passed, don't check walk on status */
1636	if (!(flag & INS_NO_WALK_ON) && !op->head)	1388	if (!(flag & INS_NO_WALK_ON) && !op->head)
1637	{	1389	{
1638	if (check_move_on (op, originator))	1390	if (check_move_on (op, originator))
1639	return NULL;	1391	return 0;
1640		1392
1641	/* If we are a multi part object, lets work our way through the check	1393	/* If we are a multi part object, lets work our way through the check
1642	* walk on's.	1394	* walk on's.
1643	*/	1395	*/
1644	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1396	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1645	if (check_move_on (tmp, originator))	1397	if (check_move_on (tmp, originator))
1646	return NULL;	1398	return 0;
1647	}	1399	}
1648		1400
1649	return op;	1401	return op;
1650	}	1402	}
1651		1403
1652	/* this function inserts an object in the map, but if it	1404	/* this function inserts an object in the map, but if it
1653	* finds an object of its own type, it'll remove that one first.	1405	* finds an object of its own type, it'll remove that one first.
1654	* op is the object to insert it under: supplies x and the map.	1406	* op is the object to insert it under: supplies x and the map.
1655	*/	1407	*/
1656	void	1408	void
1657	replace_insert_ob_in_map (const char *arch_string, object *op)	1409	replace_insert_ob_in_map (const char *arch_string, object *op)
1658	{	1410	{
1659	object *tmp;
1660	object *tmp1;	1411	object *tmp, *tmp1;
1661		1412
1662	/* first search for itself and remove any old instances */	1413	/* first search for itself and remove any old instances */
1663		1414
1664	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1415	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1665	{
1666	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1416	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1667	{	1417	tmp->destroy ();
1668	remove_ob (tmp);
1669	free_object (tmp);
1670	}
1671	}
1672		1418
1673	tmp1 = arch_to_object (find_archetype (arch_string));	1419	tmp1 = arch_to_object (archetype::find (arch_string));
1674		1420
1675	tmp1->x = op->x;	1421	tmp1->x = op->x;
1676	tmp1->y = op->y;	1422	tmp1->y = op->y;
1677	insert_ob_in_map (tmp1, op->map, op, 0);	1423	insert_ob_in_map (tmp1, op->map, op, 0);
		1424	}
		1425
		1426	object *
		1427	object::insert_at (object *where, object *originator, int flags)
		1428	{
		1429	where->map->insert (this, where->x, where->y, originator, flags);
1678	}	1430	}
1679		1431
1680	/*	1432	/*
1681	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1433	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1682	* is returned contains nr objects, and the remaining parts contains	1434	* is returned contains nr objects, and the remaining parts contains
1683	* the rest (or is removed and freed if that number is 0).	1435	* the rest (or is removed and freed if that number is 0).
1684	* On failure, NULL is returned, and the reason put into the	1436	* On failure, NULL is returned, and the reason put into the
1685	* global static errmsg array.	1437	* global static errmsg array.
1686	*/	1438	*/
1687
1688	object *	1439	object *
1689	get_split_ob (object *orig_ob, uint32 nr)	1440	get_split_ob (object *orig_ob, uint32 nr)
1690	{	1441	{
1691	object *	1442	object *newob;
1692	newob;
1693	int
1694	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1443	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1695		1444
1696	if (orig_ob->nrof < nr)	1445	if (orig_ob->nrof < nr)
1697	{	1446	{
1698	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1447	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1699	return NULL;	1448	return NULL;
1700	}	1449	}
		1450
1701	newob = object_create_clone (orig_ob);	1451	newob = object_create_clone (orig_ob);
		1452
1702	if ((orig_ob->nrof -= nr) < 1)	1453	if ((orig_ob->nrof -= nr) < 1)
1703	{	1454	orig_ob->destroy (1);
1704	if (!is_removed)
1705	remove_ob (orig_ob);
1706	free_object2 (orig_ob, 1);
1707	}
1708	else if (!is_removed)	1455	else if (!is_removed)
1709	{	1456	{
1710	if (orig_ob->env != NULL)	1457	if (orig_ob->env != NULL)
1711	sub_weight (orig_ob->env, orig_ob->weight * nr);	1458	sub_weight (orig_ob->env, orig_ob->weight * nr);
1712	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1459	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1714	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1461	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1715	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1462	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1716	return NULL;	1463	return NULL;
1717	}	1464	}
1718	}	1465	}
		1466
1719	newob->nrof = nr;	1467	newob->nrof = nr;
1720		1468
1721	return newob;	1469	return newob;
1722	}	1470	}
1723		1471
…		…
1730	*/	1478	*/
1731		1479
1732	object *	1480	object *
1733	decrease_ob_nr (object *op, uint32 i)	1481	decrease_ob_nr (object *op, uint32 i)
1734	{	1482	{
1735	object *	1483	object *tmp;
1736	tmp;
1737	player *
1738	pl;
1739		1484
1740	if (i == 0) /* objects with op->nrof require this check */	1485	if (i == 0) /* objects with op->nrof require this check */
1741	return op;	1486	return op;
1742		1487
1743	if (i > op->nrof)	1488	if (i > op->nrof)
1744	i = op->nrof;	1489	i = op->nrof;
1745		1490
1746	if (QUERY_FLAG (op, FLAG_REMOVED))	1491	if (QUERY_FLAG (op, FLAG_REMOVED))
1747	{
1748	op->nrof -= i;	1492	op->nrof -= i;
1749	}
1750	else if (op->env != NULL)	1493	else if (op->env)
1751	{	1494	{
1752	/* is this object in the players inventory, or sub container	1495	/* is this object in the players inventory, or sub container
1753	* therein?	1496	* therein?
1754	*/	1497	*/
1755	tmp = is_player_inv (op->env);	1498	tmp = op->in_player ();
1756	/* nope. Is this a container the player has opened?	1499	/* nope. Is this a container the player has opened?
1757	* If so, set tmp to that player.	1500	* If so, set tmp to that player.
1758	* IMO, searching through all the players will mostly	1501	* IMO, searching through all the players will mostly
1759	* likely be quicker than following op->env to the map,	1502	* likely be quicker than following op->env to the map,
1760	* and then searching the map for a player.	1503	* and then searching the map for a player.
1761	*/	1504	*/
1762	if (!tmp)	1505	if (!tmp)
1763	{	1506	for_all_players (pl)
1764	for (pl = first_player; pl; pl = pl->next)
1765	if (pl->ob->container == op->env)	1507	if (pl->ob->container == op->env)
		1508	{
		1509	tmp = pl->ob;
1766	break;	1510	break;
1767	if (pl)
1768	tmp = pl->ob;
1769	else
1770	tmp = NULL;
1771	}	1511	}
1772		1512
1773	if (i < op->nrof)	1513	if (i < op->nrof)
1774	{	1514	{
1775	sub_weight (op->env, op->weight * i);	1515	sub_weight (op->env, op->weight * i);
1776	op->nrof -= i;	1516	op->nrof -= i;
1777	if (tmp)	1517	if (tmp)
1778	{
1779	esrv_send_item (tmp, op);	1518	esrv_send_item (tmp, op);
1780	}
1781	}	1519	}
1782	else	1520	else
1783	{	1521	{
1784	remove_ob (op);	1522	op->remove ();
1785	op->nrof = 0;	1523	op->nrof = 0;
1786	if (tmp)	1524	if (tmp)
1787	{
1788	esrv_del_item (tmp->contr, op->count);	1525	esrv_del_item (tmp->contr, op->count);
1789	}
1790	}	1526	}
1791	}	1527	}
1792	else	1528	else
1793	{	1529	{
1794	object *
1795	above = op->above;	1530	object *above = op->above;
1796		1531
1797	if (i < op->nrof)	1532	if (i < op->nrof)
1798	{
1799	op->nrof -= i;	1533	op->nrof -= i;
1800	}
1801	else	1534	else
1802	{	1535	{
1803	remove_ob (op);	1536	op->remove ();
1804	op->nrof = 0;	1537	op->nrof = 0;
1805	}	1538	}
		1539
1806	/* Since we just removed op, op->above is null */	1540	/* Since we just removed op, op->above is null */
1807	for (tmp = above; tmp != NULL; tmp = tmp->above)	1541	for (tmp = above; tmp; tmp = tmp->above)
1808	if (tmp->type == PLAYER)	1542	if (tmp->type == PLAYER)
1809	{	1543	{
1810	if (op->nrof)	1544	if (op->nrof)
1811	esrv_send_item (tmp, op);	1545	esrv_send_item (tmp, op);
1812	else	1546	else
1813	esrv_del_item (tmp->contr, op->count);	1547	esrv_del_item (tmp->contr, op->count);
1814	}	1548	}
1815	}	1549	}
1816		1550
1817	if (op->nrof)	1551	if (op->nrof)
1818	{
1819	return op;	1552	return op;
1820	}
1821	else	1553	else
1822	{	1554	{
1823	free_object (op);	1555	op->destroy ();
1824	return NULL;	1556	return 0;
1825	}	1557	}
1826	}	1558	}
1827		1559
1828	/*	1560	/*
1829	* add_weight(object, weight) adds the specified weight to an object,	1561	* add_weight(object, weight) adds the specified weight to an object,
…		…
1834	add_weight (object *op, signed long weight)	1566	add_weight (object *op, signed long weight)
1835	{	1567	{
1836	while (op != NULL)	1568	while (op != NULL)
1837	{	1569	{
1838	if (op->type == CONTAINER)	1570	if (op->type == CONTAINER)
1839	{
1840	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1571	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1841	}	1572
1842	op->carrying += weight;	1573	op->carrying += weight;
1843	op = op->env;	1574	op = op->env;
1844	}	1575	}
1845	}	1576	}
1846		1577
		1578	object *
		1579	insert_ob_in_ob (object *op, object *where)
		1580	{
		1581	if (!where)
		1582	{
		1583	char *dump = dump_object (op);
		1584	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1585	free (dump);
		1586	return op;
		1587	}
		1588
		1589	if (where->head)
		1590	{
		1591	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1592	where = where->head;
		1593	}
		1594
		1595	return where->insert (op);
		1596	}
		1597
1847	/*	1598	/*
1848	* insert_ob_in_ob(op,environment):	1599	* env->insert (op)
1849	* This function inserts the object op in the linked list	1600	* This function inserts the object op in the linked list
1850	* inside the object environment.	1601	* inside the object environment.
1851	*	1602	*
1852	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1853	* the inventory at the last position or next to other objects of the same
1854	* type.
1855	* Frank: Now sorted by type, archetype and magic!
1856	*
1857	* The function returns now pointer to inserted item, and return value can	1603	* The function returns now pointer to inserted item, and return value can
1858	* be != op, if items are merged. -Tero	1604	* be != op, if items are merged. -Tero
1859	*/	1605	*/
1860		1606
1861	object *	1607	object *
1862	insert_ob_in_ob (object *op, object *where)	1608	object::insert (object *op)
1863	{	1609	{
1864	object *	1610	object *tmp, *otmp;
1865	tmp, *
1866	otmp;
1867		1611
1868	if (!QUERY_FLAG (op, FLAG_REMOVED))	1612	if (!QUERY_FLAG (op, FLAG_REMOVED))
1869	{	1613	op->remove ();
1870	dump_object (op);	1614
1871	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1872	return op;
1873	}
1874	if (where == NULL)
1875	{
1876	dump_object (op);
1877	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1878	return op;
1879	}
1880	if (where->head)
1881	{
1882	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1883	where = where->head;
1884	}
1885	if (op->more)	1615	if (op->more)
1886	{	1616	{
1887	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1617	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1888	return op;	1618	return op;
1889	}	1619	}
		1620
1890	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1621	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1891	CLEAR_FLAG (op, FLAG_REMOVED);	1622	CLEAR_FLAG (op, FLAG_REMOVED);
1892	if (op->nrof)	1623	if (op->nrof)
1893	{	1624	{
1894	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1625	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1895	if (CAN_MERGE (tmp, op))	1626	if (object::can_merge (tmp, op))
1896	{	1627	{
1897	/* return the original object and remove inserted object	1628	/* return the original object and remove inserted object
1898	(client needs the original object) */	1629	(client needs the original object) */
1899	tmp->nrof += op->nrof;	1630	tmp->nrof += op->nrof;
1900	/* Weight handling gets pretty funky. Since we are adding to	1631	/* Weight handling gets pretty funky. Since we are adding to
1901	* tmp->nrof, we need to increase the weight.	1632	* tmp->nrof, we need to increase the weight.
1902	*/	1633	*/
1903	add_weight (where, op->weight * op->nrof);	1634	add_weight (this, op->weight * op->nrof);
1904	SET_FLAG (op, FLAG_REMOVED);	1635	SET_FLAG (op, FLAG_REMOVED);
1905	free_object (op); /* free the inserted object */	1636	op->destroy (); /* free the inserted object */
1906	op = tmp;	1637	op = tmp;
1907	remove_ob (op); /* and fix old object's links */	1638	op->remove (); /* and fix old object's links */
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1639	CLEAR_FLAG (op, FLAG_REMOVED);
1909	break;	1640	break;
1910	}	1641	}
1911		1642
1912	/* I assume combined objects have no inventory	1643	/* I assume combined objects have no inventory
1913	* We add the weight - this object could have just been removed	1644	* We add the weight - this object could have just been removed
1914	* (if it was possible to merge). calling remove_ob will subtract	1645	* (if it was possible to merge). calling remove_ob will subtract
1915	* the weight, so we need to add it in again, since we actually do	1646	* the weight, so we need to add it in again, since we actually do
1916	* the linking below	1647	* the linking below
1917	*/	1648	*/
1918	add_weight (where, op->weight * op->nrof);	1649	add_weight (this, op->weight * op->nrof);
1919	}	1650	}
1920	else	1651	else
1921	add_weight (where, (op->weight + op->carrying));	1652	add_weight (this, (op->weight + op->carrying));
1922		1653
1923	otmp = is_player_inv (where);	1654	otmp = this->in_player ();
1924	if (otmp && otmp->contr != NULL)	1655	if (otmp && otmp->contr)
1925	{
1926	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1656	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1927	fix_player (otmp);	1657	otmp->update_stats ();
1928	}
1929		1658
1930	op->map = NULL;	1659	op->map = 0;
1931	op->env = where;	1660	op->env = this;
1932	op->above = NULL;	1661	op->above = 0;
1933	op->below = NULL;	1662	op->below = 0;
1934	op->x = 0, op->y = 0;	1663	op->x = 0, op->y = 0;
1935		1664
1936	/* reset the light list and los of the players on the map */	1665	/* reset the light list and los of the players on the map */
1937	if ((op->glow_radius != 0) && where->map)	1666	if ((op->glow_radius != 0) && map)
1938	{	1667	{
1939	#ifdef DEBUG_LIGHTS	1668	#ifdef DEBUG_LIGHTS
1940	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1669	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1941	#endif /* DEBUG_LIGHTS */	1670	#endif /* DEBUG_LIGHTS */
1942	if (MAP_DARKNESS (where->map))	1671	if (map->darkness)
1943	update_all_los (where->map, where->x, where->y);	1672	update_all_los (map, x, y);
1944	}	1673	}
1945		1674
1946	/* Client has no idea of ordering so lets not bother ordering it here.	1675	/* Client has no idea of ordering so lets not bother ordering it here.
1947	* It sure simplifies this function...	1676	* It sure simplifies this function...
1948	*/	1677	*/
1949	if (where->inv == NULL)	1678	if (!inv)
1950	where->inv = op;	1679	inv = op;
1951	else	1680	else
1952	{	1681	{
1953	op->below = where->inv;	1682	op->below = inv;
1954	op->below->above = op;	1683	op->below->above = op;
1955	where->inv = op;	1684	inv = op;
1956	}	1685	}
		1686
		1687	INVOKE_OBJECT (INSERT, this);
		1688
1957	return op;	1689	return op;
1958	}	1690	}
1959		1691
1960	/*	1692	/*
1961	* Checks if any objects has a move_type that matches objects	1693	* Checks if any objects has a move_type that matches objects
…		…
1975	*	1707	*
1976	* MSW 2001-07-08: Check all objects on space, not just those below	1708	* MSW 2001-07-08: Check all objects on space, not just those below
1977	* object being inserted. insert_ob_in_map may not put new objects	1709	* object being inserted. insert_ob_in_map may not put new objects
1978	* on top.	1710	* on top.
1979	*/	1711	*/
1980
1981	int	1712	int
1982	check_move_on (object *op, object *originator)	1713	check_move_on (object *op, object *originator)
1983	{	1714	{
1984	object *tmp;	1715	object *tmp;
1985	tag_t tag;
1986	mapstruct *m = op->map;	1716	maptile *m = op->map;
1987	int x = op->x, y = op->y;	1717	int x = op->x, y = op->y;
1988		1718
1989	MoveType move_on, move_slow, move_block;	1719	MoveType move_on, move_slow, move_block;
1990		1720
1991	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1721	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1992	return 0;	1722	return 0;
1993
1994	tag = op->count;
1995		1723
1996	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1724	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1997	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1725	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1998	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1726	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1999		1727
…		…
2015		1743
2016	/* The objects have to be checked from top to bottom.	1744	/* The objects have to be checked from top to bottom.
2017	* Hence, we first go to the top:	1745	* Hence, we first go to the top:
2018	*/	1746	*/
2019		1747
2020	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1748	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
2021	{	1749	{
2022	/* Trim the search when we find the first other spell effect	1750	/* Trim the search when we find the first other spell effect
2023	* this helps performance so that if a space has 50 spell objects,	1751	* this helps performance so that if a space has 50 spell objects,
2024	* we don't need to check all of them.	1752	* we don't need to check all of them.
2025	*/	1753	*/
…		…
2042	{	1770	{
2043	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1771	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2044	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1772	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2045	{	1773	{
2046		1774
		1775	float
2047	float diff = tmp->move_slow_penalty * FABS (op->speed);	1776	diff = tmp->move_slow_penalty * FABS (op->speed);
2048		1777
2049	if (op->type == PLAYER)	1778	if (op->type == PLAYER)
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1779	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)))	1780	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2052	diff /= 4.0;	1781	diff /= 4.0;
…		…
2059	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1788	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2060	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1789	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2061	{	1790	{
2062	move_apply (tmp, op, originator);	1791	move_apply (tmp, op, originator);
2063		1792
2064	if (was_destroyed (op, tag))	1793	if (op->destroyed ())
2065	return 1;	1794	return 1;
2066		1795
2067	/* what the person/creature stepped onto has moved the object	1796	/* what the person/creature stepped onto has moved the object
2068	* someplace new. Don't process any further - if we did,	1797	* someplace new. Don't process any further - if we did,
2069	* have a feeling strange problems would result.	1798	* have a feeling strange problems would result.
…		…
2079	/*	1808	/*
2080	* present_arch(arch, map, x, y) searches for any objects with	1809	* present_arch(arch, map, x, y) searches for any objects with
2081	* a matching archetype at the given map and coordinates.	1810	* a matching archetype at the given map and coordinates.
2082	* The first matching object is returned, or NULL if none.	1811	* The first matching object is returned, or NULL if none.
2083	*/	1812	*/
2084
2085	object *	1813	object *
2086	present_arch (const archetype *at, mapstruct *m, int x, int y)	1814	present_arch (const archetype *at, maptile *m, int x, int y)
2087	{	1815	{
2088	object *
2089	tmp;
2090
2091	if (m == NULL || out_of_map (m, x, y))	1816	if (!m || out_of_map (m, x, y))
2092	{	1817	{
2093	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
2094	return NULL;	1819	return NULL;
2095	}	1820	}
2096	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1821
		1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2097	if (tmp->arch == at)	1823	if (tmp->arch == at)
2098	return tmp;	1824	return tmp;
		1825
2099	return NULL;	1826	return NULL;
2100	}	1827	}
2101		1828
2102	/*	1829	/*
2103	* present(type, map, x, y) searches for any objects with	1830	* present(type, map, x, y) searches for any objects with
2104	* a matching type variable at the given map and coordinates.	1831	* a matching type variable at the given map and coordinates.
2105	* The first matching object is returned, or NULL if none.	1832	* The first matching object is returned, or NULL if none.
2106	*/	1833	*/
2107
2108	object *	1834	object *
2109	present (unsigned char type, mapstruct *m, int x, int y)	1835	present (unsigned char type, maptile *m, int x, int y)
2110	{	1836	{
2111	object *
2112	tmp;
2113
2114	if (out_of_map (m, x, y))	1837	if (out_of_map (m, x, y))
2115	{	1838	{
2116	LOG (llevError, "Present called outside map.\n");	1839	LOG (llevError, "Present called outside map.\n");
2117	return NULL;	1840	return NULL;
2118	}	1841	}
2119	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1842
		1843	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2120	if (tmp->type == type)	1844	if (tmp->type == type)
2121	return tmp;	1845	return tmp;
		1846
2122	return NULL;	1847	return NULL;
2123	}	1848	}
2124		1849
2125	/*	1850	/*
2126	* present_in_ob(type, object) searches for any objects with	1851	* present_in_ob(type, object) searches for any objects with
2127	* a matching type variable in the inventory of the given object.	1852	* a matching type variable in the inventory of the given object.
2128	* The first matching object is returned, or NULL if none.	1853	* The first matching object is returned, or NULL if none.
2129	*/	1854	*/
2130
2131	object *	1855	object *
2132	present_in_ob (unsigned char type, const object *op)	1856	present_in_ob (unsigned char type, const object *op)
2133	{	1857	{
2134	object *
2135	tmp;
2136
2137	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1858	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2138	if (tmp->type == type)	1859	if (tmp->type == type)
2139	return tmp;	1860	return tmp;
		1861
2140	return NULL;	1862	return NULL;
2141	}	1863	}
2142		1864
2143	/*	1865	/*
2144	* present_in_ob (type, str, object) searches for any objects with	1866	* present_in_ob (type, str, object) searches for any objects with
…		…
2152	* str is the string to match against. Note that we match against	1874	* str is the string to match against. Note that we match against
2153	* the object name, not the archetype name. this is so that the	1875	* the object name, not the archetype name. this is so that the
2154	* spell code can use one object type (force), but change it's name	1876	* spell code can use one object type (force), but change it's name
2155	* to be unique.	1877	* to be unique.
2156	*/	1878	*/
2157
2158	object *	1879	object *
2159	present_in_ob_by_name (int type, const char *str, const object *op)	1880	present_in_ob_by_name (int type, const char *str, const object *op)
2160	{	1881	{
2161	object *
2162	tmp;
2163
2164	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1882	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2165	{
2166	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1883	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2167	return tmp;	1884	return tmp;
2168	}	1885
2169	return NULL;	1886	return 0;
2170	}	1887	}
2171		1888
2172	/*	1889	/*
2173	* present_arch_in_ob(archetype, object) searches for any objects with	1890	* present_arch_in_ob(archetype, object) searches for any objects with
2174	* a matching archetype in the inventory of the given object.	1891	* a matching archetype in the inventory of the given object.
2175	* The first matching object is returned, or NULL if none.	1892	* The first matching object is returned, or NULL if none.
2176	*/	1893	*/
2177
2178	object *	1894	object *
2179	present_arch_in_ob (const archetype *at, const object *op)	1895	present_arch_in_ob (const archetype *at, const object *op)
2180	{	1896	{
2181	object *
2182	tmp;
2183
2184	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2185	if (tmp->arch == at)	1898	if (tmp->arch == at)
2186	return tmp;	1899	return tmp;
		1900
2187	return NULL;	1901	return NULL;
2188	}	1902	}
2189		1903
2190	/*	1904	/*
2191	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
2192	*/	1906	*/
2193	void	1907	void
2194	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
2195	{	1909	{
2196	object *
2197	tmp;
2198
2199	if (op->inv)	1910	if (op->inv)
2200	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2201	{	1912	{
2202	SET_FLAG (tmp, flag);	1913	SET_FLAG (tmp, flag);
2203	flag_inv (tmp, flag);	1914	flag_inv (tmp, flag);
2204	}	1915	}
2205	} /*	1916	}
		1917
		1918	/*
2206	* desactivate recursively a flag on an object inventory	1919	* deactivate recursively a flag on an object inventory
2207	*/	1920	*/
2208	void	1921	void
2209	unflag_inv (object *op, int flag)	1922	unflag_inv (object *op, int flag)
2210	{	1923	{
2211	object *
2212	tmp;
2213
2214	if (op->inv)	1924	if (op->inv)
2215	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1925	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2216	{	1926	{
2217	CLEAR_FLAG (tmp, flag);	1927	CLEAR_FLAG (tmp, flag);
2218	unflag_inv (tmp, flag);	1928	unflag_inv (tmp, flag);
2219	}	1929	}
2220	}	1930	}
…		…
2223	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1933	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2224	* all it's inventory (recursively).	1934	* all it's inventory (recursively).
2225	* If checksums are used, a player will get set_cheat called for	1935	* If checksums are used, a player will get set_cheat called for
2226	* him/her-self and all object carried by a call to this function.	1936	* him/her-self and all object carried by a call to this function.
2227	*/	1937	*/
2228
2229	void	1938	void
2230	set_cheat (object *op)	1939	set_cheat (object *op)
2231	{	1940	{
2232	SET_FLAG (op, FLAG_WAS_WIZ);	1941	SET_FLAG (op, FLAG_WAS_WIZ);
2233	flag_inv (op, FLAG_WAS_WIZ);	1942	flag_inv (op, FLAG_WAS_WIZ);
…		…
2252	* because arch_blocked (now ob_blocked) needs to know the movement type	1961	* because arch_blocked (now ob_blocked) needs to know the movement type
2253	* to know if the space in question will block the object. We can't use	1962	* to know if the space in question will block the object. We can't use
2254	* the archetype because that isn't correct if the monster has been	1963	* the archetype because that isn't correct if the monster has been
2255	* customized, changed states, etc.	1964	* customized, changed states, etc.
2256	*/	1965	*/
2257
2258	int	1966	int
2259	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	1967	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2260	{	1968	{
2261	int
2262	i,
2263	index = 0, flag;	1969	int index = 0, flag;
2264	static int
2265	altern[SIZEOFFREE];	1970	int altern[SIZEOFFREE];
2266		1971
2267	for (i = start; i < stop; i++)	1972	for (int i = start; i < stop; i++)
2268	{	1973	{
2269	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1974	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2270	if (!flag)	1975	if (!flag)
2271	altern[index++] = i;	1976	altern [index++] = i;
2272		1977
2273	/* Basically, if we find a wall on a space, we cut down the search size.	1978	/* Basically, if we find a wall on a space, we cut down the search size.
2274	* In this way, we won't return spaces that are on another side of a wall.	1979	* In this way, we won't return spaces that are on another side of a wall.
2275	* This mostly work, but it cuts down the search size in all directions -	1980	* This mostly work, but it cuts down the search size in all directions -
2276	* if the space being examined only has a wall to the north and empty	1981	* if the space being examined only has a wall to the north and empty
2277	* spaces in all the other directions, this will reduce the search space	1982	* spaces in all the other directions, this will reduce the search space
2278	* to only the spaces immediately surrounding the target area, and	1983	* to only the spaces immediately surrounding the target area, and
2279	* won't look 2 spaces south of the target space.	1984	* won't look 2 spaces south of the target space.
2280	*/	1985	*/
2281	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1986	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2282	stop = maxfree[i];	1987	stop = maxfree[i];
2283	}	1988	}
		1989
2284	if (!index)	1990	if (!index)
2285	return -1;	1991	return -1;
		1992
2286	return altern[RANDOM () % index];	1993	return altern[RANDOM () % index];
2287	}	1994	}
2288		1995
2289	/*	1996	/*
2290	* find_first_free_spot(archetype, mapstruct, x, y) works like	1997	* find_first_free_spot(archetype, maptile, x, y) works like
2291	* find_free_spot(), but it will search max number of squares.	1998	* find_free_spot(), but it will search max number of squares.
2292	* But it will return the first available spot, not a random choice.	1999	* But it will return the first available spot, not a random choice.
2293	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2000	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2294	*/	2001	*/
2295
2296	int	2002	int
2297	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2003	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2298	{	2004	{
2299	int
2300	i;
2301
2302	for (i = 0; i < SIZEOFFREE; i++)	2005	for (int i = 0; i < SIZEOFFREE; i++)
2303	{
2304	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2006	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2305	return i;	2007	return i;
2306	}	2008
2307	return -1;	2009	return -1;
2308	}	2010	}
2309		2011
2310	/*	2012	/*
2311	* The function permute(arr, begin, end) randomly reorders the array	2013	* The function permute(arr, begin, end) randomly reorders the array
2312	* arr[begin..end-1].	2014	* arr[begin..end-1].
		2015	* now uses a fisher-yates shuffle, old permute was broken
2313	*/	2016	*/
2314	static void	2017	static void
2315	permute (int *arr, int begin, int end)	2018	permute (int *arr, int begin, int end)
2316	{	2019	{
2317	int	2020	arr += begin;
2318	i,
2319	j,
2320	tmp,
2321	len;
2322
2323	len = end - begin;	2021	end -= begin;
2324	for (i = begin; i < end; i++)
2325	{
2326	j = begin + RANDOM () % len;
2327		2022
2328	tmp = arr[i];	2023	while (--end)
2329	arr[i] = arr[j];	2024	swap (arr [end], arr [RANDOM () % (end + 1)]);
2330	arr[j] = tmp;
2331	}
2332	}	2025	}
2333		2026
2334	/* new function to make monster searching more efficient, and effective!	2027	/* new function to make monster searching more efficient, and effective!
2335	* This basically returns a randomized array (in the passed pointer) of	2028	* This basically returns a randomized array (in the passed pointer) of
2336	* the spaces to find monsters. In this way, it won't always look for	2029	* the spaces to find monsters. In this way, it won't always look for
…		…
2339	* the 3x3 area will be searched, just not in a predictable order.	2032	* the 3x3 area will be searched, just not in a predictable order.
2340	*/	2033	*/
2341	void	2034	void
2342	get_search_arr (int *search_arr)	2035	get_search_arr (int *search_arr)
2343	{	2036	{
2344	int	2037	int i;
2345	i;
2346		2038
2347	for (i = 0; i < SIZEOFFREE; i++)	2039	for (i = 0; i < SIZEOFFREE; i++)
2348	{
2349	search_arr[i] = i;	2040	search_arr[i] = i;
2350	}
2351		2041
2352	permute (search_arr, 1, SIZEOFFREE1 + 1);	2042	permute (search_arr, 1, SIZEOFFREE1 + 1);
2353	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2043	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2354	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2044	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2355	}	2045	}
…		…
2364	* Perhaps incorrectly, but I'm making the assumption that exclude	2054	* Perhaps incorrectly, but I'm making the assumption that exclude
2365	* is actually want is going to try and move there. We need this info	2055	* is actually want is going to try and move there. We need this info
2366	* because we have to know what movement the thing looking to move	2056	* because we have to know what movement the thing looking to move
2367	* there is capable of.	2057	* there is capable of.
2368	*/	2058	*/
2369
2370	int	2059	int
2371	find_dir (mapstruct *m, int x, int y, object *exclude)	2060	find_dir (maptile *m, int x, int y, object *exclude)
2372	{	2061	{
2373	int
2374	i,
2375	max = SIZEOFFREE, mflags;	2062	int i, max = SIZEOFFREE, mflags;
2376	sint16	2063
2377	nx,	2064	sint16 nx, ny;
2378	ny;
2379	object *	2065	object *tmp;
2380	tmp;	2066	maptile *mp;
2381	mapstruct *	2067
2382	mp;	2068	MoveType blocked, move_type;
2383	MoveType
2384	blocked,
2385	move_type;
2386		2069
2387	if (exclude && exclude->head)	2070	if (exclude && exclude->head)
2388	{	2071	{
2389	exclude = exclude->head;	2072	exclude = exclude->head;
2390	move_type = exclude->move_type;	2073	move_type = exclude->move_type;
…		…
2400	mp = m;	2083	mp = m;
2401	nx = x + freearr_x[i];	2084	nx = x + freearr_x[i];
2402	ny = y + freearr_y[i];	2085	ny = y + freearr_y[i];
2403		2086
2404	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2088
2405	if (mflags & P_OUT_OF_MAP)	2089	if (mflags & P_OUT_OF_MAP)
2406	{
2407	max = maxfree[i];	2090	max = maxfree[i];
2408	}
2409	else	2091	else
2410	{	2092	{
2411	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2093	mapspace &ms = mp->at (nx, ny);
		2094
		2095	blocked = ms.move_block;
2412		2096
2413	if ((move_type & blocked) == move_type)	2097	if ((move_type & blocked) == move_type)
2414	{
2415	max = maxfree[i];	2098	max = maxfree[i];
2416	}
2417	else if (mflags & P_IS_ALIVE)	2099	else if (mflags & P_IS_ALIVE)
2418	{	2100	{
2419	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2101	for (tmp = ms.bot; tmp; tmp = tmp->above)
2420	{	2102	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2421	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2103	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2422	{
2423	break;	2104	break;
2424	}	2105
2425	}
2426	if (tmp)	2106	if (tmp)
2427	{
2428	return freedir[i];	2107	return freedir[i];
2429	}
2430	}	2108	}
2431	}	2109	}
2432	}	2110	}
		2111
2433	return 0;	2112	return 0;
2434	}	2113	}
2435		2114
2436	/*	2115	/*
2437	* distance(object 1, object 2) will return the square of the	2116	* distance(object 1, object 2) will return the square of the
2438	* distance between the two given objects.	2117	* distance between the two given objects.
2439	*/	2118	*/
2440
2441	int	2119	int
2442	distance (const object *ob1, const object *ob2)	2120	distance (const object *ob1, const object *ob2)
2443	{	2121	{
2444	int
2445	i;
2446
2447	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2122	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2448	return i;
2449	}	2123	}
2450		2124
2451	/*	2125	/*
2452	* find_dir_2(delta-x,delta-y) will return a direction in which	2126	* find_dir_2(delta-x,delta-y) will return a direction in which
2453	* an object which has subtracted the x and y coordinates of another	2127	* an object which has subtracted the x and y coordinates of another
2454	* object, needs to travel toward it.	2128	* object, needs to travel toward it.
2455	*/	2129	*/
2456
2457	int	2130	int
2458	find_dir_2 (int x, int y)	2131	find_dir_2 (int x, int y)
2459	{	2132	{
2460	int	2133	int q;
2461	q;
2462		2134
2463	if (y)	2135	if (y)
2464	q = x * 100 / y;	2136	q = x * 100 / y;
2465	else if (x)	2137	else if (x)
2466	q = -300 * x;	2138	q = -300 * x;
…		…
2501	int	2173	int
2502	absdir (int d)	2174	absdir (int d)
2503	{	2175	{
2504	while (d < 1)	2176	while (d < 1)
2505	d += 8;	2177	d += 8;
		2178
2506	while (d > 8)	2179	while (d > 8)
2507	d -= 8;	2180	d -= 8;
		2181
2508	return d;	2182	return d;
2509	}	2183	}
2510		2184
2511	/*	2185	/*
2512	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2186	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2514	*/	2188	*/
2515		2189
2516	int	2190	int
2517	dirdiff (int dir1, int dir2)	2191	dirdiff (int dir1, int dir2)
2518	{	2192	{
2519	int	2193	int d;
2520	d;
2521		2194
2522	d = abs (dir1 - dir2);	2195	d = abs (dir1 - dir2);
2523	if (d > 4)	2196	if (d > 4)
2524	d = 8 - d;	2197	d = 8 - d;
		2198
2525	return d;	2199	return d;
2526	}	2200	}
2527		2201
2528	/* peterm:	2202	/* peterm:
2529	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2203	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2532	* This basically means that if direction is 15, then it could either go	2206	* This basically means that if direction is 15, then it could either go
2533	* direction 4, 14, or 16 to get back to where we are.	2207	* direction 4, 14, or 16 to get back to where we are.
2534	* Moved from spell_util.c to object.c with the other related direction	2208	* Moved from spell_util.c to object.c with the other related direction
2535	* functions.	2209	* functions.
2536	*/	2210	*/
2537
2538	int
2539	reduction_dir[SIZEOFFREE][3] = {	2211	int reduction_dir[SIZEOFFREE][3] = {
2540	{0, 0, 0}, /* 0 */	2212	{0, 0, 0}, /* 0 */
2541	{0, 0, 0}, /* 1 */	2213	{0, 0, 0}, /* 1 */
2542	{0, 0, 0}, /* 2 */	2214	{0, 0, 0}, /* 2 */
2543	{0, 0, 0}, /* 3 */	2215	{0, 0, 0}, /* 3 */
2544	{0, 0, 0}, /* 4 */	2216	{0, 0, 0}, /* 4 */
…		…
2592	* find a path to that monster that we found. If not,	2264	* find a path to that monster that we found. If not,
2593	* we don't bother going toward it. Returns 1 if we	2265	* we don't bother going toward it. Returns 1 if we
2594	* can see a direct way to get it	2266	* can see a direct way to get it
2595	* Modified to be map tile aware -.MSW	2267	* Modified to be map tile aware -.MSW
2596	*/	2268	*/
2597
2598
2599	int	2269	int
2600	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2270	can_see_monsterP (maptile *m, int x, int y, int dir)
2601	{	2271	{
2602	sint16	2272	sint16 dx, dy;
2603	dx,
2604	dy;
2605	int
2606	mflags;	2273	int mflags;
2607		2274
2608	if (dir < 0)	2275	if (dir < 0)
2609	return 0; /* exit condition: invalid direction */	2276	return 0; /* exit condition: invalid direction */
2610		2277
2611	dx = x + freearr_x[dir];	2278	dx = x + freearr_x[dir];
…		…
2624	return 0;	2291	return 0;
2625		2292
2626	/* yes, can see. */	2293	/* yes, can see. */
2627	if (dir < 9)	2294	if (dir < 9)
2628	return 1;	2295	return 1;
		2296
2629	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2297	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2630	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2298	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2299	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2631	}	2300	}
2632
2633
2634		2301
2635	/*	2302	/*
2636	* can_pick(picker, item): finds out if an object is possible to be	2303	* can_pick(picker, item): finds out if an object is possible to be
2637	* picked up by the picker. Returnes 1 if it can be	2304	* picked up by the picker. Returnes 1 if it can be
2638	* picked up, otherwise 0.	2305	* picked up, otherwise 0.
…		…
2649	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2316	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2650	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2317	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2651	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2318	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2652	}	2319	}
2653		2320
2654
2655	/*	2321	/*
2656	* create clone from object to another	2322	* create clone from object to another
2657	*/	2323	*/
2658	object *	2324	object *
2659	object_create_clone (object *asrc)	2325	object_create_clone (object *asrc)
2660	{	2326	{
2661	object *
2662	dst = NULL, *tmp, *src, *part, *prev, *item;	2327	object *dst = 0, *tmp, *src, *part, *prev, *item;
2663		2328
2664	if (!asrc)	2329	if (!asrc)
2665	return NULL;	2330	return 0;
		2331
2666	src = asrc;	2332	src = asrc;
2667	if (src->head)	2333	if (src->head)
2668	src = src->head;	2334	src = src->head;
2669		2335
2670	prev = NULL;	2336	prev = 0;
2671	for (part = src; part; part = part->more)	2337	for (part = src; part; part = part->more)
2672	{	2338	{
2673	tmp = get_object ();	2339	tmp = part->clone ();
2674	copy_object (part, tmp);
2675	tmp->x -= src->x;	2340	tmp->x -= src->x;
2676	tmp->y -= src->y;	2341	tmp->y -= src->y;
		2342
2677	if (!part->head)	2343	if (!part->head)
2678	{	2344	{
2679	dst = tmp;	2345	dst = tmp;
2680	tmp->head = NULL;	2346	tmp->head = 0;
2681	}	2347	}
2682	else	2348	else
2683	{
2684	tmp->head = dst;	2349	tmp->head = dst;
2685	}	2350
2686	tmp->more = NULL;	2351	tmp->more = 0;
		2352
2687	if (prev)	2353	if (prev)
2688	prev->more = tmp;	2354	prev->more = tmp;
		2355
2689	prev = tmp;	2356	prev = tmp;
2690	}	2357	}
2691		2358
2692	/*** copy inventory ***/
2693	for (item = src->inv; item; item = item->below)	2359	for (item = src->inv; item; item = item->below)
2694	{
2695	(void) insert_ob_in_ob (object_create_clone (item), dst);	2360	insert_ob_in_ob (object_create_clone (item), dst);
2696	}
2697		2361
2698	return dst;	2362	return dst;
2699	}	2363	}
2700		2364
2701	/* return true if the object was destroyed, 0 otherwise */
2702	int
2703	was_destroyed (const object *op, tag_t old_tag)
2704	{
2705	/* checking for FLAG_FREED isn't necessary, but makes this function more
2706	* robust */
2707	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2708	}
2709
2710	/* GROS - Creates an object using a string representing its content. */	2365	/* GROS - Creates an object using a string representing its content. */
2711
2712	/* Basically, we save the content of the string to a temp file, then call */	2366	/* Basically, we save the content of the string to a temp file, then call */
2713
2714	/* load_object on it. I admit it is a highly inefficient way to make things, */	2367	/* load_object on it. I admit it is a highly inefficient way to make things, */
2715
2716	/* but it was simple to make and allows reusing the load_object function. */	2368	/* but it was simple to make and allows reusing the load_object function. */
2717
2718	/* Remember not to use load_object_str in a time-critical situation. */	2369	/* Remember not to use load_object_str in a time-critical situation. */
2719
2720	/* Also remember that multiparts objects are not supported for now. */	2370	/* Also remember that multiparts objects are not supported for now. */
2721
2722	object *	2371	object *
2723	load_object_str (const char *obstr)	2372	load_object_str (const char *obstr)
2724	{	2373	{
2725	object *	2374	object *op;
2726	op;
2727	char
2728	filename[MAX_BUF];	2375	char filename[MAX_BUF];
2729		2376
2730	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2377	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2731		2378
2732	FILE *
2733	tempfile = fopen (filename, "w");	2379	FILE *tempfile = fopen (filename, "w");
2734		2380
2735	if (tempfile == NULL)	2381	if (tempfile == NULL)
2736	{	2382	{
2737	LOG (llevError, "Error - Unable to access load object temp file\n");	2383	LOG (llevError, "Error - Unable to access load object temp file\n");
2738	return NULL;	2384	return NULL;
2739	};	2385	}
		2386
2740	fprintf (tempfile, obstr);	2387	fprintf (tempfile, obstr);
2741	fclose (tempfile);	2388	fclose (tempfile);
2742		2389
2743	op = get_object ();	2390	op = object::create ();
2744		2391
2745	object_thawer	2392	object_thawer thawer (filename);
2746	thawer (filename);
2747		2393
2748	if (thawer)	2394	if (thawer)
2749	load_object (thawer, op, 0);	2395	load_object (thawer, op, 0);
2750		2396
2751	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2397	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2759	* returns NULL if no match.	2405	* returns NULL if no match.
2760	*/	2406	*/
2761	object *	2407	object *
2762	find_obj_by_type_subtype (const object *who, int type, int subtype)	2408	find_obj_by_type_subtype (const object *who, int type, int subtype)
2763	{	2409	{
2764	object *
2765	tmp;
2766
2767	for (tmp = who->inv; tmp; tmp = tmp->below)	2410	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2768	if (tmp->type == type && tmp->subtype == subtype)	2411	if (tmp->type == type && tmp->subtype == subtype)
2769	return tmp;	2412	return tmp;
2770		2413
2771	return NULL;	2414	return 0;
2772	}	2415	}
2773		2416
2774	/* If ob has a field named key, return the link from the list,	2417	/* If ob has a field named key, return the link from the list,
2775	* otherwise return NULL.	2418	* otherwise return NULL.
2776	*	2419	*
…		…
2778	* do the desired thing.	2421	* do the desired thing.
2779	*/	2422	*/
2780	key_value *	2423	key_value *
2781	get_ob_key_link (const object *ob, const char *key)	2424	get_ob_key_link (const object *ob, const char *key)
2782	{	2425	{
2783	key_value *
2784	link;
2785
2786	for (link = ob->key_values; link != NULL; link = link->next)	2426	for (key_value *link = ob->key_values; link; link = link->next)
2787	{
2788	if (link->key == key)	2427	if (link->key == key)
2789	{
2790	return link;	2428	return link;
2791	}
2792	}
2793		2429
2794	return NULL;	2430	return 0;
2795	}	2431	}
2796		2432
2797	/*	2433	/*
2798	* Returns the value of op has an extra_field for key, or NULL.	2434	* Returns the value of op has an extra_field for key, or NULL.
2799	*	2435	*
…		…
2802	* The returned string is shared.	2438	* The returned string is shared.
2803	*/	2439	*/
2804	const char *	2440	const char *
2805	get_ob_key_value (const object *op, const char *const key)	2441	get_ob_key_value (const object *op, const char *const key)
2806	{	2442	{
2807	key_value *	2443	key_value *link;
2808	link;	2444	shstr_cmp canonical_key (key);
2809	const char *
2810	canonical_key;
2811		2445
2812	canonical_key = shstr::find (key);
2813
2814	if (canonical_key == NULL)	2446	if (!canonical_key)
2815	{	2447	{
2816	/* 1. There being a field named key on any object	2448	/* 1. There being a field named key on any object
2817	* implies there'd be a shared string to find.	2449	* implies there'd be a shared string to find.
2818	* 2. Since there isn't, no object has this field.	2450	* 2. Since there isn't, no object has this field.
2819	* 3. Therefore, *this* object doesn't have this field.	2451	* 3. Therefore, *this* object doesn't have this field.
2820	*/	2452	*/
2821	return NULL;	2453	return 0;
2822	}	2454	}
2823		2455
2824	/* This is copied from get_ob_key_link() above -	2456	/* This is copied from get_ob_key_link() above -
2825	* only 4 lines, and saves the function call overhead.	2457	* only 4 lines, and saves the function call overhead.
2826	*/	2458	*/
2827	for (link = op->key_values; link != NULL; link = link->next)	2459	for (link = op->key_values; link; link = link->next)
2828	{
2829	if (link->key == canonical_key)	2460	if (link->key == canonical_key)
2830	{
2831	return link->value;	2461	return link->value;
2832	}	2462
2833	}
2834	return NULL;	2463	return 0;
2835	}	2464	}
2836		2465
2837		2466
2838	/*	2467	/*
2839	* Updates the canonical_key in op to value.	2468	* Updates the canonical_key in op to value.
…		…
2846	* Returns TRUE on success.	2475	* Returns TRUE on success.
2847	*/	2476	*/
2848	int	2477	int
2849	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2478	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2850	{	2479	{
2851	key_value *
2852	field = NULL, *last = NULL;	2480	key_value *field = NULL, *last = NULL;
2853		2481
2854	for (field = op->key_values; field != NULL; field = field->next)	2482	for (field = op->key_values; field != NULL; field = field->next)
2855	{	2483	{
2856	if (field->key != canonical_key)	2484	if (field->key != canonical_key)
2857	{	2485	{
…		…
2875	if (last)	2503	if (last)
2876	last->next = field->next;	2504	last->next = field->next;
2877	else	2505	else
2878	op->key_values = field->next;	2506	op->key_values = field->next;
2879		2507
2880	delete
2881	field;	2508	delete field;
2882	}	2509	}
2883	}	2510	}
2884	return TRUE;	2511	return TRUE;
2885	}	2512	}
2886	/* IF we get here, key doesn't exist */	2513	/* IF we get here, key doesn't exist */
2887		2514
2888	/* No field, we'll have to add it. */	2515	/* No field, we'll have to add it. */
2889		2516
2890	if (!add_key)	2517	if (!add_key)
2891	{
2892	return FALSE;	2518	return FALSE;
2893	}	2519
2894	/* There isn't any good reason to store a null	2520	/* There isn't any good reason to store a null
2895	* value in the key/value list. If the archetype has	2521	* value in the key/value list. If the archetype has
2896	* this key, then we should also have it, so shouldn't	2522	* this key, then we should also have it, so shouldn't
2897	* be here. If user wants to store empty strings,	2523	* be here. If user wants to store empty strings,
2898	* should pass in ""	2524	* should pass in ""
…		…
2921	* Returns TRUE on success.	2547	* Returns TRUE on success.
2922	*/	2548	*/
2923	int	2549	int
2924	set_ob_key_value (object *op, const char *key, const char *value, int add_key)	2550	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2925	{	2551	{
2926	shstr
2927	key_ (key);	2552	shstr key_ (key);
2928		2553
2929	return set_ob_key_value_s (op, key_, value, add_key);	2554	return set_ob_key_value_s (op, key_, value, add_key);
2930	}	2555	}
		2556
		2557	object::depth_iterator::depth_iterator (object *container)
		2558	: iterator_base (container)
		2559	{
		2560	while (item->inv)
		2561	item = item->inv;
		2562	}
		2563
		2564	void
		2565	object::depth_iterator::next ()
		2566	{
		2567	if (item->below)
		2568	{
		2569	item = item->below;
		2570
		2571	while (item->inv)
		2572	item = item->inv;
		2573	}
		2574	else
		2575	item = item->env;
		2576	}
		2577
		2578
		2579	const char *
		2580	object::flag_desc (char *desc, int len) const
		2581	{
		2582	char *p = desc;
		2583	bool first = true;
		2584
		2585	*p = 0;
		2586
		2587	for (int i = 0; i < NUM_FLAGS; i++)
		2588	{
		2589	if (len <= 10) // magic constant!
		2590	{
		2591	snprintf (p, len, ",...");
		2592	break;
		2593	}
		2594
		2595	if (flag [i])
		2596	{
		2597	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2598	len -= cnt;
		2599	p += cnt;
		2600	first = false;
		2601	}
		2602	}
		2603
		2604	return desc;
		2605	}
		2606
		2607	// return a suitable string describing an object in enough detail to find it
		2608	const char *
		2609	object::debug_desc (char *info) const
		2610	{
		2611	char flagdesc[512];
		2612	char info2[256 * 4];
		2613	char *p = info;
		2614
		2615	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
		2616	count, uuid.seq,
		2617	&name,
		2618	title ? "\",title:" : "",
		2619	title ? (const char *)title : "",
		2620	flag_desc (flagdesc, 512), type);
		2621
		2622	if (env)
		2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2624
		2625	if (map)
		2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
		2627
		2628	return info;
		2629	}
		2630
		2631	const char *
		2632	object::debug_desc () const
		2633	{
		2634	static char info[256 * 4];
		2635	return debug_desc (info);
		2636	}
		2637
		2638	const char *
		2639	object::debug_desc2 () const
		2640	{
		2641	static char info[256 * 4];
		2642	return debug_desc (info);
		2643	}
		2644

Diff Legend

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