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.62 by root, Mon Dec 11 23:35:37 2006 UTC vs.
Revision 1.145 by root, Mon May 7 03:05:58 2007 UTC

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

Diff Legend

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