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