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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.110 by root, Sun Jan 7 23:12:03 2007 UTC

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

Diff Legend

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