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.61 by root, Mon Dec 11 21:32:16 2006 UTC vs.
Revision 1.149 by root, Mon May 14 19:56:45 2007 UTC

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

Diff Legend

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