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.32 by root, Mon Sep 11 23:53:30 2006 UTC vs.
Revision 1.106 by root, Wed Jan 3 20:08:04 2007 UTC

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

Diff Legend

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