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.67 by root, Thu Dec 14 04:30:32 2006 UTC vs.
Revision 1.148 by root, Mon May 14 19:08:25 2007 UTC

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

Diff Legend

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