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.65 by root, Wed Dec 13 00:42:03 2006 UTC vs.
Revision 1.162 by root, Sat Jun 16 00:12:20 2007 UTC

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

Diff Legend

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