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.27 by root, Mon Sep 11 12:08:45 2006 UTC vs.
Revision 1.101 by root, Mon Jan 1 17:30:33 2007 UTC

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

Diff Legend

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