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.24 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.340 by root, Fri Jul 2 19:54:41 2010 UTC

1
2	/*	1	/*
3	* static char *rcsid_object_c =	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
4	* "$Id: object.C,v 1.24 2006/09/10 16:00:23 root Exp $";	3	*
5	*/	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7	/*
8	CrossFire, A Multiplayer game for X-windows
9
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
12		7	*
13	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
14	it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
15	the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
16	(at your option) any later version.	11	* option) any later version.
17		12	*
18	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,
19	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
20	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21	GNU General Public License for more details.	16	* GNU General Public License for more details.
22		17	*
23	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
24	along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
26		21	*
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	22	* The authors can be reached via e-mail to <support@deliantra.net>
28	*/	23	*/
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying
32	variable. */
33	#include <global.h>	25	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	26	#include <stdio.h>
36	# include <sys/types.h>	27	#include <sys/types.h>
37	# include <sys/uio.h>	28	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	29	#include <object.h>
40	#include <funcpoint.h>	30	#include <sproto.h>
41	#include <skills.h>
42	#include <loader.h>
43	int nrofallocobjects = 0;
44		31
45	object *objects; /* Pointer to the list of used objects */	32	#include <bitset>
46	object *active_objects; /* List of active objects that need to be processed */
47		33
48	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,	34	UUID UUID::cur;
		35	static uint64_t seq_next_save;
		36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
		38
		39	objectvec objects;
		40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
		49
		50	short freearr_x[SIZEOFFREE] = {
		51	0,
		52	0, 1, 1, 1, 0, -1, -1, -1,
		53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	54	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50	};	55	};
51	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,	56	short freearr_y[SIZEOFFREE] = {
		57	0,
		58	-1, -1, 0, 1, 1, 1, 0, -1,
		59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	60	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	};
54	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
55	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
56	};	61	};
57	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
58	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	63	0,
		64	1, 2, 3, 4, 5, 6, 7, 8,
		65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
59	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
60	};	67	};
61		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
		76	const char *wall_suffix[16] = {
		77	"0",
		78	"1_3",
		79	"1_4",
		80	"2_1_2",
		81	"1_2",
		82	"2_2_4",
		83	"2_2_1",
		84	"3_1",
		85	"1_1",
		86	"2_2_3",
		87	"2_2_2",
		88	"3_3",
		89	"2_1_1",
		90	"3_4",
		91	"3_2",
		92	"4"
		93	};
		94
		95	static void
		96	write_uuid (uval64 skip, bool sync)
		97	{
		98	CALL_BEGIN (2);
		99	CALL_ARG_SV (newSVval64 (skip));
		100	CALL_ARG_SV (boolSV (sync));
		101	CALL_CALL ("cf::write_uuid", G_DISCARD);
		102	CALL_END;
		103	}
		104
		105	static void
		106	read_uuid ()
		107	{
		108	char filename[MAX_BUF];
		109
		110	sprintf (filename, "%s/uuid", settings.localdir);
		111
		112	seq_next_save = 0;
		113
		114	FILE *fp;
		115
		116	if (!(fp = fopen (filename, "r")))
		117	{
		118	if (errno == ENOENT)
		119	{
		120	LOG (llevInfo, "RESET uid to 1\n");
		121	UUID::cur.seq = 0;
		122	write_uuid (UUID_GAP, true);
		123	return;
		124	}
		125
		126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		127	_exit (1);
		128	}
		129
		130	char buf [UUID::MAX_LEN];
		131	buf[0] = 0;
		132	fgets (buf, sizeof (buf), fp);
		133
		134	if (!UUID::cur.parse (buf))
		135	{
		136	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
		137	_exit (1);
		138	}
		139
		140	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
		141
		142	write_uuid (UUID_GAP, true);
		143	fclose (fp);
		144	}
		145
		146	UUID
		147	UUID::gen ()
		148	{
		149	UUID uid;
		150
		151	uid.seq = ++cur.seq;
		152
		153	if (expect_false (cur.seq >= seq_next_save))
		154	{
		155	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		156	write_uuid (UUID_GAP, false);
		157	}
		158
		159
		160	return uid;
		161	}
		162
		163	void
		164	UUID::init ()
		165	{
		166	read_uuid ();
		167	}
		168
		169	bool
		170	UUID::parse (const char *s)
		171	{
		172	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		173	return false;
		174
		175	seq = 0;
		176
		177	while (*s != '>')
		178	{
		179	if (*s < '0')
		180	return false;
		181
		182	// this gives nice branchless code with gcc
		183	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		184	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		185
		186	seq = (seq << 4) | digit;
		187
		188	++s;
		189	}
		190
		191	return true;
		192	}
		193
		194	char *
		195	UUID::append (char *buf) const
		196	{
		197	*buf++ = '<';
		198	*buf++ = '1';
		199	*buf++ = '.';
		200
		201	uint64_t seq = this->seq;
		202	const int bits = 64;
		203	char nz = 0;
		204	static const char tohex [] = "0123456789abcdef";
		205
		206	// assert (len >= 3 + bits / 4 + 1 + 1);
		207	for (int i = bits / 4; --i; )
		208	{
		209	uint8_t digit = seq >> (bits - 4);
		210
		211	*buf = tohex [digit];
		212	nz |= digit;
		213	buf += nz ? 1 : 0;
		214	seq <<= 4;
		215	}
		216
		217	// last digit is special - always emit
		218	uint8_t digit = seq >> (bits - 4);
		219	*buf++ = tohex [digit];
		220
		221	*buf++ = '>';
		222
		223	return buf;
		224	}
		225
		226	char *
		227	UUID::c_str () const
		228	{
		229	static char buf [MAX_LEN];
		230	*append (buf) = 0;
		231	return buf;
		232	}
		233
62	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	234	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
63	static int	235	static bool
64	compare_ob_value_lists_one (const object *wants, const object *has)	236	compare_ob_value_lists_one (const object *wants, const object *has)
65	{	237	{
66	key_value *wants_field;
67
68	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	238	/* n-squared behaviour (see kv_get), but I'm hoping both
69	* objects with lists are rare, and lists stay short. If not, use a	239	* objects with lists are rare, and lists stay short. If not, use a
70	* different structure or at least keep the lists sorted...	240	* different structure or at least keep the lists sorted...
71	*/	241	*/
72		242
73	/* For each field in wants, */	243	/* For each field in wants, */
74	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	244	for (key_value *kv = wants->key_values; kv; kv = kv->next)
75	{	245	if (has->kv_get (kv->key) != kv->value)
76	key_value *has_field;	246	return false;
77
78	/* Look for a field in has with the same key. */
79	has_field = get_ob_key_link (has, wants_field->key);
80
81	if (has_field == NULL)
82	{
83	/* No field with that name. */
84	return FALSE;
85	}
86
87	/* Found the matching field. */
88	if (has_field->value != wants_field->value)
89	{
90	/* Values don't match, so this half of the comparison is false. */
91	return FALSE;
92	}
93
94	/* If we get here, we found a match. Now for the next field in wants. */
95	}
96		247
97	/* If we get here, every field in wants has a matching field in has. */	248	/* If we get here, every field in wants has a matching field in has. */
98	return TRUE;	249	return true;
99	}	250	}
100		251
101	/* Returns TRUE if ob1 has the same key_values as ob2. */	252	/* Returns TRUE if ob1 has the same key_values as ob2. */
102	static int	253	static bool
103	compare_ob_value_lists (const object *ob1, const object *ob2)	254	compare_ob_value_lists (const object *ob1, const object *ob2)
104	{	255	{
105	/* However, there may be fields in has which aren't partnered in wants,	256	/* However, there may be fields in has which aren't partnered in wants,
106	* so we need to run the comparison *twice*. :(	257	* so we need to run the comparison *twice*. :(
107	*/	258	*/
108	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	259	return compare_ob_value_lists_one (ob1, ob2)
		260	&& compare_ob_value_lists_one (ob2, ob1);
109	}	261	}
110		262
111	/* Function examines the 2 objects given to it, and returns true if	263	/* Function examines the 2 objects given to it, and returns true if
112	* they can be merged together.	264	* they can be merged together.
113	*	265	*
114	* Note that this function appears a lot longer than the macro it	266	* Note that this function appears a lot longer than the macro it
115	* replaces - this is mostly for clarity - a decent compiler should hopefully	267	* replaces - this is mostly for clarity - a decent compiler should hopefully
116	* reduce this to the same efficiency.	268	* reduce this to the same efficiency.
117	*	269	*
118	* Check nrof variable *before* calling CAN_MERGE()	270	* Check nrof variable *before* calling can_merge()
119	*	271	*
120	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
121	* check weight	273	* check weight
122	*/	274	*/
123
124	bool object::can_merge (object *ob1, object *ob2)	275	bool object::can_merge_slow (object *ob1, object *ob2)
125	{	276	{
126	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
127	if ((ob1 == ob2) || (ob1->type != ob2->type))	278	if (ob1 == ob2
		279	|| ob1->type != ob2->type
		280	|| ob1->value != ob2->value
		281	|| ob1->name != ob2->name
		282	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
128	return 0;	283	return 0;
129		284
130	if (ob1->speed != ob2->speed)	285	/* Do not merge objects if nrof would overflow, assume nrof
		286	* is always 0 .. 2**31-1 */
		287	if (ob1->nrof > 0x7fffffff - ob2->nrof)
131	return 0;	288	return 0;
132		289
133	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
134	* value could not be stored in a sint32 (which unfortunately sometimes is
135	* used to store nrof).
136	*/
137	if (ob1->nrof + ob2->nrof >= 1UL << 31)
138	return 0;
139
140	/* If the objects have been identified, set the BEEN_APPLIED flag.	290	/* If the objects have been identified, set the BEEN_APPLIED flag.
141	* This is to the comparison of the flags below will be OK. We	291	* This is to the comparison of the flags below will be OK. We
142	* just can't ignore the been applied or identified flags, as they	292	* just can't ignore the been applied or identified flags, as they
143	* are not equal - just if it has been identified, the been_applied	293	* are not equal - just if it has been identified, the been_applied
144	* flags lose any meaning.	294	* flags lose any meaning.
145	*/	295	*/
146	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	296	if (ob1->flag [FLAG_IDENTIFIED])
147	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	297	ob1->set_flag (FLAG_BEEN_APPLIED);
148		298
149	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	299	if (ob2->flag [FLAG_IDENTIFIED])
150	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	300	ob2->set_flag (FLAG_BEEN_APPLIED);
151		301
152		302	if (ob1->arch->archname != ob2->arch->archname
153	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
154	* being locked in inventory should prevent merging.
155	* 0x4 in flags3 is CLIENT_SENT
156	*/
157	if ((ob1->arch != ob2->arch) ||
158	(ob1->flags[0] != ob2->flags[0]) ||
159	(ob1->flags[1] != ob2->flags[1]) ||
160	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
161	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
162	(ob1->name != ob2->name) ||	303	|| ob1->name != ob2->name
163	(ob1->title != ob2->title) ||	304	|| ob1->title != ob2->title
164	(ob1->msg != ob2->msg) ||	305	|| ob1->msg != ob2->msg
165	(ob1->weight != ob2->weight) ||	306	|| ob1->weight != ob2->weight
166	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
167	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
168	(ob1->attacktype != ob2->attacktype) ||	307	|| ob1->attacktype != ob2->attacktype
169	(ob1->magic != ob2->magic) ||	308	|| ob1->magic != ob2->magic
170	(ob1->slaying != ob2->slaying) ||	309	|| ob1->slaying != ob2->slaying
171	(ob1->skill != ob2->skill) ||	310	|| ob1->skill != ob2->skill
172	(ob1->value != ob2->value) ||	311	|| ob1->value != ob2->value
173	(ob1->animation_id != ob2->animation_id) ||	312	|| ob1->animation_id != ob2->animation_id
		313	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
174	(ob1->client_type != ob2->client_type) ||	314	|| ob1->client_type != ob2->client_type
175	(ob1->materialname != ob2->materialname) ||	315	|| ob1->material != ob2->material
176	(ob1->lore != ob2->lore) ||	316	|| ob1->lore != ob2->lore
177	(ob1->subtype != ob2->subtype) ||	317	|| ob1->subtype != ob2->subtype
178	(ob1->move_type != ob2->move_type) ||	318	|| ob1->move_type != ob2->move_type
179	(ob1->move_block != ob2->move_block) ||	319	|| ob1->move_block != ob2->move_block
180	(ob1->move_allow != ob2->move_allow) ||	320	|| ob1->move_allow != ob2->move_allow
181	(ob1->move_on != ob2->move_on) ||	321	|| ob1->move_on != ob2->move_on
182	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	322	|| ob1->move_off != ob2->move_off
		323	|| ob1->move_slow != ob2->move_slow
		324	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
		325	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		326	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
183	return 0;	327	return 0;
184		328
		329	if ((ob1->flag ^ ob2->flag)
		330	.reset (FLAG_INV_LOCKED)
		331	.reset (FLAG_REMOVED)
		332	.any ())
		333	return 0;
		334
185	/* This is really a spellbook check - really, we should	335	/* This is really a spellbook check - we should in general
186	* check all objects in the inventory.	336	* not merge objects with real inventories, as splitting them
		337	* is hard.
187	*/	338	*/
188	if (ob1->inv || ob2->inv)	339	if (ob1->inv || ob2->inv)
189	{	340	{
190	/* if one object has inventory but the other doesn't, not equiv */
191	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
192	return 0;
193
194	/* Now check to see if the two inventory objects could merge */
195	if (!CAN_MERGE (ob1->inv, ob2->inv))	341	if (!(ob1->inv && ob2->inv))
196	return 0;	342	return 0; /* inventories differ in length */
		343
		344	if (ob1->inv->below || ob2->inv->below)
		345	return 0; /* more than one object in inv */
		346
		347	if (!object::can_merge (ob1->inv, ob2->inv))
		348	return 0; /* inventory objects differ */
197		349
198	/* inventory ok - still need to check rest of this object to see	350	/* inventory ok - still need to check rest of this object to see
199	* if it is valid.	351	* if it is valid.
200	*/	352	*/
201	}	353	}
202		354
203	/* Don't merge objects that are applied. With the new 'body' code,	355	/* Don't merge objects that are applied. With the new 'body' code,
204	* it is possible for most any character to have more than one of	356	* it is possible for most any character to have more than one of
205	* some items equipped, and we don't want those to merge.	357	* some items equipped, and we don't want those to merge.
206	*/	358	*/
207	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	359	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
208	return 0;	360	return 0;
209		361
210	/* Note sure why the following is the case - either the object has to	362	/* Note sure why the following is the case - either the object has to
211	* be animated or have a very low speed. Is this an attempted monster	363	* be animated or have a very low speed. Is this an attempted monster
212	* check?	364	* check?
213	*/	365	*/
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	366	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
215	return 0;	367	return 0;
216		368
217	switch (ob1->type)	369	switch (ob1->type)
218	{	370	{
219	case SCROLL:	371	case SCROLL:
220	if (ob1->level != ob2->level)	372	if (ob1->level != ob2->level)
221	return 0;	373	return 0;
222	break;	374	break;
223	}	375	}
224		376
225	if (ob1->key_values != NULL || ob2->key_values != NULL)	377	if (ob1->key_values || ob2->key_values)
226	{	378	{
227	/* At least one of these has key_values. */	379	/* At least one of these has key_values. */
228	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	380	if ((!ob1->key_values) != (!ob2->key_values))
229	/* One has fields, but the other one doesn't. */	381	return 0; /* One has fields, but the other one doesn't. */
		382
		383	if (!compare_ob_value_lists (ob1, ob2))
230	return 0;	384	return 0;
231	else if (!compare_ob_value_lists (ob1, ob2))
232	return 0;
233	}	385	}
234		386
235	//TODO: generate an event or call into perl for additional checks
236	if (ob1->self || ob2->self)	387	if (ob1->self || ob2->self)
237	{	388	{
238	ob1->optimise ();	389	ob1->optimise ();
239	ob2->optimise ();	390	ob2->optimise ();
240		391
241	if (ob1->self || ob2->self)	392	if (ob1->self || ob2->self)
		393	{
		394	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		395	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		396
		397	if (k1 != k2)
242	return 0;	398	return 0;
		399
		400	if (k1 == 0)
		401	return 1;
		402
		403	if (!cfperl_can_merge (ob1, ob2))
		404	return 0;
		405	}
243	}	406	}
244		407
245	/* Everything passes, must be OK. */	408	/* Everything passes, must be OK. */
246	return 1;	409	return 1;
247	}	410	}
248		411
		412	// find player who can see this object
		413	object *
		414	object::visible_to () const
		415	{
		416	if (client_visible () && !flag [FLAG_REMOVED])
		417	{
		418	// see if we are in a container of sorts
		419	if (env)
		420	{
		421	// the player inventory itself is always visible
		422	if (env->is_player ())
		423	return env;
		424
		425	// else a player could have our env open
		426	object *envest = env->outer_env_or_self ();
		427
		428	// the player itself is always on a map, so we will find him here
		429	// even if our inv is in a player.
		430	if (envest->is_on_map ())
		431	if (object *pl = envest->ms ().player ())
		432	if (pl->container_ () == env)
		433	return pl;
		434	}
		435	else
		436	{
		437	// maybe there is a player standing on the same mapspace
		438	// this will catch the case where "this" is a player
		439	if (object *pl = ms ().player ())
		440	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		441	|| pl->container_ () == this)
		442	return pl;
		443	}
		444	}
		445
		446	return 0;
		447	}
		448
		449	// adjust weight per container type ("of holding")
		450	static uint32
		451	weight_adjust_for (object *op, uint32 weight)
		452	{
		453	return op->type == CONTAINER
		454	? weight - weight * op->stats.Str / 100
		455	: weight;
		456	}
		457
249	/*	458	/*
		459	* subtracts, then adds, the specified weight to an object,
		460	* and also updates how much the environment(s) is/are carrying.
		461	*/
		462	static void
		463	adjust_weight (object *op, sint32 sub, sint32 add)
		464	{
		465	while (op)
		466	{
		467	sint32 ocarrying = op->carrying;
		468
		469	op->carrying -= weight_adjust_for (op, sub);
		470	op->carrying += weight_adjust_for (op, add);
		471
		472	if (object *pl = op->visible_to ())
		473	if (pl != op) // player is handled lazily
		474	esrv_update_item (UPD_WEIGHT, pl, op);
		475
		476	sub = ocarrying;
		477	add = op->carrying;
		478
		479	op = op->env;
		480	}
		481	}
		482
		483	/*
250	* sum_weight() is a recursive function which calculates the weight	484	* this is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	485	* an object is carrying. It goes through op and figures out how much
252	* containers are carrying, and sums it up.	486	* containers are carrying, and sums it up.
253	*/	487	*/
254	signed long	488	void
255	sum_weight (object *op)	489	object::update_weight ()
256	{	490	{
257	signed long sum;	491	sint32 sum = 0;
258	object *inv;
259		492
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	493	for (object *op = inv; op; op = op->below)
261	{
262	if (inv->inv)
263	sum_weight (inv);
264	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
265	}	494	{
266	if (op->type == CONTAINER && op->stats.Str)	495	op->update_weight ();
267	sum = (sum * (100 - op->stats.Str)) / 100;	496
268	if (op->carrying != sum)	497	sum += weight_adjust_for (this, op->total_weight ());
		498	}
		499
		500	if (sum != carrying)
		501	{
		502	if (carrying != sum && carrying)//D
		503	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		504	(long long)sum, (long long)carrying, debug_desc ());
		505
269	op->carrying = sum;	506	carrying = sum;
270	return sum;
271	}
272		507
273	/**	508	if (object *pl = visible_to ())
274	* Return the outermost environment object for a given object.	509	if (pl != this) // player is handled lazily
275	*/	510	esrv_update_item (UPD_WEIGHT, pl, this);
276
277	object *
278	object_get_env_recursive (object *op)
279	{
280	while (op->env != NULL)
281	op = op->env;
282	return op;
283	}
284
285	/*
286	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
287	* a better check. We basically keeping traversing up until we can't
288	* or find a player.
289	*/
290
291	object *
292	is_player_inv (object *op)
293	{
294	for (; op != NULL && op->type != PLAYER; op = op->env)
295	if (op->env == op)
296	op->env = NULL;
297	return op;
298	}
299
300	/*
301	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
302	* Some error messages.
303	* The result of the dump is stored in the static global errmsg array.
304	*/
305
306	void
307	dump_object2 (object *op)
308	{
309	errmsg[0] = 0;
310	return;
311	//TODO//D#d#
312	#if 0
313	char *cp;
314
315	/* object *tmp;*/
316
317	if (op->arch != NULL)
318	{	511	}
319	strcat (errmsg, "arch ");
320	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
321	strcat (errmsg, "\n");
322	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
323	strcat (errmsg, cp);
324	# if 0
325	/* Don't dump player diffs - they are too long, mostly meaningless, and
326	* will overflow the buffer.
327	* Changed so that we don't dump inventory either. This may
328	* also overflow the buffer.
329	*/
330	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
331	strcat (errmsg, cp);
332	for (tmp = op->inv; tmp; tmp = tmp->below)
333	dump_object2 (tmp);
334	# endif
335	strcat (errmsg, "end\n");
336	}
337	else
338	{
339	strcat (errmsg, "Object ");
340	if (op->name == NULL)
341	strcat (errmsg, "(null)");
342	else
343	strcat (errmsg, op->name);
344	strcat (errmsg, "\n");
345	# if 0
346	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
347	strcat (errmsg, cp);
348	for (tmp = op->inv; tmp; tmp = tmp->below)
349	dump_object2 (tmp);
350	# endif
351	strcat (errmsg, "end\n");
352	}
353	#endif
354	}	512	}
355		513
356	/*	514	/*
357	* Dumps an object. Returns output in the static global errmsg array.	515	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
358	*/	516	*/
359		517	char *
360	void
361	dump_object (object *op)	518	dump_object (object *op)
362	{	519	{
363	if (op == NULL)	520	if (!op)
364	{	521	return strdup ("[NULLOBJ]");
365	strcpy (errmsg, "[NULL pointer]");
366	return;
367	}
368	errmsg[0] = '\0';
369	dump_object2 (op);
370	}
371		522
372	void	523	object_freezer freezer;
373	dump_all_objects (void)	524	op->write (freezer);
374	{	525	return freezer.as_string ();
375	object *op;
376
377	for (op = objects; op != NULL; op = op->next)
378	{
379	dump_object (op);
380	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
381	}
382	}	526	}
383		527
384	/*	528	char *
385	* get_nearest_part(multi-object, object 2) returns the part of the	529	object::as_string ()
386	* multi-object 1 which is closest to the second object.
387	* If it's not a multi-object, it is returned.
388	*/
389
390	object *
391	get_nearest_part (object *op, const object *pl)
392	{	530	{
393	object *tmp, *closest;	531	return dump_object (this);
394	int last_dist, i;
395
396	if (op->more == NULL)
397	return op;
398	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
399	if ((i = distance (tmp, pl)) < last_dist)
400	closest = tmp, last_dist = i;
401	return closest;
402	}	532	}
403		533
404	/*	534	/*
405	* Returns the object which has the count-variable equal to the argument.	535	* Returns the object which has the count-variable equal to the argument.
		536	* VERRRY slow.
406	*/	537	*/
407
408	object *	538	object *
409	find_object (tag_t i)	539	find_object (tag_t i)
410	{	540	{
411	object *op;	541	for_all_objects (op)
412
413	for (op = objects; op != NULL; op = op->next)
414	if (op->count == i)	542	if (op->count == i)
415	break;
416	return op;	543	return op;
		544
		545	return 0;
		546	}
		547
		548	/*
		549	* Returns the object which has the uuid equal to the argument.
		550	* MOAR VERRRY slow.
		551	*/
		552
		553	object *
		554	find_object_uuid (UUID i)
		555	{
		556	for_all_objects (op)
		557	if (op->uuid == i)
		558	return op;
		559
		560	return 0;
417	}	561	}
418		562
419	/*	563	/*
420	* Returns the first object which has a name equal to the argument.	564	* Returns the first object which has a name equal to the argument.
421	* Used only by the patch command, but not all that useful.	565	* Used only by the patch command, but not all that useful.
422	* Enables features like "patch <name-of-other-player> food 999"	566	* Enables features like "patch <name-of-other-player> food 999"
423	*/	567	*/
424
425	object *	568	object *
426	find_object_name (const char *str)	569	find_object_name (const char *str)
427	{	570	{
428	const char *name = shstr::find (str);	571	shstr_cmp str_ (str);
429	object *op;
430		572
431	for (op = objects; op != NULL; op = op->next)	573	if (str_)
		574	for_all_objects (op)
432	if (&op->name == name)	575	if (op->name == str_)
433	break;	576	return op;
434		577
435	return op;	578	return 0;
436	}
437
438	void
439	free_all_object_data ()
440	{
441	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
442	}
443
444	/*
445	* Returns the object which this object marks as being the owner.
446	* A id-scheme is used to avoid pointing to objects which have been
447	* freed and are now reused. If this is detected, the owner is
448	* set to NULL, and NULL is returned.
449	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.
453	*/
454
455	object *
456	get_owner (object *op)
457	{
458	if (op->owner == NULL)
459	return NULL;
460
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}	579	}
481		580
482	/*	581	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	582	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	583	* skill and experience objects.
485	*/	584	* ACTUALLY NO! investigate! TODO
486	void
487	set_owner (object *op, object *owner)
488	{
489	if (owner == NULL || op == NULL)
490	return;
491
492	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.
498	*/	585	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	586	void
		587	object::set_owner (object *owner)
		588	{
		589	// allow objects which own objects
		590	if (owner)
		591	while (owner->owner)
500	owner = owner->owner;	592	owner = owner->owner;
501		593
502	/* IF the owner still has an owner, we did not resolve to a final owner.	594	if (flag [FLAG_FREED])
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512
513	}
514
515	/* Set the owner to clone's current owner and set the skill and experience
516	* objects to clone's objects (typically those objects that where the owner's
517	* current skill and experience objects at the time when clone's owner was
518	* set - not the owner's current skill and experience objects).
519	*
520	* Use this function if player created an object (e.g. fire bullet, swarm
521	* spell), and this object creates further objects whose kills should be
522	* accounted for the player's original skill, even if player has changed
523	* skills meanwhile.
524	*/
525	void
526	copy_owner (object *op, object *clone)
527	{
528	object *owner = get_owner (clone);
529
530	if (owner == NULL)
531	{	595	{
532	/* players don't have owners - they own themselves. Update	596	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
533	* as appropriate.
534	*/
535	if (clone->type == PLAYER)
536	owner = clone;
537	else
538	return;	597	return;
539	}	598	}
540	set_owner (op, owner);
541		599
		600	this->owner = owner;
542	}	601	}
543		602
544	/* Zero the key_values on op, decrementing the shared-string	603	/* Zero the key_values on op, decrementing the shared-string
545	* refcounts and freeing the links.	604	* refcounts and freeing the links.
546	*/	605	*/
547	static void	606	static void
548	free_key_values (object *op)	607	free_key_values (object *op)
549	{	608	{
550	for (key_value *i = op->key_values; i != 0;)	609	for (key_value *i = op->key_values; i; )
551	{	610	{
552	key_value *next = i->next;	611	key_value *next = i->next;
553	delete i;	612	delete i;
554		613
555	i = next;	614	i = next;
556	}	615	}
557		616
558	op->key_values = 0;	617	op->key_values = 0;
559	}	618	}
560		619
561	void object::clear ()
562	{
563	attachable_base::clear ();
564
565	free_key_values (this);
566
567	name = 0;
568	name_pl = 0;
569	title = 0;
570	race = 0;
571	slaying = 0;
572	skill = 0;
573	msg = 0;
574	lore = 0;
575	custom_name = 0;
576	materialname = 0;
577
578	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));
579
580	SET_FLAG (this, FLAG_REMOVED);
581	}
582
583	void object::clone (object *destination)
584	{
585	*(object_copy *) destination = *this;
586	*(object_pod *) destination = *this;
587
588	if (self || cb)
589	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
590	}
591
592	/*	620	/*
593	* clear_object() frees everything allocated by an object, and also
594	* clears all variables and flags to default settings.
595	*/
596
597	void
598	clear_object (object *op)
599	{
600	op->clear ();
601
602	op->contr = NULL;
603	op->below = NULL;
604	op->above = NULL;
605	op->inv = NULL;
606	op->container = NULL;
607	op->env = NULL;
608	op->more = NULL;
609	op->head = NULL;
610	op->map = NULL;
611	op->refcount = 0;
612	op->active_next = NULL;
613	op->active_prev = NULL;
614	/* What is not cleared is next, prev, and count */
615
616	op->expmul = 1.0;
617	op->face = blank_face;
618	op->attacked_by_count = -1;
619
620	if (settings.casting_time)
621	op->casting_time = -1;
622	}
623
624	/*
625	* copy object first frees everything allocated by the second object,	621	* copy_to first frees everything allocated by the dst object,
626	* and then copies the contends of the first object into the second	622	* and then copies the contents of itself into the second
627	* object, allocating what needs to be allocated. Basically, any	623	* object, allocating what needs to be allocated. Basically, any
628	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	624	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
629	* if the first object is freed, the pointers in the new object	625	* if the first object is freed, the pointers in the new object
630	* will point at garbage.	626	* will point at garbage.
631	*/	627	*/
632
633	void	628	void
634	copy_object (object *op2, object *op)	629	object::copy_to (object *dst)
635	{	630	{
636	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	631	dst->remove ();
637	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	632	*(object_copy *)dst = *this;
638		633	dst->flag [FLAG_REMOVED] = true;
639	op2->clone (op);
640
641	if (is_freed)
642	SET_FLAG (op, FLAG_FREED);
643	if (is_removed)
644	SET_FLAG (op, FLAG_REMOVED);
645
646	if (op2->speed < 0)
647	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
648		634
649	/* Copy over key_values, if any. */	635	/* Copy over key_values, if any. */
650	if (op2->key_values)	636	if (key_values)
651	{	637	{
652	key_value *tail = 0;	638	key_value *tail = 0;
653	key_value *i;
654
655	op->key_values = 0;	639	dst->key_values = 0;
656		640
657	for (i = op2->key_values; i; i = i->next)	641	for (key_value *i = key_values; i; i = i->next)
658	{	642	{
659	key_value *new_link = new key_value;	643	key_value *new_link = new key_value;
660		644
661	new_link->next = 0;	645	new_link->next = 0;
662	new_link->key = i->key;	646	new_link->key = i->key;
663	new_link->value = i->value;	647	new_link->value = i->value;
664		648
665	/* Try and be clever here, too. */	649	/* Try and be clever here, too. */
666	if (!op->key_values)	650	if (!dst->key_values)
667	{	651	{
668	op->key_values = new_link;	652	dst->key_values = new_link;
669	tail = new_link;	653	tail = new_link;
670	}	654	}
671	else	655	else
672	{	656	{
673	tail->next = new_link;	657	tail->next = new_link;
674	tail = new_link;	658	tail = new_link;
675	}	659	}
676	}	660	}
677	}	661	}
678		662
679	update_ob_speed (op);	663	dst->activate ();
		664	}
		665
		666	void
		667	object::instantiate ()
		668	{
		669	if (!uuid.seq) // HACK
		670	uuid = UUID::gen ();
		671
		672	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		673	if (flag [FLAG_RANDOM_SPEED] && speed)
		674	speed_left = - speed - rndm (); // TODO animation
		675	else
		676	speed_left = -1.;
		677
		678	/* copy the body_info to the body_used - this is only really
		679	* need for monsters, but doesn't hurt to do it for everything.
		680	* by doing so, when a monster is created, it has good starting
		681	* values for the body_used info, so when items are created
		682	* for it, they can be properly equipped.
		683	*/
		684	for (int i = NUM_BODY_LOCATIONS; i--; )
		685	slot[i].used = slot[i].info;
		686
		687	attachable::instantiate ();
		688	}
		689
		690	object *
		691	object::clone ()
		692	{
		693	object *neu = create ();
		694	copy_to (neu);
		695
		696	// TODO: unclean state changes, should not be done in clone AND instantiate
		697	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		698	neu->speed_left = - neu->speed - rndm (); // TODO animation
		699
		700	neu->map = map; // not copied by copy_to
		701	return neu;
680	}	702	}
681		703
682	/*	704	/*
683	* If an object with the IS_TURNABLE() flag needs to be turned due	705	* If an object with the IS_TURNABLE() flag needs to be turned due
684	* to the closest player being on the other side, this function can	706	* to the closest player being on the other side, this function can
685	* be called to update the face variable, _and_ how it looks on the map.	707	* be called to update the face variable, _and_ how it looks on the map.
686	*/	708	*/
687
688	void	709	void
689	update_turn_face (object *op)	710	update_turn_face (object *op)
690	{	711	{
691	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	712	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
692	return;	713	return;
		714
693	SET_ANIMATION (op, op->direction);	715	SET_ANIMATION (op, op->direction);
694	update_object (op, UP_OBJ_FACE);	716	update_object (op, UP_OBJ_FACE);
695	}	717	}
696		718
697	/*	719	/*
698	* Updates the speed of an object. If the speed changes from 0 to another	720	* Updates the speed of an object. If the speed changes from 0 to another
699	* value, or vice versa, then add/remove the object from the active list.	721	* value, or vice versa, then add/remove the object from the active list.
700	* This function needs to be called whenever the speed of an object changes.	722	* This function needs to be called whenever the speed of an object changes.
701	*/	723	*/
702
703	void	724	void
704	update_ob_speed (object *op)	725	object::set_speed (float speed)
705	{	726	{
706	extern int arch_init;	727	this->speed = speed;
707		728
708	/* No reason putting the archetypes objects on the speed list,	729	if (has_active_speed ())
709	* since they never really need to be updated.	730	activate ();
710	*/
711
712	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
713	{
714	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
715	#ifdef MANY_CORES
716	abort ();
717	#else
718	op->speed = 0;
719	#endif
720	}
721	if (arch_init)
722	{
723	return;
724	}
725	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
726	{
727	/* If already on active list, don't do anything */
728	if (op->active_next || op->active_prev || op == active_objects)
729	return;
730
731	/* process_events() expects us to insert the object at the beginning
732	* of the list. */
733	op->active_next = active_objects;
734	if (op->active_next != NULL)
735	op->active_next->active_prev = op;
736	active_objects = op;
737	}
738	else	731	else
739	{	732	deactivate ();
740	/* If not on the active list, nothing needs to be done */
741	if (!op->active_next && !op->active_prev && op != active_objects)
742	return;
743
744	if (op->active_prev == NULL)
745	{
746	active_objects = op->active_next;
747	if (op->active_next != NULL)
748	op->active_next->active_prev = NULL;
749	}
750	else
751	{
752	op->active_prev->active_next = op->active_next;
753	if (op->active_next)
754	op->active_next->active_prev = op->active_prev;
755	}
756	op->active_next = NULL;
757	op->active_prev = NULL;
758	}
759	}	733	}
760		734
761	/* This function removes object 'op' from the list of active
762	* objects.
763	* This should only be used for style maps or other such
764	* reference maps where you don't want an object that isn't
765	* in play chewing up cpu time getting processed.
766	* The reverse of this is to call update_ob_speed, which
767	* will do the right thing based on the speed of the object.
768	*/
769	void
770	remove_from_active_list (object *op)
771	{
772	/* If not on the active list, nothing needs to be done */
773	if (!op->active_next && !op->active_prev && op != active_objects)
774	return;
775
776	if (op->active_prev == NULL)
777	{
778	active_objects = op->active_next;
779	if (op->active_next != NULL)
780	op->active_next->active_prev = NULL;
781	}
782	else
783	{
784	op->active_prev->active_next = op->active_next;
785	if (op->active_next)
786	op->active_next->active_prev = op->active_prev;
787	}
788	op->active_next = NULL;
789	op->active_prev = NULL;
790	}
791
792	/*	735	/*
793	* update_object() updates the array which represents the map.	736	* update_object() updates the the map.
794	* It takes into account invisible objects (and represent squares covered	737	* It takes into account invisible objects (and represent squares covered
795	* by invisible objects by whatever is below them (unless it's another	738	* by invisible objects by whatever is below them (unless it's another
796	* invisible object, etc...)	739	* invisible object, etc...)
797	* If the object being updated is beneath a player, the look-window	740	* If the object being updated is beneath a player, the look-window
798	* of that player is updated (this might be a suboptimal way of	741	* of that player is updated (this might be a suboptimal way of
799	* updating that window, though, since update_object() is called _often_)	742	* updating that window, though, since update_object() is called _often_)
800	*	743	*
801	* action is a hint of what the caller believes need to be done.	744	* action is a hint of what the caller believes need to be done.
802	* For example, if the only thing that has changed is the face (due to
803	* an animation), we don't need to call update_position until that actually
804	* comes into view of a player. OTOH, many other things, like addition/removal
805	* of walls or living creatures may need us to update the flags now.
806	* current action are:	745	* current action are:
807	* UP_OBJ_INSERT: op was inserted	746	* UP_OBJ_INSERT: op was inserted
808	* UP_OBJ_REMOVE: op was removed	747	* UP_OBJ_REMOVE: op was removed
809	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	748	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
810	* as that is easier than trying to look at what may have changed.	749	* as that is easier than trying to look at what may have changed.
811	* UP_OBJ_FACE: only the objects face has changed.	750	* UP_OBJ_FACE: only the objects face has changed.
812	*/	751	*/
813
814	void	752	void
815	update_object (object *op, int action)	753	update_object (object *op, int action)
816	{	754	{
817	int update_now = 0, flags;	755	if (!op)
818	MoveType move_on, move_off, move_block, move_slow;
819
820	if (op == NULL)
821	{	756	{
822	/* this should never happen */	757	/* this should never happen */
823	LOG (llevDebug, "update_object() called for NULL object.\n");	758	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
824	return;	759	return;
825	}	760	}
826		761
827	if (op->env != NULL)	762	if (!op->is_on_map ())
828	{	763	{
829	/* Animation is currently handled by client, so nothing	764	/* Animation is currently handled by client, so nothing
830	* to do in this case.	765	* to do in this case.
831	*/	766	*/
832	return;	767	return;
833	}	768	}
834		769
835	/* If the map is saving, don't do anything as everything is
836	* going to get freed anyways.
837	*/
838	if (!op->map || op->map->in_memory == MAP_SAVING)
839	return;
840
841	/* make sure the object is within map boundaries */	770	/* make sure the object is within map boundaries */
842	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	771	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
843	{	772	{
844	LOG (llevError, "update_object() called for object out of map!\n");	773	LOG (llevError, "update_object() called for object out of map!\n");
845	#ifdef MANY_CORES	774	#ifdef MANY_CORES
846	abort ();	775	abort ();
847	#endif	776	#endif
848	return;	777	return;
849	}	778	}
850		779
851	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	780	mapspace &m = op->ms ();
852	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
853	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
854	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
855	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
856	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
857		781
		782	if (!(m.flags_ & P_UPTODATE))
		783	/* nop */;
858	if (action == UP_OBJ_INSERT)	784	else if (action == UP_OBJ_INSERT)
859	{	785	{
		786	#if 0
		787	// this is likely overkill, TODO: revisit (schmorp)
860	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	788	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
861	update_now = 1;	789	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
862		790	|| (op->is_player () && !(m.flags_ & P_PLAYER))
863	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))
864	update_now = 1;
865
866	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))
867	update_now = 1;
868
869	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
870	update_now = 1;
871
872	if (op->type == SAFE_GROUND && !(flags & P_SAFE))	791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
873	update_now = 1;	792	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
874		793	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
875	if ((move_on | op->move_on) != move_on)	794	|| (m.move_on | op->move_on ) != m.move_on
876	update_now = 1;
877
878	if ((move_off | op->move_off) != move_off)	795	|| (m.move_off | op->move_off ) != m.move_off
879	update_now = 1;	796	|| (m.move_slow | op->move_slow) != m.move_slow
880
881	/* This isn't perfect, but I don't expect a lot of objects to	797	/* This isn't perfect, but I don't expect a lot of objects to
882	* to have move_allow right now.	798	* have move_allow right now.
883	*/	799	*/
884	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	800	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
885	update_now = 1;	801	m.invalidate ();
886		802	#else
887	if ((move_slow | op->move_slow) != move_slow)	803	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
888	update_now = 1;	804	m.invalidate ();
		805	#endif
889	}	806	}
890	/* if the object is being removed, we can't make intelligent	807	/* if the object is being removed, we can't make intelligent
891	* decisions, because remove_ob can't really pass the object	808	* decisions, because remove_ob can't really pass the object
892	* that is being removed.	809	* that is being removed.
		810	*/
		811	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
		812	m.invalidate ();
		813	else if (action == UP_OBJ_FACE)
		814	/* Nothing to do for that case */ ;
		815	else
		816	LOG (llevError, "update_object called with invalid action: %d\n", action);
		817
		818	if (op->more)
		819	update_object (op->more, action);
		820	}
		821
		822	object::object ()
		823	{
		824	this->set_flag (FLAG_REMOVED);
		825
		826	//expmul = 1.0; declared const for the time being
		827	face = blank_face;
		828	material = MATERIAL_NULL;
		829	}
		830
		831	object::~object ()
		832	{
		833	unlink ();
		834
		835	free_key_values (this);
		836	}
		837
		838	void object::link ()
		839	{
		840	assert (!index);//D
		841	uuid = UUID::gen ();
		842
		843	refcnt_inc ();
		844	objects.insert (this);
		845
		846	++create_count;
		847
		848	}
		849
		850	void object::unlink ()
		851	{
		852	if (!index)
		853	return;
		854
		855	++destroy_count;
		856
		857	objects.erase (this);
		858	refcnt_dec ();
		859	}
		860
		861	void
		862	object::activate ()
		863	{
		864	/* If already on active list, don't do anything */
		865	if (active)
		866	return;
		867
		868	if (has_active_speed ())
		869	{
		870	if (flag [FLAG_FREED])
		871	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		872
		873	actives.insert (this);
		874	}
		875	}
		876
		877	void
		878	object::activate_recursive ()
		879	{
		880	activate ();
		881
		882	for (object *op = inv; op; op = op->below)
		883	op->activate_recursive ();
		884	}
		885
		886	/* This function removes object 'op' from the list of active
		887	* objects.
		888	* This should only be used for style maps or other such
		889	* reference maps where you don't want an object that isn't
		890	* in play chewing up cpu time getting processed.
		891	* The reverse of this is to call update_ob_speed, which
		892	* will do the right thing based on the speed of the object.
		893	*/
		894	void
		895	object::deactivate ()
		896	{
		897	/* If not on the active list, nothing needs to be done */
		898	if (!active)
		899	return;
		900
		901	actives.erase (this);
		902	}
		903
		904	void
		905	object::deactivate_recursive ()
		906	{
		907	for (object *op = inv; op; op = op->below)
		908	op->deactivate_recursive ();
		909
		910	deactivate ();
		911	}
		912
		913	void
		914	object::set_flag_inv (int flag, int value)
		915	{
		916	for (object *op = inv; op; op = op->below)
		917	{
		918	op->flag [flag] = value;
		919	op->set_flag_inv (flag, value);
		920	}
		921	}
		922
		923	/*
		924	* Remove and free all objects in the inventory of the given object.
		925	* object.c ?
		926	*/
		927	void
		928	object::destroy_inv (bool drop_to_ground)
		929	{
		930	// need to check first, because the checks below might segfault
		931	// as we might be on an invalid mapspace and crossfire code
		932	// is too buggy to ensure that the inventory is empty.
		933	// corollary: if you create arrows etc. with stuff in its inventory,
		934	// cf will crash below with off-map x and y
		935	if (!inv)
		936	return;
		937
		938	/* Only if the space blocks everything do we not process -
		939	* if some form of movement is allowed, let objects
		940	* drop on that space.
893	*/	941	*/
894	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	942	if (!drop_to_ground
895	{	943	|| !map
896	update_now = 1;	944	|| map->in_memory != MAP_ACTIVE
		945	|| map->no_drop
		946	|| ms ().move_block == MOVE_ALL)
897	}	947	{
898	else if (action == UP_OBJ_FACE)	948	while (inv)
899	{	949	inv->destroy ();
900	/* Nothing to do for that case */
901	}	950	}
902	else	951	else
		952	{ /* Put objects in inventory onto this space */
		953	while (inv)
		954	{
		955	object *op = inv;
		956
		957	if (op->flag [FLAG_STARTEQUIP]
		958	|| op->flag [FLAG_NO_DROP]
		959	|| op->type == RUNE
		960	|| op->type == TRAP
		961	|| op->flag [FLAG_IS_A_TEMPLATE]
		962	|| op->flag [FLAG_DESTROY_ON_DEATH])
		963	op->destroy ();
		964	else
		965	map->insert (op, x, y);
		966	}
903	{	967	}
904	LOG (llevError, "update_object called with invalid action: %d\n", action);	968	}
		969
		970	/*
		971	* Remove and free all objects in the inventory of the given object.
		972	* Unlike destroy_inv, this assumes the *this is destroyed as well
		973	* well, so we can (and have to!) take shortcuts.
		974	*/
		975	void
		976	object::destroy_inv_fast ()
		977	{
		978	while (object *op = inv)
905	}	979	{
		980	// remove from object the fast way
		981	op->flag [FLAG_REMOVED] = true;
		982	op->env = 0;
		983	if ((inv = inv->below))
		984	inv->above = 0;
906		985
907	if (update_now)	986	// then destroy
		987	op->destroy ();
908	{	988	}
909	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	989	}
910	update_position (op->map, op->x, op->y);	990
		991	void
		992	object::freelist_free (int count)
		993	{
		994	while (count-- && freelist)
911	}	995	{
		996	freelist_item *next = freelist->next;
		997	// count is being "destroyed"
912		998
913	if (op->more != NULL)	999	sfree ((char *)freelist, sizeof (object));
914	update_object (op->more, action);
915	}
916		1000
917	static	1001	freelist = next;
918	std::vector < object *>	1002	--free_count;
919	mortals;	1003	}
920
921	void object::free_mortals ()
922	{
923	for (std::vector < object *>::iterator i = mortals.begin (); i != mortals.end (); ++i)
924	delete *
925	i;
926
927	mortals.clear ();
928	}	1004	}
929		1005
930	object::object ()
931	{
932	SET_FLAG (this, FLAG_REMOVED);
933
934	expmul = 1.0;
935	face = blank_face;
936	attacked_by_count = -1;
937	}
938
939	object::~object ()
940	{
941	free_key_values (this);
942	}
943
944	void object::link ()
945	{
946	count = ++ob_count;
947
948	prev = 0;
949	next = objects;
950
951	if (objects)
952	objects->prev = this;
953
954	objects = this;
955	}
956
957	void object::unlink ()
958	{
959	count = 0;
960
961	/* Remove this object from the list of used objects */
962	if (prev)
963	prev->next = next;
964	if (next)
965	next->prev = prev;
966	if (this == objects)
967	objects = next;
968	}
969
970	object *object::create ()
971	{
972	object *	1006	object *
		1007	object::create ()
		1008	{
		1009	object *op;
		1010
		1011	if (freelist)
		1012	{
		1013	freelist_item li = *freelist;
		1014	memset (freelist, 0, sizeof (object));
		1015
		1016	op = new (freelist) object;
		1017	op->count = li.count;
		1018
		1019	freelist = li.next;
		1020	--free_count;
		1021	}
		1022	else
		1023	{
		1024	void *ni = salloc0<char> (sizeof (object));
		1025
973	op = new object;	1026	op = new(ni) object;
		1027
		1028	op->count = ++object_count;
		1029	}
974		1030
975	op->link ();	1031	op->link ();
		1032
976	return op;	1033	return op;
977	}	1034	}
978		1035
979	/*	1036	void
980	* free_object() frees everything allocated by an object, removes	1037	object::do_delete ()
981	* it from the list of used objects, and puts it on the list of
982	* free objects. The IS_FREED() flag is set in the object.
983	* The object must have been removed by remove_ob() first for
984	* this function to succeed.
985	*
986	* If free_inventory is set, free inventory as well. Else drop items in
987	* inventory to the ground.
988	*/
989	void object::free (bool free_inventory)
990	{	1038	{
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	1039	uint32_t count = this->count;
		1040
		1041	this->~object ();
		1042
		1043	freelist_item *li = (freelist_item *)this;
		1044	li->next = freelist;
		1045	li->count = count;
		1046
		1047	freelist = li;
		1048	++free_count;
		1049	}
		1050
		1051	static struct freed_map : maptile
		1052	{
		1053	freed_map ()
		1054	: maptile (3, 3)
992	{	1055	{
993	LOG (llevDebug, "Free object called with non removed object\n");	1056	path = "<freed objects map>";
994	dump_object (this);	1057	name = "/internal/freed_objects_map";
995	#ifdef MANY_CORES	1058	no_drop = 1;
996	abort ();	1059	no_reset = 1;
997	#endif	1060
		1061	in_memory = MAP_ACTIVE;
998	}	1062	}
999		1063
1000	if (QUERY_FLAG (this, FLAG_FRIENDLY))	1064	~freed_map ()
1001	{	1065	{
1002	LOG (llevMonster, "Warning: tried to free friendly object.\n");	1066	destroy ();
		1067	}
		1068	} freed_map; // freed objects are moved here to avoid crashes
		1069
		1070	void
		1071	object::do_destroy ()
		1072	{
		1073	if (flag [FLAG_IS_LINKED])
		1074	remove_link ();
		1075
		1076	if (flag [FLAG_FRIENDLY])
1003	remove_friendly_object (this);	1077	remove_friendly_object (this);
		1078
		1079	remove ();
		1080
		1081	attachable::do_destroy ();
		1082
		1083	deactivate ();
		1084	unlink ();
		1085
		1086	flag [FLAG_FREED] = 1;
		1087
		1088	// hack to ensure that freed objects still have a valid map
		1089	map = &freed_map;
		1090	x = 1;
		1091	y = 1;
		1092
		1093	if (more)
1004	}	1094	{
1005		1095	more->destroy ();
1006	if (QUERY_FLAG (this, FLAG_FREED))	1096	more = 0;
1007	{	1097	}
1008	dump_object (this);	1098
1009	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);	1099	head = 0;
		1100
		1101	// clear those pointers that likely might cause circular references
		1102	owner = 0;
		1103	enemy = 0;
		1104	attacked_by = 0;
		1105	current_weapon = 0;
		1106	}
		1107
		1108	void
		1109	object::destroy ()
		1110	{
		1111	if (destroyed ())
		1112	return;
		1113
		1114	if (!is_head () && !head->destroyed ())
		1115	{
		1116	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1117	head->destroy ();
1010	return;	1118	return;
1011	}	1119	}
1012		1120
1013	if (more)	1121	destroy_inv_fast ();
1014	{
1015	more->free (free_inventory);
1016	more = 0;
1017	}
1018		1122
1019	if (inv)	1123	if (is_head ())
1020	{	1124	if (sound_destroy)
1021	/* Only if the space blocks everything do we not process -	1125	play_sound (sound_destroy);
1022	* if some form of movement is allowed, let objects	1126	else if (flag [FLAG_MONSTER])
1023	* drop on that space.	1127	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
1024	*/
1025	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1026	{
1027	object *
1028	op = inv;
1029		1128
1030	while (op)	1129	attachable::destroy ();
1031	{
1032	object *
1033	tmp = op->below;
1034
1035	remove_ob (op);
1036	op->free (free_inventory);
1037	op = tmp;
1038	}
1039	}
1040	else
1041	{ /* Put objects in inventory onto this space */
1042	object *
1043	op = inv;
1044
1045	while (op)
1046	{
1047	object *
1048	tmp = op->below;
1049
1050	remove_ob (op);
1051
1052	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1053	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1054	free_object (op);
1055	else
1056	{
1057	op->x = x;
1058	op->y = y;
1059	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
1060	}
1061
1062	op = tmp;
1063	}
1064	}
1065	}
1066
1067	/* Remove object from the active list */
1068	speed = 0;
1069	update_ob_speed (this);
1070
1071	unlink ();
1072
1073	SET_FLAG (this, FLAG_FREED);
1074
1075	mortals.push_back (this);
1076	}	1130	}
1077		1131
1078	/*	1132	/* op->remove ():
1079	* sub_weight() recursively (outwards) subtracts a number from the
1080	* weight of an object (and what is carried by it's environment(s)).
1081	*/
1082
1083	void
1084	sub_weight (object *op, signed long weight)
1085	{
1086	while (op != NULL)
1087	{
1088	if (op->type == CONTAINER)
1089	{
1090	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1091	}
1092	op->carrying -= weight;
1093	op = op->env;
1094	}
1095	}
1096
1097	/* remove_ob(op):
1098	* This function removes the object op from the linked list of objects	1133	* This function removes the object op from the linked list of objects
1099	* which it is currently tied to. When this function is done, the	1134	* which it is currently tied to. When this function is done, the
1100	* object will have no environment. If the object previously had an	1135	* object will have no environment. If the object previously had an
1101	* environment, the x and y coordinates will be updated to	1136	* environment, the x and y coordinates will be updated to
1102	* the previous environment.	1137	* the previous environment.
1103	* Beware: This function is called from the editor as well!
1104	*/	1138	*/
1105
1106	void	1139	void
1107	remove_ob (object *op)	1140	object::do_remove ()
1108	{	1141	{
1109	object *	1142	if (flag [FLAG_REMOVED])
1110	tmp, *	1143	return;
1111	last = NULL;
1112	object *
1113	otmp;
1114	tag_t
1115	tag;
1116	int
1117	check_walk_off;
1118	mapstruct *
1119	m;
1120	sint16
1121	x,
1122	y;
1123		1144
		1145	INVOKE_OBJECT (REMOVE, this);
1124		1146
1125	if (QUERY_FLAG (op, FLAG_REMOVED))	1147	flag [FLAG_REMOVED] = true;
1126	{
1127	dump_object (op);
1128	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1129		1148
1130	/* Changed it to always dump core in this case. As has been learned	1149	if (more)
1131	* in the past, trying to recover from errors almost always	1150	more->remove ();
1132	* make things worse, and this is a real error here - something
1133	* that should not happen.
1134	* Yes, if this was a mission critical app, trying to do something
1135	* to recover may make sense, but that is because failure of the app
1136	* may have other disastrous problems. Cf runs out of a script
1137	* so is easily enough restarted without any real problems.
1138	* MSW 2001-07-01
1139	*/
1140	abort ();
1141	}
1142	if (op->more != NULL)
1143	remove_ob (op->more);
1144
1145	SET_FLAG (op, FLAG_REMOVED);
1146		1151
1147	/*	1152	/*
1148	* In this case, the object to be removed is in someones	1153	* In this case, the object to be removed is in someones
1149	* inventory.	1154	* inventory.
1150	*/	1155	*/
1151	if (op->env != NULL)	1156	if (env)
1152	{	1157	{
1153	if (op->nrof)	1158	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1154	sub_weight (op->env, op->weight * op->nrof);	1159	if (object *pl = visible_to ())
1155	else	1160	esrv_del_item (pl->contr, count);
1156	sub_weight (op->env, op->weight + op->carrying);	1161	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1157		1162
1158	/* NO_FIX_PLAYER is set when a great many changes are being	1163	adjust_weight (env, total_weight (), 0);
1159	* made to players inventory. If set, avoiding the call
1160	* to save cpu time.
1161	*/
1162	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1163	fix_player (otmp);
1164		1164
1165	if (op->above != NULL)	1165	object *pl = in_player ();
1166	op->above->below = op->below;
1167	else
1168	op->env->inv = op->below;
1169
1170	if (op->below != NULL)
1171	op->below->above = op->above;
1172		1166
1173	/* we set up values so that it could be inserted into	1167	/* we set up values so that it could be inserted into
1174	* the map, but we don't actually do that - it is up	1168	* the map, but we don't actually do that - it is up
1175	* to the caller to decide what we want to do.	1169	* to the caller to decide what we want to do.
1176	*/	1170	*/
1177	op->x = op->env->x, op->y = op->env->y;
1178	op->map = op->env->map;	1171	map = env->map;
1179	op->above = NULL, op->below = NULL;	1172	x = env->x;
1180	op->env = NULL;	1173	y = env->y;
1181	return;
1182	}
1183		1174
1184	/* If we get here, we are removing it from a map */	1175	// make sure cmov optimisation is applicable
1185	if (op->map == NULL)	1176	*(above ? &above->below : &env->inv) = below;
1186	return;	1177	*(below ? &below->above : &above ) = above; // &above is just a dummy
1187		1178
1188	x = op->x;	1179	above = 0;
1189	y = op->y;	1180	below = 0;
1190	m = get_map_from_coord (op->map, &x, &y);	1181	env = 0;
1191		1182
1192	if (!m)	1183	if (pl && pl->is_player ())
1193	{
1194	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1195	op->map->path, op->x, op->y);
1196	/* in old days, we used to set x and y to 0 and continue.
1197	* it seems if we get into this case, something is probablye
1198	* screwed up and should be fixed.
1199	*/
1200	abort ();
1201	}
1202	if (op->map != m)
1203	{
1204	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1205	op->map->path, m->path, op->x, op->y, x, y);
1206	}
1207
1208	/* Re did the following section of code - it looks like it had
1209	* lots of logic for things we no longer care about
1210	*/
1211
1212	/* link the object above us */
1213	if (op->above)
1214	op->above->below = op->below;
1215	else
1216	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1217
1218	/* Relink the object below us, if there is one */
1219	if (op->below)
1220	{
1221	op->below->above = op->above;
1222	}
1223	else
1224	{
1225	/* Nothing below, which means we need to relink map object for this space
1226	* use translated coordinates in case some oddness with map tiling is
1227	* evident
1228	*/
1229	if (GET_MAP_OB (m, x, y) != op)
1230	{	1184	{
1231	dump_object (op);	1185	if (expect_false (pl->contr->combat_ob == this))
1232	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",	1186	{
1233	errmsg);	1187	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
1234	dump_object (GET_MAP_OB (m, x, y));	1188	pl->contr->combat_ob = 0;
1235	LOG (llevError, "%s\n", errmsg);	1189	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1190	}
		1191
		1192	if (expect_false (pl->contr->ranged_ob == this))
		1193	{
		1194	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1195	pl->contr->ranged_ob = 0;
		1196	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1197	}
		1198
		1199	pl->contr->queue_stats_update ();
		1200
		1201	if (expect_false (glow_radius) && pl->is_on_map ())
		1202	update_all_los (pl->map, pl->x, pl->y);
1236	}	1203	}
1237	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1238	}
1239	op->above = NULL;
1240	op->below = NULL;
1241
1242	if (op->map->in_memory == MAP_SAVING)
1243	return;
1244
1245	tag = op->count;
1246	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1247	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1248	{	1204	}
1249	/* No point updating the players look faces if he is the object	1205	else if (map)
1250	* being removed.	1206	{
1251	*/	1207	map->dirty = true;
		1208	mapspace &ms = this->ms ();
1252		1209
1253	if (tmp->type == PLAYER && tmp != op)	1210	if (object *pl = ms.player ())
1254	{	1211	{
1255	/* If a container that the player is currently using somehow gets	1212	if (is_player ())
1256	* removed (most likely destroyed), update the player view
1257	* appropriately.
1258	*/
1259	if (tmp->container == op)
1260	{	1213	{
1261	CLEAR_FLAG (op, FLAG_APPLIED);	1214	if (!flag [FLAG_WIZPASS])
1262	tmp->container = NULL;	1215	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1216
		1217	// leaving a spot always closes any open container on the ground
		1218	if (container && !container->env)
		1219	// this causes spurious floorbox updates, but it ensures
		1220	// that the CLOSE event is being sent.
		1221	close_container ();
		1222
		1223	--map->players;
		1224	map->touch ();
1263	}	1225	}
1264	tmp->contr->socket.update_look = 1;	1226	else if (pl->container_ () == this)
		1227	{
		1228	// removing a container should close it
		1229	close_container ();
		1230	}
		1231	else
		1232	esrv_del_item (pl->contr, count);
1265	}	1233	}
1266	/* See if player moving off should effect something */	1234
1267	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1235	/* link the object above us */
		1236	// re-link, make sure compiler can easily use cmove
		1237	*(above ? &above->below : &ms.top) = below;
		1238	*(below ? &below->above : &ms.bot) = above;
		1239
		1240	above = 0;
		1241	below = 0;
		1242
		1243	ms.invalidate ();
		1244
		1245	if (map->in_memory == MAP_SAVING)
		1246	return;
		1247
		1248	int check_walk_off = !flag [FLAG_NO_APPLY];
		1249
		1250	if (object *pl = ms.player ())
1268	{	1251	{
1269		1252	if (pl->container_ () == this)
1270	move_apply (tmp, op, NULL);	1253	/* If a container that the player is currently using somehow gets
1271	if (was_destroyed (op, tag))	1254	* removed (most likely destroyed), update the player view
		1255	* appropriately.
1272	{	1256	*/
1273	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1257	pl->close_container ();
1274	}	1258
		1259	//TODO: the floorbox prev/next might need updating
		1260	//esrv_del_item (pl->contr, count);
		1261	//TODO: update floorbox to preserve ordering
		1262	if (pl->contr->ns)
		1263	pl->contr->ns->floorbox_update ();
1275	}	1264	}
1276		1265
1277	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1266	if (check_walk_off)
		1267	for (object *above, *tmp = ms.bot; tmp; tmp = above)
		1268	{
		1269	above = tmp->above;
1278		1270
1279	if (tmp->above == tmp)	1271	/* No point updating the players look faces if he is the object
1280	tmp->above = NULL;	1272	* being removed.
1281	last = tmp;	1273	*/
1282	}	1274
1283	/* last == NULL of there are no objects on this space */	1275	/* See if object moving off should effect something */
1284	if (last == NULL)	1276	if ((move_type & tmp->move_off)
		1277	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
		1278	move_apply (tmp, this, 0);
		1279	}
		1280
		1281	if (affects_los ())
		1282	update_all_los (map, x, y);
1285	{	1283	}
1286	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1287	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1288	* those out anyways, and if there are any flags set right now, they won't
1289	* be correct anyways.
1290	*/
1291	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1292	update_position (op->map, op->x, op->y);
1293	}
1294	else
1295	update_object (last, UP_OBJ_REMOVE);
1296
1297	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1298	update_all_los (op->map, op->x, op->y);
1299
1300	}	1284	}
1301		1285
1302	/*	1286	/*
1303	* merge_ob(op,top):	1287	* merge_ob(op,top):
1304	*	1288	*
1305	* This function goes through all objects below and including top, and	1289	* This function goes through all objects below and including top, and
1306	* merges op to the first matching object.	1290	* merges op to the first matching object.
1307	* If top is NULL, it is calculated.	1291	* If top is NULL, it is calculated.
1308	* Returns pointer to object if it succeded in the merge, otherwise NULL	1292	* Returns pointer to object if it succeded in the merge, otherwise NULL
1309	*/	1293	*/
1310
1311	object *	1294	object *
1312	merge_ob (object *op, object *top)	1295	merge_ob (object *op, object *top)
1313	{	1296	{
1314	if (!op->nrof)	1297	if (!op->nrof)
1315	return 0;	1298	return 0;
1316	if (top == NULL)	1299
		1300	if (!top)
1317	for (top = op; top != NULL && top->above != NULL; top = top->above);	1301	for (top = op; top && top->above; top = top->above)
		1302	;
		1303
1318	for (; top != NULL; top = top->below)	1304	for (; top; top = top->below)
1319	{	1305	if (object::can_merge (op, top))
1320	if (top == op)
1321	continue;
1322	if (CAN_MERGE (op, top))
1323	{	1306	{
1324	top->nrof += op->nrof;	1307	top->nrof += op->nrof;
1325		1308
1326	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1309	if (object *pl = top->visible_to ())
1327	op->weight = 0; /* Don't want any adjustements now */	1310	esrv_update_item (UPD_NROF, pl, top);
1328	remove_ob (op);	1311
1329	free_object (op);	1312	op->weight = 0; // cancel the addition above
		1313	op->carrying = 0; // must be 0 already
		1314
		1315	op->destroy ();
		1316
1330	return top;	1317	return top;
1331	}	1318	}
1332	}	1319
1333	return NULL;	1320	return 0;
1334	}	1321	}
1335		1322
		1323	void
		1324	object::expand_tail ()
		1325	{
		1326	if (more)
		1327	return;
		1328
		1329	object *prev = this;
		1330
		1331	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1332	{
		1333	object *op = at->instance ();
		1334
		1335	op->name = name;
		1336	op->name_pl = name_pl;
		1337	op->title = title;
		1338
		1339	op->head = this;
		1340	prev->more = op;
		1341
		1342	prev = op;
		1343	}
		1344	}
		1345
1336	/*	1346	/*
1337	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1347	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1338	* job preparing multi-part monsters	1348	* job preparing multi-part monsters.
1339	*/	1349	*/
1340	object *	1350	object *
1341	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1351	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1342	{	1352	{
1343	object *	1353	op->remove ();
1344	tmp;
1345		1354
1346	if (op->head)
1347	op = op->head;
1348	for (tmp = op; tmp; tmp = tmp->more)	1355	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1349	{	1356	{
1350	tmp->x = x + tmp->arch->clone.x;	1357	tmp->x = x + tmp->arch->x;
1351	tmp->y = y + tmp->arch->clone.y;	1358	tmp->y = y + tmp->arch->y;
1352	}	1359	}
		1360
1353	return insert_ob_in_map (op, m, originator, flag);	1361	return insert_ob_in_map (op, m, originator, flag);
1354	}	1362	}
1355		1363
1356	/*	1364	/*
1357	* insert_ob_in_map (op, map, originator, flag):	1365	* insert_ob_in_map (op, map, originator, flag):
…		…
1368	* Passing 0 for flag gives proper default values, so flag really only needs	1376	* Passing 0 for flag gives proper default values, so flag really only needs
1369	* to be set if special handling is needed.	1377	* to be set if special handling is needed.
1370	*	1378	*
1371	* Return value:	1379	* Return value:
1372	* new object if 'op' was merged with other object	1380	* new object if 'op' was merged with other object
1373	* NULL if 'op' was destroyed	1381	* NULL if there was an error (destroyed, blocked etc.)
1374	* just 'op' otherwise	1382	* just 'op' otherwise
1375	*/	1383	*/
1376
1377	object *	1384	object *
1378	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1385	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1379	{	1386	{
1380	object *	1387	op->remove ();
1381	tmp, *
1382	top, *
1383	floor = NULL;
1384	sint16
1385	x,
1386	y;
1387		1388
1388	if (QUERY_FLAG (op, FLAG_FREED))	1389	if (m == &freed_map)//D TODO: remove soon
1389	{	1390	{//D
1390	LOG (llevError, "Trying to insert freed object!\n");	1391	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1391	return NULL;
1392	}	1392	}//D
1393	if (m == NULL)
1394	{
1395	dump_object (op);
1396	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
1397	return op;
1398	}
1399	if (out_of_map (m, op->x, op->y))
1400	{
1401	dump_object (op);
1402	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
1403	#ifdef MANY_CORES
1404	/* Better to catch this here, as otherwise the next use of this object
1405	* is likely to cause a crash. Better to find out where it is getting
1406	* improperly inserted.
1407	*/
1408	abort ();
1409	#endif
1410	return op;
1411	}
1412	if (!QUERY_FLAG (op, FLAG_REMOVED))
1413	{
1414	dump_object (op);
1415	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
1416	return op;
1417	}
1418	if (op->more != NULL)
1419	{
1420	/* The part may be on a different map. */
1421
1422	object *
1423	more = op->more;
1424
1425	/* We really need the caller to normalize coordinates - if
1426	* we set the map, that doesn't work if the location is within
1427	* a map and this is straddling an edge. So only if coordinate
1428	* is clear wrong do we normalize it.
1429	*/
1430	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1431	{
1432	more->map = get_map_from_coord (m, &more->x, &more->y);
1433	}
1434	else if (!more->map)
1435	{
1436	/* For backwards compatibility - when not dealing with tiled maps,
1437	* more->map should always point to the parent.
1438	*/
1439	more->map = m;
1440	}
1441
1442	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1443	{
1444	if (!op->head)
1445	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1446	return NULL;
1447	}
1448	}
1449	CLEAR_FLAG (op, FLAG_REMOVED);
1450		1393
1451	/* Ideally, the caller figures this out. However, it complicates a lot	1394	/* Ideally, the caller figures this out. However, it complicates a lot
1452	* of areas of callers (eg, anything that uses find_free_spot would now	1395	* of areas of callers (eg, anything that uses find_free_spot would now
1453	* need extra work	1396	* need extra work
1454	*/	1397	*/
1455	op->map = get_map_from_coord (m, &op->x, &op->y);	1398	maptile *newmap = m;
1456	x = op->x;	1399	if (!xy_normalise (newmap, op->x, op->y))
1457	y = op->y;	1400	{
		1401	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
		1402	return 0;
		1403	}
		1404
		1405	if (object *more = op->more)
		1406	if (!insert_ob_in_map (more, m, originator, flag))
		1407	return 0;
		1408
		1409	op->flag [FLAG_REMOVED] = false;
		1410	op->env = 0;
		1411	op->map = newmap;
		1412
		1413	mapspace &ms = op->ms ();
1458		1414
1459	/* this has to be done after we translate the coordinates.	1415	/* this has to be done after we translate the coordinates.
1460	*/	1416	*/
1461	if (op->nrof && !(flag & INS_NO_MERGE))	1417	if (op->nrof && !(flag & INS_NO_MERGE))
1462	{	1418	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1463	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1419	if (object::can_merge (op, tmp))
1464	if (CAN_MERGE (op, tmp))
1465	{	1420	{
		1421	// TODO: we actually want to update tmp, not op,
		1422	// but some caller surely breaks when we return tmp
		1423	// from here :/
1466	op->nrof += tmp->nrof;	1424	op->nrof += tmp->nrof;
1467	remove_ob (tmp);	1425	tmp->destroy ();
1468	free_object (tmp);
1469	}	1426	}
1470	}
1471		1427
1472	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1428	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1473	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1429	op->clr_flag (FLAG_INV_LOCKED);
1474	if (!QUERY_FLAG (op, FLAG_ALIVE))	1430
1475	CLEAR_FLAG (op, FLAG_NO_STEAL);	1431	if (!op->flag [FLAG_ALIVE])
		1432	op->clr_flag (FLAG_NO_STEAL);
1476		1433
1477	if (flag & INS_BELOW_ORIGINATOR)	1434	if (flag & INS_BELOW_ORIGINATOR)
1478	{	1435	{
1479	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1436	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1480	{	1437	{
1481	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1438	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1482	abort ();	1439	abort ();
1483	}	1440	}
		1441
		1442	if (!originator->is_on_map ())
		1443	{
		1444	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1445	op->debug_desc (), originator->debug_desc ());
		1446	abort ();
		1447	}
		1448
1484	op->above = originator;	1449	op->above = originator;
1485	op->below = originator->below;	1450	op->below = originator->below;
1486	if (op->below)
1487	op->below->above = op;
1488	else
1489	SET_MAP_OB (op->map, op->x, op->y, op);
1490	/* since *below* originator, no need to update top */
1491	originator->below = op;	1451	originator->below = op;
		1452
		1453	*(op->below ? &op->below->above : &ms.bot) = op;
1492	}	1454	}
1493	else	1455	else
1494	{	1456	{
		1457	object *floor = 0;
		1458	object *top = ms.top;
		1459
1495	/* If there are other objects, then */	1460	/* If there are other objects, then */
1496	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1461	if (top)
1497	{	1462	{
1498	object *
1499	last = NULL;
1500
1501	/*	1463	/*
1502	* If there are multiple objects on this space, we do some trickier handling.	1464	* If there are multiple objects on this space, we do some trickier handling.
1503	* We've already dealt with merging if appropriate.	1465	* We've already dealt with merging if appropriate.
1504	* Generally, we want to put the new object on top. But if	1466	* Generally, we want to put the new object on top. But if
1505	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1467	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1508	* once we get to them. This reduces the need to traverse over all of	1470	* once we get to them. This reduces the need to traverse over all of
1509	* them when adding another one - this saves quite a bit of cpu time	1471	* them when adding another one - this saves quite a bit of cpu time
1510	* when lots of spells are cast in one area. Currently, it is presumed	1472	* when lots of spells are cast in one area. Currently, it is presumed
1511	* that flying non pickable objects are spell objects.	1473	* that flying non pickable objects are spell objects.
1512	*/	1474	*/
1513		1475	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1514	while (top != NULL)
1515	{	1476	{
1516	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1477	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1517	floor = top;	1478	floor = tmp;
		1479
1518	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1480	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1519	{	1481	{
1520	/* We insert above top, so we want this object below this */	1482	/* We insert above top, so we want this object below this */
1521	top = top->below;	1483	top = tmp->below;
1522	break;	1484	break;
1523	}	1485	}
1524	last = top;	1486
1525	top = top->above;	1487	top = tmp;
1526	}	1488	}
1527	/* Don't want top to be NULL, so set it to the last valid object */
1528	top = last;
1529		1489
1530	/* We let update_position deal with figuring out what the space	1490	/* We let update_position deal with figuring out what the space
1531	* looks like instead of lots of conditions here.	1491	* looks like instead of lots of conditions here.
1532	* makes things faster, and effectively the same result.	1492	* makes things faster, and effectively the same result.
1533	*/	1493	*/
1534		1494
1535	/* Have object 'fall below' other objects that block view.	1495	/* Have object 'fall below' other objects that block view.
1536	* Unless those objects are exits, type 66	1496	* Unless those objects are exits.
1537	* If INS_ON_TOP is used, don't do this processing	1497	* If INS_ON_TOP is used, don't do this processing
1538	* Need to find the object that in fact blocks view, otherwise	1498	* Need to find the object that in fact blocks view, otherwise
1539	* stacking is a bit odd.	1499	* stacking is a bit odd.
1540	*/	1500	*/
1541	if (!(flag & INS_ON_TOP) &&	1501	if (!(flag & INS_ON_TOP)
1542	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1502	&& ms.flags () & P_BLOCKSVIEW
		1503	&& (op->face && !faces [op->face].visibility))
1543	{	1504	{
		1505	object *last;
		1506
1544	for (last = top; last != floor; last = last->below)	1507	for (last = top; last != floor; last = last->below)
1545	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1508	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1546	break;	1509	break;
		1510
1547	/* Check to see if we found the object that blocks view,	1511	/* Check to see if we found the object that blocks view,
1548	* and make sure we have a below pointer for it so that	1512	* and make sure we have a below pointer for it so that
1549	* we can get inserted below this one, which requires we	1513	* we can get inserted below this one, which requires we
1550	* set top to the object below us.	1514	* set top to the object below us.
1551	*/	1515	*/
1552	if (last && last->below && last != floor)	1516	if (last && last->below && last != floor)
1553	top = last->below;	1517	top = last->below;
1554	}	1518	}
1555	} /* If objects on this space */	1519	} /* If objects on this space */
1556	if (flag & INS_MAP_LOAD)	1520
1557	top = GET_MAP_TOP (op->map, op->x, op->y);
1558	if (flag & INS_ABOVE_FLOOR_ONLY)	1521	if (flag & INS_ABOVE_FLOOR_ONLY)
1559	top = floor;	1522	top = floor;
1560		1523
1561	/* Top is the object that our object (op) is going to get inserted above.	1524	// insert object above top, or bottom-most if top = 0
1562	*/
1563
1564	/* First object on this space */
1565	if (!top)	1525	if (!top)
1566	{	1526	{
1567	op->above = GET_MAP_OB (op->map, op->x, op->y);
1568	if (op->above)
1569	op->above->below = op;
1570	op->below = NULL;	1527	op->below = 0;
1571	SET_MAP_OB (op->map, op->x, op->y, op);	1528	op->above = ms.bot;
		1529	ms.bot = op;
		1530
		1531	*(op->above ? &op->above->below : &ms.top) = op;
1572	}	1532	}
1573	else	1533	else
1574	{ /* get inserted into the stack above top */	1534	{
1575	op->above = top->above;	1535	op->above = top->above;
1576	if (op->above)
1577	op->above->below = op;	1536	top->above = op;
		1537
1578	op->below = top;	1538	op->below = top;
1579	top->above = op;	1539	*(op->above ? &op->above->below : &ms.top) = op;
1580	}	1540	}
1581	if (op->above == NULL)	1541	}
1582	SET_MAP_TOP (op->map, op->x, op->y, op);
1583	} /* else not INS_BELOW_ORIGINATOR */
1584		1542
1585	if (op->type == PLAYER)	1543	if (op->is_player ())
		1544	{
1586	op->contr->do_los = 1;	1545	op->contr->do_los = 1;
1587		1546	++op->map->players;
1588	/* If we have a floor, we know the player, if any, will be above	1547	op->map->touch ();
1589	* it, so save a few ticks and start from there.
1590	*/
1591	if (!(flag & INS_MAP_LOAD))
1592	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1593	{
1594	if (tmp->type == PLAYER)
1595	tmp->contr->socket.update_look = 1;
1596	}	1548	}
		1549
		1550	op->map->dirty = true;
		1551
		1552	if (object *pl = ms.player ())
		1553	//TODO: the floorbox prev/next might need updating
		1554	//esrv_send_item (pl, op);
		1555	//TODO: update floorbox to preserve ordering
		1556	if (pl->contr->ns)
		1557	pl->contr->ns->floorbox_update ();
1597		1558
1598	/* If this object glows, it may affect lighting conditions that are	1559	/* If this object glows, it may affect lighting conditions that are
1599	* visible to others on this map. But update_all_los is really	1560	* visible to others on this map. But update_all_los is really
1600	* an inefficient way to do this, as it means los for all players	1561	* an inefficient way to do this, as it means los for all players
1601	* on the map will get recalculated. The players could very well	1562	* on the map will get recalculated. The players could very well
1602	* be far away from this change and not affected in any way -	1563	* be far away from this change and not affected in any way -
1603	* this should get redone to only look for players within range,	1564	* this should get redone to only look for players within range,
1604	* or just updating the P_NEED_UPDATE for spaces within this area	1565	* or just updating the P_UPTODATE for spaces within this area
1605	* of effect may be sufficient.	1566	* of effect may be sufficient.
1606	*/	1567	*/
1607	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1568	if (op->affects_los ())
		1569	{
		1570	op->ms ().invalidate ();
1608	update_all_los (op->map, op->x, op->y);	1571	update_all_los (op->map, op->x, op->y);
1609		1572	}
1610		1573
1611	/* updates flags (blocked, alive, no magic, etc) for this map space */	1574	/* updates flags (blocked, alive, no magic, etc) for this map space */
1612	update_object (op, UP_OBJ_INSERT);	1575	update_object (op, UP_OBJ_INSERT);
1613		1576
		1577	INVOKE_OBJECT (INSERT, op);
1614		1578
1615	/* Don't know if moving this to the end will break anything. However,	1579	/* Don't know if moving this to the end will break anything. However,
1616	* we want to have update_look set above before calling this.	1580	* we want to have floorbox_update called before calling this.
1617	*	1581	*
1618	* check_move_on() must be after this because code called from	1582	* check_move_on() must be after this because code called from
1619	* check_move_on() depends on correct map flags (so functions like	1583	* check_move_on() depends on correct map flags (so functions like
1620	* blocked() and wall() work properly), and these flags are updated by	1584	* blocked() and wall() work properly), and these flags are updated by
1621	* update_object().	1585	* update_object().
1622	*/	1586	*/
1623		1587
1624	/* if this is not the head or flag has been passed, don't check walk on status */	1588	/* if this is not the head or flag has been passed, don't check walk on status */
1625
1626	if (!(flag & INS_NO_WALK_ON) && !op->head)	1589	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1627	{	1590	{
1628	if (check_move_on (op, originator))	1591	if (check_move_on (op, originator, flag))
1629	return NULL;	1592	return 0;
1630		1593
1631	/* If we are a multi part object, lets work our way through the check	1594	/* If we are a multi part object, let's work our way through the check
1632	* walk on's.	1595	* walk on's.
1633	*/	1596	*/
1634	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1597	for (object *tmp = op->more; tmp; tmp = tmp->more)
1635	if (check_move_on (tmp, originator))	1598	if (check_move_on (tmp, originator, flag))
1636	return NULL;	1599	return 0;
1637	}	1600	}
		1601
1638	return op;	1602	return op;
1639	}	1603	}
1640		1604
1641	/* this function inserts an object in the map, but if it	1605	/* this function inserts an object in the map, but if it
1642	* finds an object of its own type, it'll remove that one first.	1606	* finds an object of its own type, it'll remove that one first.
1643	* op is the object to insert it under: supplies x and the map.	1607	* op is the object to insert it under: supplies x and the map.
1644	*/	1608	*/
1645	void	1609	void
1646	replace_insert_ob_in_map (const char *arch_string, object *op)	1610	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1647	{	1611	{
1648	object *
1649	tmp;
1650	object *
1651	tmp1;
1652
1653	/* first search for itself and remove any old instances */	1612	/* first search for itself and remove any old instances */
1654		1613
1655	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1614	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1656	{
1657	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1615	if (tmp->arch->archname == archname) /* same archetype */
1658	{	1616	tmp->destroy ();
1659	remove_ob (tmp);
1660	free_object (tmp);
1661	}
1662	}
1663		1617
1664	tmp1 = arch_to_object (find_archetype (arch_string));	1618	object *tmp = archetype::find (archname)->instance ();
1665		1619
1666
1667	tmp1->x = op->x;	1620	tmp->x = op->x;
1668	tmp1->y = op->y;	1621	tmp->y = op->y;
		1622
1669	insert_ob_in_map (tmp1, op->map, op, 0);	1623	insert_ob_in_map (tmp, op->map, op, 0);
1670	}	1624	}
1671
1672	/*
1673	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1674	* is returned contains nr objects, and the remaining parts contains
1675	* the rest (or is removed and freed if that number is 0).
1676	* On failure, NULL is returned, and the reason put into the
1677	* global static errmsg array.
1678	*/
1679		1625
1680	object *	1626	object *
1681	get_split_ob (object *orig_ob, uint32 nr)	1627	object::insert_at (object *where, object *originator, int flags)
1682	{	1628	{
1683	object *	1629	if (where->env)
1684	newob;	1630	return where->env->insert (this);
1685	int	1631	else
1686	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1632	return where->map->insert (this, where->x, where->y, originator, flags);
1687
1688	if (orig_ob->nrof < nr)
1689	{
1690	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1691	return NULL;
1692	}
1693	newob = object_create_clone (orig_ob);
1694	if ((orig_ob->nrof -= nr) < 1)
1695	{
1696	if (!is_removed)
1697	remove_ob (orig_ob);
1698	free_object2 (orig_ob, 1);
1699	}
1700	else if (!is_removed)
1701	{
1702	if (orig_ob->env != NULL)
1703	sub_weight (orig_ob->env, orig_ob->weight * nr);
1704	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1705	{
1706	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1707	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1708	return NULL;
1709	}
1710	}
1711	newob->nrof = nr;
1712
1713	return newob;
1714	}	1633	}
1715		1634
		1635	// check whether we can put this into the map, respect max_volume, max_items
		1636	bool
		1637	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1638	{
		1639	mapspace &ms = m->at (x, y);
		1640
		1641	int items = ms.items ();
		1642
		1643	if (!items // testing !items ensures we can drop at least one item
		1644	|| (items < m->max_items
		1645	&& ms.volume () < m->max_volume))
		1646	return true;
		1647
		1648	if (originator && originator->is_player ())
		1649	originator->contr->failmsgf (
		1650	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1651	query_name ()
		1652	);
		1653
		1654	return false;
		1655	}
		1656
1716	/*	1657	/*
1717	* decrease_ob_nr(object, number) decreases a specified number from	1658	* decrease(object, number) decreases a specified number from
1718	* the amount of an object. If the amount reaches 0, the object	1659	* the amount of an object. If the amount reaches 0, the object
1719	* is subsequently removed and freed.	1660	* is subsequently removed and freed.
1720	*	1661	*
1721	* Return value: 'op' if something is left, NULL if the amount reached 0	1662	* Return value: 'op' if something is left, NULL if the amount reached 0
1722	*/	1663	*/
		1664	bool
		1665	object::decrease (sint32 nr)
		1666	{
		1667	if (!nr)
		1668	return true;
1723		1669
		1670	nr = min (nr, nrof);
		1671
		1672	if (nrof > nr)
		1673	{
		1674	sint64 oweight = total_weight ();
		1675
		1676	nrof -= nr;
		1677
		1678	if (object *pl = visible_to ())
		1679	esrv_update_item (UPD_NROF, pl, this);
		1680
		1681	adjust_weight (env, oweight, total_weight ());
		1682
		1683	return true;
		1684	}
		1685	else
		1686	{
		1687	destroy ();
		1688	return false;
		1689	}
		1690	}
		1691
		1692	/*
		1693	* split(ob,nr) splits up ob into two parts. The part which
		1694	* is returned contains nr objects, and the remaining parts contains
		1695	* the rest (or is removed and returned if that number is 0).
		1696	* On failure, NULL is returned.
		1697	*/
1724	object *	1698	object *
1725	decrease_ob_nr (object *op, uint32 i)	1699	object::split (sint32 nr)
1726	{	1700	{
1727	object *	1701	int have = number_of ();
1728	tmp;
1729	player *
1730	pl;
1731		1702
1732	if (i == 0) /* objects with op->nrof require this check */	1703	if (have < nr)
1733	return op;	1704	return 0;
1734		1705	else if (have == nr)
1735	if (i > op->nrof)
1736	i = op->nrof;
1737
1738	if (QUERY_FLAG (op, FLAG_REMOVED))
1739	{
1740	op->nrof -= i;
1741	}	1706	{
1742	else if (op->env != NULL)
1743	{
1744	/* is this object in the players inventory, or sub container
1745	* therein?
1746	*/
1747	tmp = is_player_inv (op->env);
1748	/* nope. Is this a container the player has opened?
1749	* If so, set tmp to that player.
1750	* IMO, searching through all the players will mostly
1751	* likely be quicker than following op->env to the map,
1752	* and then searching the map for a player.
1753	*/
1754	if (!tmp)
1755	{
1756	for (pl = first_player; pl; pl = pl->next)
1757	if (pl->ob->container == op->env)
1758	break;
1759	if (pl)
1760	tmp = pl->ob;
1761	else
1762	tmp = NULL;
1763	}
1764
1765	if (i < op->nrof)
1766	{
1767	sub_weight (op->env, op->weight * i);
1768	op->nrof -= i;
1769	if (tmp)
1770	{
1771	esrv_send_item (tmp, op);
1772	}
1773	}
1774	else
1775	{
1776	remove_ob (op);	1707	remove ();
1777	op->nrof = 0;	1708	return this;
1778	if (tmp)
1779	{
1780	esrv_del_item (tmp->contr, op->count);
1781	}
1782	}
1783	}	1709	}
1784	else	1710	else
1785	{	1711	{
1786	object *	1712	decrease (nr);
1787	above = op->above;
1788		1713
1789	if (i < op->nrof)	1714	object *op = deep_clone ();
1790	{
1791	op->nrof -= i;
1792	}
1793	else
1794	{
1795	remove_ob (op);
1796	op->nrof = 0;	1715	op->nrof = nr;
1797	}
1798	/* Since we just removed op, op->above is null */
1799	for (tmp = above; tmp != NULL; tmp = tmp->above)
1800	if (tmp->type == PLAYER)
1801	{
1802	if (op->nrof)
1803	esrv_send_item (tmp, op);
1804	else
1805	esrv_del_item (tmp->contr, op->count);
1806	}
1807	}
1808
1809	if (op->nrof)
1810	{
1811	return op;	1716	return op;
1812	}	1717	}
1813	else	1718	}
		1719
		1720	object *
		1721	insert_ob_in_ob (object *op, object *where)
		1722	{
		1723	if (!where)
1814	{	1724	{
1815	free_object (op);	1725	char *dump = dump_object (op);
		1726	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1727	free (dump);
1816	return NULL;	1728	return op;
1817	}
1818	}
1819
1820	/*
1821	* add_weight(object, weight) adds the specified weight to an object,
1822	* and also updates how much the environment(s) is/are carrying.
1823	*/
1824
1825	void
1826	add_weight (object *op, signed long weight)
1827	{
1828	while (op != NULL)
1829	{	1729	}
1830	if (op->type == CONTAINER)	1730
1831	{	1731	if (where->head_ () != where)
1832	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1833	}
1834	op->carrying += weight;
1835	op = op->env;
1836	}	1732	{
1837	}	1733	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1734	where = where->head;
		1735	}
1838		1736
		1737	return where->insert (op);
		1738	}
		1739
1839	/*	1740	/*
1840	* insert_ob_in_ob(op,environment):	1741	* env->insert (op)
1841	* This function inserts the object op in the linked list	1742	* This function inserts the object op in the linked list
1842	* inside the object environment.	1743	* inside the object environment.
1843	*	1744	*
1844	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1845	* the inventory at the last position or next to other objects of the same
1846	* type.
1847	* Frank: Now sorted by type, archetype and magic!
1848	*
1849	* The function returns now pointer to inserted item, and return value can	1745	* The function returns now pointer to inserted item, and return value can
1850	* be != op, if items are merged. -Tero	1746	* be != op, if items are merged. -Tero
1851	*/	1747	*/
1852
1853	object *	1748	object *
1854	insert_ob_in_ob (object *op, object *where)	1749	object::insert (object *op)
1855	{	1750	{
1856	object *
1857	tmp, *
1858	otmp;
1859
1860	if (!QUERY_FLAG (op, FLAG_REMOVED))
1861	{
1862	dump_object (op);
1863	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1864	return op;
1865	}
1866	if (where == NULL)
1867	{
1868	dump_object (op);
1869	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1870	return op;
1871	}
1872	if (where->head)
1873	{
1874	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1875	where = where->head;
1876	}
1877	if (op->more)	1751	if (op->more)
1878	{	1752	{
1879	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1753	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1880	return op;	1754	return op;
1881	}	1755	}
1882	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1756
1883	CLEAR_FLAG (op, FLAG_REMOVED);	1757	op->remove ();
		1758
		1759	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1760
1884	if (op->nrof)	1761	if (op->nrof)
1885	{
1886	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1762	for (object *tmp = inv; tmp; tmp = tmp->below)
1887	if (CAN_MERGE (tmp, op))	1763	if (object::can_merge (tmp, op))
1888	{	1764	{
1889	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1890	(client needs the original object) */	1766	(client prefers the original object) */
		1767
		1768	// carring must be 0 for mergable objects
		1769	sint64 oweight = tmp->weight * tmp->nrof;
		1770
1891	tmp->nrof += op->nrof;	1771	tmp->nrof += op->nrof;
1892	/* Weight handling gets pretty funky. Since we are adding to	1772
1893	* tmp->nrof, we need to increase the weight.	1773	if (object *pl = tmp->visible_to ())
1894	*/	1774	esrv_update_item (UPD_NROF, pl, tmp);
		1775
1895	add_weight (where, op->weight * op->nrof);	1776	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1896	SET_FLAG (op, FLAG_REMOVED);	1777
1897	free_object (op); /* free the inserted object */	1778	op->destroy ();
1898	op = tmp;	1779	op = tmp;
1899	remove_ob (op); /* and fix old object's links */	1780	goto inserted;
1900	CLEAR_FLAG (op, FLAG_REMOVED);
1901	break;
1902	}	1781	}
1903		1782
1904	/* I assume combined objects have no inventory	1783	op->owner = 0; // it's his/hers now. period.
1905	* We add the weight - this object could have just been removed
1906	* (if it was possible to merge). calling remove_ob will subtract
1907	* the weight, so we need to add it in again, since we actually do
1908	* the linking below
1909	*/
1910	add_weight (where, op->weight * op->nrof);
1911	}
1912	else
1913	add_weight (where, (op->weight + op->carrying));
1914
1915	otmp = is_player_inv (where);
1916	if (otmp && otmp->contr != NULL)
1917	{
1918	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1919	fix_player (otmp);
1920	}
1921
1922	op->map = NULL;	1784	op->map = 0;
1923	op->env = where;	1785	op->x = 0;
		1786	op->y = 0;
		1787
1924	op->above = NULL;	1788	op->above = 0;
1925	op->below = NULL;	1789	op->below = inv;
1926	op->x = 0, op->y = 0;	1790	op->env = this;
1927		1791
		1792	if (inv)
		1793	inv->above = op;
		1794
		1795	inv = op;
		1796
		1797	op->flag [FLAG_REMOVED] = 0;
		1798
		1799	if (object *pl = op->visible_to ())
		1800	esrv_send_item (pl, op);
		1801
		1802	adjust_weight (this, 0, op->total_weight ());
		1803
		1804	inserted:
1928	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1929	if ((op->glow_radius != 0) && where->map)	1806	if (op->glow_radius && is_on_map ())
1930	{
1931	#ifdef DEBUG_LIGHTS
1932	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1933	#endif /* DEBUG_LIGHTS */
1934	if (MAP_DARKNESS (where->map))
1935	update_all_los (where->map, where->x, where->y);
1936	}	1807	{
1937		1808	update_stats ();
1938	/* Client has no idea of ordering so lets not bother ordering it here.	1809	update_all_los (map, x, y);
1939	* It sure simplifies this function...
1940	*/
1941	if (where->inv == NULL)
1942	where->inv = op;
1943	else
1944	{	1810	}
1945	op->below = where->inv;	1811	else if (is_player ())
1946	op->below->above = op;	1812	// if this is a player's inventory, update stats
1947	where->inv = op;	1813	contr->queue_stats_update ();
1948	}	1814
		1815	INVOKE_OBJECT (INSERT, this);
		1816
1949	return op;	1817	return op;
1950	}	1818	}
1951		1819
1952	/*	1820	/*
1953	* Checks if any objects has a move_type that matches objects	1821	* Checks if any objects has a move_type that matches objects
…		…
1967	*	1835	*
1968	* MSW 2001-07-08: Check all objects on space, not just those below	1836	* MSW 2001-07-08: Check all objects on space, not just those below
1969	* object being inserted. insert_ob_in_map may not put new objects	1837	* object being inserted. insert_ob_in_map may not put new objects
1970	* on top.	1838	* on top.
1971	*/	1839	*/
1972
1973	int	1840	int
1974	check_move_on (object *op, object *originator)	1841	check_move_on (object *op, object *originator, int flags)
1975	{	1842	{
1976	object *	1843	if (op->flag [FLAG_NO_APPLY])
1977	tmp;
1978	tag_t
1979	tag;
1980	mapstruct *
1981	m = op->map;
1982	int
1983	x = op->x, y = op->y;
1984	MoveType
1985	move_on,
1986	move_slow,
1987	move_block;
1988
1989	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1990	return 0;	1844	return 0;
1991		1845
1992	tag = op->count;	1846	object *tmp;
		1847	maptile *m = op->map;
		1848	int x = op->x, y = op->y;
1993		1849
1994	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1850	mapspace &ms = m->at (x, y);
1995	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1851
1996	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1852	ms.update ();
		1853
		1854	MoveType move_on = ms.move_on;
		1855	MoveType move_slow = ms.move_slow;
		1856	MoveType move_block = ms.move_block;
1997		1857
1998	/* if nothing on this space will slow op down or be applied,	1858	/* if nothing on this space will slow op down or be applied,
1999	* no need to do checking below. have to make sure move_type	1859	* no need to do checking below. have to make sure move_type
2000	* is set, as lots of objects don't have it set - we treat that	1860	* is set, as lots of objects don't have it set - we treat that
2001	* as walking.	1861	* as walking.
…		…
2012	return 0;	1872	return 0;
2013		1873
2014	/* The objects have to be checked from top to bottom.	1874	/* The objects have to be checked from top to bottom.
2015	* Hence, we first go to the top:	1875	* Hence, we first go to the top:
2016	*/	1876	*/
2017		1877	for (object *next, *tmp = ms.top; tmp; tmp = next)
2018	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)
2019	{
2020	/* Trim the search when we find the first other spell effect
2021	* this helps performance so that if a space has 50 spell objects,
2022	* we don't need to check all of them.
2023	*/
2024	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2025	break;
2026	}	1878	{
2027	for (; tmp != NULL; tmp = tmp->below)	1879	next = tmp->below;
2028	{	1880
2029	if (tmp == op)	1881	if (tmp == op)
2030	continue; /* Can't apply yourself */	1882	continue; /* Can't apply yourself */
2031		1883
2032	/* Check to see if one of the movement types should be slowed down.	1884	/* Check to see if one of the movement types should be slowed down.
2033	* Second check makes sure that the movement types not being slowed	1885	* Second check makes sure that the movement types not being slowed
2034	* (~slow_move) is not blocked on this space - just because the	1886	* (~slow_move) is not blocked on this space - just because the
2035	* space doesn't slow down swimming (for example), if you can't actually	1887	* space doesn't slow down swimming (for example), if you can't actually
2036	* swim on that space, can't use it to avoid the penalty.	1888	* swim on that space, can't use it to avoid the penalty.
2037	*/	1889	*/
2038	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1890	if (!op->flag [FLAG_WIZPASS])
2039	{	1891	{
2040	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1892	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
2041	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1893	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2042	{	1894	{
2043
2044	float
2045	diff;
2046
2047	diff = tmp->move_slow_penalty * FABS (op->speed);	1895	float diff = tmp->move_slow_penalty * fabs (op->speed);
2048	if (op->type == PLAYER)	1896
2049	{	1897	if (op->is_player ())
2050	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1898	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
2051	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1899	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
2052	{
2053	diff /= 4.0;	1900	diff /= 4.0;
2054	}	1901
2055	}
2056	op->speed_left -= diff;	1902	op->speed_left -= diff;
2057	}	1903	}
2058	}	1904	}
2059		1905
2060	/* Basically same logic as above, except now for actual apply. */	1906	/* Basically same logic as above, except now for actual apply. */
2061	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1907	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2062	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1908	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2063	{	1909	{
		1910	if ((flags & INS_NO_AUTO_EXIT)
		1911	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1912	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1913	continue;
2064		1914
2065	move_apply (tmp, op, originator);	1915	move_apply (tmp, op, originator);
		1916
2066	if (was_destroyed (op, tag))	1917	if (op->destroyed ())
2067	return 1;	1918	return 1;
2068		1919
2069	/* what the person/creature stepped onto has moved the object	1920	/* what the person/creature stepped onto has moved the object
2070	* someplace new. Don't process any further - if we did,	1921	* someplace new. Don't process any further - if we did,
2071	* have a feeling strange problems would result.	1922	* have a feeling strange problems would result.
2072	*/	1923	*/
2073	if (op->map != m || op->x != x || op->y != y)	1924	if (op->map != m || op->x != x || op->y != y)
2074	return 0;	1925	return 0;
2075	}	1926	}
2076	}	1927	}
		1928
2077	return 0;	1929	return 0;
2078	}	1930	}
2079		1931
2080	/*	1932	/*
2081	* present_arch(arch, map, x, y) searches for any objects with	1933	* present_arch(arch, map, x, y) searches for any objects with
2082	* a matching archetype at the given map and coordinates.	1934	* a matching archetype at the given map and coordinates.
2083	* The first matching object is returned, or NULL if none.	1935	* The first matching object is returned, or NULL if none.
2084	*/	1936	*/
2085
2086	object *	1937	object *
2087	present_arch (const archetype *at, mapstruct *m, int x, int y)	1938	present_arch (const archetype *at, maptile *m, int x, int y)
2088	{	1939	{
2089	object *
2090	tmp;
2091
2092	if (m == NULL || out_of_map (m, x, y))	1940	if (!m || out_of_map (m, x, y))
2093	{	1941	{
2094	LOG (llevError, "Present_arch called outside map.\n");	1942	LOG (llevError, "Present_arch called outside map.\n");
2095	return NULL;	1943	return NULL;
2096	}	1944	}
2097	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1945
2098	if (tmp->arch == at)	1946	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
		1947	if (tmp->arch->archname == at->archname)
2099	return tmp;	1948	return tmp;
		1949
2100	return NULL;	1950	return NULL;
2101	}	1951	}
2102		1952
2103	/*	1953	/*
2104	* present(type, map, x, y) searches for any objects with	1954	* present(type, map, x, y) searches for any objects with
2105	* a matching type variable at the given map and coordinates.	1955	* a matching type variable at the given map and coordinates.
2106	* The first matching object is returned, or NULL if none.	1956	* The first matching object is returned, or NULL if none.
2107	*/	1957	*/
2108
2109	object *	1958	object *
2110	present (unsigned char type, mapstruct *m, int x, int y)	1959	present (unsigned char type, maptile *m, int x, int y)
2111	{	1960	{
2112	object *
2113	tmp;
2114
2115	if (out_of_map (m, x, y))	1961	if (out_of_map (m, x, y))
2116	{	1962	{
2117	LOG (llevError, "Present called outside map.\n");	1963	LOG (llevError, "Present called outside map.\n");
2118	return NULL;	1964	return NULL;
2119	}	1965	}
2120	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1966
		1967	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2121	if (tmp->type == type)	1968	if (tmp->type == type)
2122	return tmp;	1969	return tmp;
		1970
2123	return NULL;	1971	return NULL;
2124	}	1972	}
2125		1973
2126	/*	1974	/*
2127	* present_in_ob(type, object) searches for any objects with	1975	* present_in_ob(type, object) searches for any objects with
2128	* a matching type variable in the inventory of the given object.	1976	* a matching type variable in the inventory of the given object.
2129	* The first matching object is returned, or NULL if none.	1977	* The first matching object is returned, or NULL if none.
2130	*/	1978	*/
2131
2132	object *	1979	object *
2133	present_in_ob (unsigned char type, const object *op)	1980	present_in_ob (unsigned char type, const object *op)
2134	{	1981	{
2135	object *
2136	tmp;
2137
2138	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1982	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2139	if (tmp->type == type)	1983	if (tmp->type == type)
2140	return tmp;	1984	return tmp;
		1985
2141	return NULL;	1986	return NULL;
2142	}	1987	}
2143		1988
2144	/*	1989	/*
2145	* present_in_ob (type, str, object) searches for any objects with	1990	* present_in_ob (type, str, object) searches for any objects with
…		…
2153	* str is the string to match against. Note that we match against	1998	* str is the string to match against. Note that we match against
2154	* the object name, not the archetype name. this is so that the	1999	* the object name, not the archetype name. this is so that the
2155	* spell code can use one object type (force), but change it's name	2000	* spell code can use one object type (force), but change it's name
2156	* to be unique.	2001	* to be unique.
2157	*/	2002	*/
2158
2159	object *	2003	object *
2160	present_in_ob_by_name (int type, const char *str, const object *op)	2004	present_in_ob_by_name (int type, const char *str, const object *op)
2161	{	2005	{
2162	object *
2163	tmp;
2164
2165	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2006	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2166	{
2167	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	2007	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2168	return tmp;	2008	return tmp;
2169	}	2009
2170	return NULL;	2010	return 0;
2171	}	2011	}
2172		2012
2173	/*	2013	/*
2174	* present_arch_in_ob(archetype, object) searches for any objects with	2014	* present_arch_in_ob(archetype, object) searches for any objects with
2175	* a matching archetype in the inventory of the given object.	2015	* a matching archetype in the inventory of the given object.
2176	* The first matching object is returned, or NULL if none.	2016	* The first matching object is returned, or NULL if none.
2177	*/	2017	*/
2178
2179	object *	2018	object *
2180	present_arch_in_ob (const archetype *at, const object *op)	2019	present_arch_in_ob (const archetype *at, const object *op)
2181	{	2020	{
2182	object *
2183	tmp;
2184
2185	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2186	if (tmp->arch == at)	2022	if (tmp->arch->archname == at->archname)
2187	return tmp;	2023	return tmp;
		2024
2188	return NULL;	2025	return NULL;
2189	}	2026	}
2190		2027
2191	/*	2028	/*
2192	* activate recursively a flag on an object inventory	2029	* activate recursively a flag on an object inventory
2193	*/	2030	*/
2194	void	2031	void
2195	flag_inv (object *op, int flag)	2032	flag_inv (object *op, int flag)
2196	{	2033	{
2197	object *
2198	tmp;
2199
2200	if (op->inv)
2201	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2034	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2202	{	2035	{
2203	SET_FLAG (tmp, flag);	2036	tmp->set_flag (flag);
2204	flag_inv (tmp, flag);	2037	flag_inv (tmp, flag);
2205	}	2038	}
2206	} /*	2039	}
		2040
		2041	/*
2207	* desactivate recursively a flag on an object inventory	2042	* deactivate recursively a flag on an object inventory
2208	*/	2043	*/
2209	void	2044	void
2210	unflag_inv (object *op, int flag)	2045	unflag_inv (object *op, int flag)
2211	{	2046	{
2212	object *
2213	tmp;
2214
2215	if (op->inv)
2216	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	2047	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2217	{	2048	{
2218	CLEAR_FLAG (tmp, flag);	2049	tmp->clr_flag (flag);
2219	unflag_inv (tmp, flag);	2050	unflag_inv (tmp, flag);
2220	}	2051	}
2221	}
2222
2223	/*
2224	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2225	* all it's inventory (recursively).
2226	* If checksums are used, a player will get set_cheat called for
2227	* him/her-self and all object carried by a call to this function.
2228	*/
2229
2230	void
2231	set_cheat (object *op)
2232	{
2233	SET_FLAG (op, FLAG_WAS_WIZ);
2234	flag_inv (op, FLAG_WAS_WIZ);
2235	}	2052	}
2236		2053
2237	/*	2054	/*
2238	* find_free_spot(object, map, x, y, start, stop) will search for	2055	* find_free_spot(object, map, x, y, start, stop) will search for
2239	* a spot at the given map and coordinates which will be able to contain	2056	* a spot at the given map and coordinates which will be able to contain
…		…
2241	* to search (see the freearr_x/y[] definition).	2058	* to search (see the freearr_x/y[] definition).
2242	* It returns a random choice among the alternatives found.	2059	* It returns a random choice among the alternatives found.
2243	* start and stop are where to start relative to the free_arr array (1,9	2060	* start and stop are where to start relative to the free_arr array (1,9
2244	* does all 4 immediate directions). This returns the index into the	2061	* does all 4 immediate directions). This returns the index into the
2245	* array of the free spot, -1 if no spot available (dir 0 = x,y)	2062	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2246	* Note - this only checks to see if there is space for the head of the
2247	* object - if it is a multispace object, this should be called for all
2248	* pieces.
2249	* Note2: This function does correctly handle tiled maps, but does not	2063	* Note: This function does correctly handle tiled maps, but does not
2250	* inform the caller. However, insert_ob_in_map will update as	2064	* inform the caller. However, insert_ob_in_map will update as
2251	* necessary, so the caller shouldn't need to do any special work.	2065	* necessary, so the caller shouldn't need to do any special work.
2252	* Note - updated to take an object instead of archetype - this is necessary	2066	* Note - updated to take an object instead of archetype - this is necessary
2253	* because arch_blocked (now ob_blocked) needs to know the movement type	2067	* because arch_blocked (now ob_blocked) needs to know the movement type
2254	* to know if the space in question will block the object. We can't use	2068	* to know if the space in question will block the object. We can't use
2255	* the archetype because that isn't correct if the monster has been	2069	* the archetype because that isn't correct if the monster has been
2256	* customized, changed states, etc.	2070	* customized, changed states, etc.
2257	*/	2071	*/
2258
2259	int	2072	int
2260	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2073	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2261	{	2074	{
2262	int
2263	i,
2264	index = 0, flag;
2265	static int
2266	altern[SIZEOFFREE];	2075	int altern[SIZEOFFREE];
		2076	int index = 0, flag;
2267		2077
2268	for (i = start; i < stop; i++)	2078	for (int i = start; i < stop; i++)
2269	{	2079	{
2270	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2080	mapxy pos (m, x, y); pos.move (i);
2271	if (!flag)	2081
		2082	if (!pos.normalise ())
		2083	continue;
		2084
		2085	mapspace &ms = *pos;
		2086
		2087	if (ms.flags () & P_IS_ALIVE)
		2088	continue;
		2089
		2090	/* However, often
		2091	* ob doesn't have any move type (when used to place exits)
		2092	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2093	*/
		2094	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2095	{
2272	altern[index++] = i;	2096	altern [index++] = i;
		2097	continue;
		2098	}
2273		2099
2274	/* Basically, if we find a wall on a space, we cut down the search size.	2100	/* Basically, if we find a wall on a space, we cut down the search size.
2275	* In this way, we won't return spaces that are on another side of a wall.	2101	* In this way, we won't return spaces that are on another side of a wall.
2276	* This mostly work, but it cuts down the search size in all directions -	2102	* This mostly work, but it cuts down the search size in all directions -
2277	* if the space being examined only has a wall to the north and empty	2103	* if the space being examined only has a wall to the north and empty
2278	* spaces in all the other directions, this will reduce the search space	2104	* spaces in all the other directions, this will reduce the search space
2279	* to only the spaces immediately surrounding the target area, and	2105	* to only the spaces immediately surrounding the target area, and
2280	* won't look 2 spaces south of the target space.	2106	* won't look 2 spaces south of the target space.
2281	*/	2107	*/
2282	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2108	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2109	{
2283	stop = maxfree[i];	2110	stop = maxfree[i];
		2111	continue;
		2112	}
		2113
		2114	/* Note it is intentional that we check ob - the movement type of the
		2115	* head of the object should correspond for the entire object.
		2116	*/
		2117	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2118	continue;
		2119
		2120	if (ob->blocked (pos.m, pos.x, pos.y))
		2121	continue;
		2122
		2123	altern [index++] = i;
2284	}	2124	}
		2125
2285	if (!index)	2126	if (!index)
2286	return -1;	2127	return -1;
		2128
2287	return altern[RANDOM () % index];	2129	return altern [rndm (index)];
2288	}	2130	}
2289		2131
2290	/*	2132	/*
2291	* find_first_free_spot(archetype, mapstruct, x, y) works like	2133	* find_first_free_spot(archetype, maptile, x, y) works like
2292	* find_free_spot(), but it will search max number of squares.	2134	* find_free_spot(), but it will search max number of squares.
2293	* But it will return the first available spot, not a random choice.	2135	* But it will return the first available spot, not a random choice.
2294	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2295	*/	2137	*/
2296
2297	int	2138	int
2298	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2139	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2299	{	2140	{
2300	int
2301	i;
2302
2303	for (i = 0; i < SIZEOFFREE; i++)	2141	for (int i = 0; i < SIZEOFFREE; i++)
2304	{
2305	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2142	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2306	return i;	2143	return i;
2307	}	2144
2308	return -1;	2145	return -1;
2309	}	2146	}
2310		2147
2311	/*	2148	/*
2312	* The function permute(arr, begin, end) randomly reorders the array	2149	* The function permute(arr, begin, end) randomly reorders the array
2313	* arr[begin..end-1].	2150	* arr[begin..end-1].
		2151	* now uses a fisher-yates shuffle, old permute was broken
2314	*/	2152	*/
2315	static void	2153	static void
2316	permute (int *arr, int begin, int end)	2154	permute (int *arr, int begin, int end)
2317	{	2155	{
2318	int	2156	arr += begin;
2319	i,
2320	j,
2321	tmp,
2322	len;
2323
2324	len = end - begin;	2157	end -= begin;
2325	for (i = begin; i < end; i++)
2326	{
2327	j = begin + RANDOM () % len;
2328		2158
2329	tmp = arr[i];	2159	while (--end)
2330	arr[i] = arr[j];	2160	swap (arr [end], arr [rndm (end + 1)]);
2331	arr[j] = tmp;
2332	}
2333	}	2161	}
2334		2162
2335	/* new function to make monster searching more efficient, and effective!	2163	/* new function to make monster searching more efficient, and effective!
2336	* This basically returns a randomized array (in the passed pointer) of	2164	* This basically returns a randomized array (in the passed pointer) of
2337	* the spaces to find monsters. In this way, it won't always look for	2165	* the spaces to find monsters. In this way, it won't always look for
…		…
2340	* the 3x3 area will be searched, just not in a predictable order.	2168	* the 3x3 area will be searched, just not in a predictable order.
2341	*/	2169	*/
2342	void	2170	void
2343	get_search_arr (int *search_arr)	2171	get_search_arr (int *search_arr)
2344	{	2172	{
2345	int	2173	int i;
2346	i;
2347		2174
2348	for (i = 0; i < SIZEOFFREE; i++)	2175	for (i = 0; i < SIZEOFFREE; i++)
2349	{
2350	search_arr[i] = i;	2176	search_arr[i] = i;
2351	}
2352		2177
2353	permute (search_arr, 1, SIZEOFFREE1 + 1);	2178	permute (search_arr, 1, SIZEOFFREE1 + 1);
2354	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2179	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2355	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2180	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2356	}	2181	}
…		…
2365	* Perhaps incorrectly, but I'm making the assumption that exclude	2190	* Perhaps incorrectly, but I'm making the assumption that exclude
2366	* is actually want is going to try and move there. We need this info	2191	* is actually want is going to try and move there. We need this info
2367	* because we have to know what movement the thing looking to move	2192	* because we have to know what movement the thing looking to move
2368	* there is capable of.	2193	* there is capable of.
2369	*/	2194	*/
2370
2371	int	2195	int
2372	find_dir (mapstruct *m, int x, int y, object *exclude)	2196	find_dir (maptile *m, int x, int y, object *exclude)
2373	{	2197	{
2374	int
2375	i,
2376	max = SIZEOFFREE, mflags;	2198	int max = SIZEOFFREE, mflags;
2377	sint16	2199	MoveType move_type;
2378	nx,
2379	ny;
2380	object *
2381	tmp;
2382	mapstruct *
2383	mp;
2384	MoveType
2385	blocked,
2386	move_type;
2387		2200
2388	if (exclude && exclude->head)	2201	if (exclude && exclude->head_ () != exclude)
2389	{	2202	{
2390	exclude = exclude->head;	2203	exclude = exclude->head;
2391	move_type = exclude->move_type;	2204	move_type = exclude->move_type;
2392	}	2205	}
2393	else	2206	else
2394	{	2207	{
2395	/* If we don't have anything, presume it can use all movement types. */	2208	/* If we don't have anything, presume it can use all movement types. */
2396	move_type = MOVE_ALL;	2209	move_type = MOVE_ALL;
2397	}	2210	}
2398		2211
2399	for (i = 1; i < max; i++)	2212	for (int i = 1; i < max; i++)
2400	{	2213	{
2401	mp = m;	2214	mapxy pos (m, x, y);
2402	nx = x + freearr_x[i];	2215	pos.move (i);
2403	ny = y + freearr_y[i];
2404		2216
2405	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2217	if (!pos.normalise ())
2406	if (mflags & P_OUT_OF_MAP)
2407	{
2408	max = maxfree[i];	2218	max = maxfree[i];
2409	}
2410	else	2219	else
2411	{	2220	{
2412	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2221	mapspace &ms = *pos;
2413		2222
2414	if ((move_type & blocked) == move_type)	2223	if ((move_type & ms.move_block) == move_type)
		2224	max = maxfree [i];
		2225	else if (ms.flags () & P_IS_ALIVE)
2415	{	2226	{
2416	max = maxfree[i];	2227	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2417	}	2228	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2418	else if (mflags & P_IS_ALIVE)	2229	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2419	{
2420	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)
2421	{
2422	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2423	{
2424	break;
2425	}
2426	}
2427	if (tmp)
2428	{
2429	return freedir[i];	2230	return freedir [i];
2430	}
2431	}	2231	}
2432	}	2232	}
2433	}	2233	}
		2234
2434	return 0;	2235	return 0;
2435	}	2236	}
2436		2237
2437	/*	2238	/*
2438	* distance(object 1, object 2) will return the square of the	2239	* distance(object 1, object 2) will return the square of the
2439	* distance between the two given objects.	2240	* distance between the two given objects.
2440	*/	2241	*/
2441
2442	int	2242	int
2443	distance (const object *ob1, const object *ob2)	2243	distance (const object *ob1, const object *ob2)
2444	{	2244	{
2445	int
2446	i;
2447
2448	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2245	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2449	return i;
2450	}	2246	}
2451		2247
2452	/*	2248	/*
2453	* find_dir_2(delta-x,delta-y) will return a direction in which	2249	* find_dir_2(delta-x,delta-y) will return a direction value
2454	* an object which has subtracted the x and y coordinates of another	2250	* for running into direct [dx, dy].
2455	* object, needs to travel toward it.	2251	* (the opposite of crossfire's find_dir_2!)
2456	*/	2252	*/
2457
2458	int	2253	int
2459	find_dir_2 (int x, int y)	2254	find_dir_2 (int x, int y)
2460	{	2255	{
		2256	#if 1 // new algorithm
		2257	// this works by putting x, y into 16 sectors, which
		2258	// are not equal sized, but are a better approximation
		2259	// then the old algorithm, and then using a mapping
		2260	// table to map it into a direction value.
		2261	// basically, it maps these comparisons to each bit
		2262	// bit #3: x < 0
		2263	// bit #2: y < 0
		2264	// bit #1: x > y
		2265	// bit #0: x > 2y
		2266
		2267	static const uint8 dir[16] = {
		2268	4, 5, 4, 3,
		2269	2, 1, 2, 3,
		2270	6, 5, 6, 7,
		2271	8, 1, 8, 7,
		2272	};
		2273	int sector = 0;
		2274
		2275	// this is a bit ugly, but more likely to result in branchless code
		2276	sector |= x < 0 ? 8 : 0;
		2277	x = x < 0 ? -x : x; // abs
		2278
		2279	sector |= y < 0 ? 4 : 0;
		2280	y = y < 0 ? -y : y; // abs
		2281
		2282	if (x > y)
		2283	{
		2284	sector |= 2;
		2285
		2286	if (x > y * 2)
		2287	sector |= 1;
		2288	}
		2289	else
		2290	{
		2291	if (y > x * 2)
		2292	sector |= 1;
		2293	else if (!y)
		2294	return 0; // x == 0 here
		2295	}
		2296
		2297	return dir [sector];
		2298	#else // old algorithm
2461	int	2299	int q;
2462	q;
2463		2300
2464	if (y)	2301	if (y)
2465	q = x * 100 / y;	2302	q = 128 * x / y;
2466	else if (x)	2303	else if (x)
2467	q = -300 * x;	2304	q = -512 * x; // to make it > 309
2468	else	2305	else
2469	return 0;	2306	return 0;
2470		2307
2471	if (y > 0)	2308	if (y > 0)
2472	{	2309	{
2473	if (q < -242)	2310	if (q < -309) return 7;
		2311	if (q < -52) return 6;
		2312	if (q < 52) return 5;
		2313	if (q < 309) return 4;
		2314
2474	return 3;	2315	return 3;
2475	if (q < -41)	2316	}
2476	return 2;	2317	else
2477	if (q < 41)	2318	{
2478	return 1;	2319	if (q < -309) return 3;
2479	if (q < 242)	2320	if (q < -52) return 2;
2480	return 8;	2321	if (q < 52) return 1;
		2322	if (q < 309) return 8;
		2323
2481	return 7;	2324	return 7;
2482	}	2325	}
2483		2326	#endif
2484	if (q < -242)
2485	return 7;
2486	if (q < -41)
2487	return 6;
2488	if (q < 41)
2489	return 5;
2490	if (q < 242)
2491	return 4;
2492
2493	return 3;
2494	}
2495
2496	/*
2497	* absdir(int): Returns a number between 1 and 8, which represent
2498	* the "absolute" direction of a number (it actually takes care of
2499	* "overflow" in previous calculations of a direction).
2500	*/
2501
2502	int
2503	absdir (int d)
2504	{
2505	while (d < 1)
2506	d += 8;
2507	while (d > 8)
2508	d -= 8;
2509	return d;
2510	}	2327	}
2511		2328
2512	/*	2329	/*
2513	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2330	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2514	* between two directions (which are expected to be absolute (see absdir())	2331	* between two directions (which are expected to be absolute (see absdir())
2515	*/	2332	*/
2516
2517	int	2333	int
2518	dirdiff (int dir1, int dir2)	2334	dirdiff (int dir1, int dir2)
2519	{	2335	{
2520	int
2521	d;
2522
2523	d = abs (dir1 - dir2);	2336	int d = abs (dir1 - dir2);
2524	if (d > 4)	2337
2525	d = 8 - d;	2338	return d > 4 ? 8 - d : d;
2526	return d;
2527	}	2339	}
2528		2340
2529	/* peterm:	2341	/* peterm:
2530	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2342	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2531	* Basically, this is a table of directions, and what directions	2343	* Basically, this is a table of directions, and what directions
…		…
2533	* This basically means that if direction is 15, then it could either go	2345	* This basically means that if direction is 15, then it could either go
2534	* direction 4, 14, or 16 to get back to where we are.	2346	* direction 4, 14, or 16 to get back to where we are.
2535	* Moved from spell_util.c to object.c with the other related direction	2347	* Moved from spell_util.c to object.c with the other related direction
2536	* functions.	2348	* functions.
2537	*/	2349	*/
2538
2539	int
2540	reduction_dir[SIZEOFFREE][3] = {	2350	static const int reduction_dir[SIZEOFFREE][3] = {
2541	{0, 0, 0}, /* 0 */	2351	{0, 0, 0}, /* 0 */
2542	{0, 0, 0}, /* 1 */	2352	{0, 0, 0}, /* 1 */
2543	{0, 0, 0}, /* 2 */	2353	{0, 0, 0}, /* 2 */
2544	{0, 0, 0}, /* 3 */	2354	{0, 0, 0}, /* 3 */
2545	{0, 0, 0}, /* 4 */	2355	{0, 0, 0}, /* 4 */
…		…
2593	* find a path to that monster that we found. If not,	2403	* find a path to that monster that we found. If not,
2594	* we don't bother going toward it. Returns 1 if we	2404	* we don't bother going toward it. Returns 1 if we
2595	* can see a direct way to get it	2405	* can see a direct way to get it
2596	* Modified to be map tile aware -.MSW	2406	* Modified to be map tile aware -.MSW
2597	*/	2407	*/
2598
2599
2600	int	2408	int
2601	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2409	can_see_monsterP (maptile *m, int x, int y, int dir)
2602	{	2410	{
2603	sint16	2411	sint16 dx, dy;
2604	dx,
2605	dy;
2606	int
2607	mflags;	2412	int mflags;
2608		2413
2609	if (dir < 0)	2414	if (dir < 0)
2610	return 0; /* exit condition: invalid direction */	2415	return 0; /* exit condition: invalid direction */
2611		2416
2612	dx = x + freearr_x[dir];	2417	dx = x + freearr_x[dir];
…		…
2625	return 0;	2430	return 0;
2626		2431
2627	/* yes, can see. */	2432	/* yes, can see. */
2628	if (dir < 9)	2433	if (dir < 9)
2629	return 1;	2434	return 1;
		2435
2630	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2436	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2631	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2437	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2438	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2632	}	2439	}
2633
2634
2635		2440
2636	/*	2441	/*
2637	* can_pick(picker, item): finds out if an object is possible to be	2442	* can_pick(picker, item): finds out if an object is possible to be
2638	* picked up by the picker. Returnes 1 if it can be	2443	* picked up by the picker. Returnes 1 if it can be
2639	* picked up, otherwise 0.	2444	* picked up, otherwise 0.
…		…
2641	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2446	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2642	* core dumps if they do.	2447	* core dumps if they do.
2643	*	2448	*
2644	* Add a check so we can't pick up invisible objects (0.93.8)	2449	* Add a check so we can't pick up invisible objects (0.93.8)
2645	*/	2450	*/
2646
2647	int	2451	int
2648	can_pick (const object *who, const object *item)	2452	can_pick (const object *who, const object *item)
2649	{	2453	{
2650	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2454	return /*who->flag [FLAG_WIZ]|| */
2651	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2455	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2652	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2456	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2653	}	2457	}
2654
2655		2458
2656	/*	2459	/*
2657	* create clone from object to another	2460	* create clone from object to another
2658	*/	2461	*/
2659	object *	2462	object *
2660	object_create_clone (object *asrc)	2463	object::deep_clone ()
2661	{	2464	{
2662	object *	2465	assert (("deep_clone called on non-head object", is_head ()));
2663	dst = NULL, *tmp, *src, *part, *prev, *item;
2664		2466
2665	if (!asrc)	2467	object *dst = clone ();
2666	return NULL;
2667	src = asrc;
2668	if (src->head)
2669	src = src->head;
2670		2468
2671	prev = NULL;	2469	object *prev = dst;
2672	for (part = src; part; part = part->more)	2470	for (object *part = this->more; part; part = part->more)
2673	{	2471	{
2674	tmp = get_object ();	2472	object *tmp = part->clone ();
2675	copy_object (part, tmp);
2676	tmp->x -= src->x;
2677	tmp->y -= src->y;
2678	if (!part->head)
2679	{
2680	dst = tmp;
2681	tmp->head = NULL;
2682	}
2683	else
2684	{
2685	tmp->head = dst;	2473	tmp->head = dst;
2686	}
2687	tmp->more = NULL;
2688	if (prev)
2689	prev->more = tmp;	2474	prev->more = tmp;
2690	prev = tmp;	2475	prev = tmp;
2691	}	2476	}
2692		2477
2693	/*** copy inventory ***/
2694	for (item = src->inv; item; item = item->below)	2478	for (object *item = inv; item; item = item->below)
2695	{	2479	insert_ob_in_ob (item->deep_clone (), dst);
2696	(void) insert_ob_in_ob (object_create_clone (item), dst);
2697	}
2698		2480
2699	return dst;	2481	return dst;
2700	}
2701
2702	/* return true if the object was destroyed, 0 otherwise */
2703	int
2704	was_destroyed (const object *op, tag_t old_tag)
2705	{
2706	/* checking for FLAG_FREED isn't necessary, but makes this function more
2707	* robust */
2708	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2709	}
2710
2711	/* GROS - Creates an object using a string representing its content. */
2712
2713	/* Basically, we save the content of the string to a temp file, then call */
2714
2715	/* load_object on it. I admit it is a highly inefficient way to make things, */
2716
2717	/* but it was simple to make and allows reusing the load_object function. */
2718
2719	/* Remember not to use load_object_str in a time-critical situation. */
2720
2721	/* Also remember that multiparts objects are not supported for now. */
2722
2723	object *
2724	load_object_str (const char *obstr)
2725	{
2726	object *
2727	op;
2728	char
2729	filename[MAX_BUF];
2730
2731	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2732
2733	FILE *
2734	tempfile = fopen (filename, "w");
2735
2736	if (tempfile == NULL)
2737	{
2738	LOG (llevError, "Error - Unable to access load object temp file\n");
2739	return NULL;
2740	};
2741	fprintf (tempfile, obstr);
2742	fclose (tempfile);
2743
2744	op = get_object ();
2745
2746	object_thawer
2747	thawer (filename);
2748
2749	if (thawer)
2750	load_object (thawer, op, 0);
2751
2752	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2753	CLEAR_FLAG (op, FLAG_REMOVED);
2754
2755	return op;
2756	}	2482	}
2757		2483
2758	/* This returns the first object in who's inventory that	2484	/* This returns the first object in who's inventory that
2759	* has the same type and subtype match.	2485	* has the same type and subtype match.
2760	* returns NULL if no match.	2486	* returns NULL if no match.
2761	*/	2487	*/
2762	object *	2488	object *
2763	find_obj_by_type_subtype (const object *who, int type, int subtype)	2489	find_obj_by_type_subtype (const object *who, int type, int subtype)
2764	{	2490	{
2765	object *
2766	tmp;
2767
2768	for (tmp = who->inv; tmp; tmp = tmp->below)	2491	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2769	if (tmp->type == type && tmp->subtype == subtype)	2492	if (tmp->type == type && tmp->subtype == subtype)
2770	return tmp;	2493	return tmp;
2771		2494
2772	return NULL;	2495	return 0;
2773	}	2496	}
2774		2497
2775	/* If ob has a field named key, return the link from the list,	2498	shstr_tmp
2776	* otherwise return NULL.	2499	object::kv_get (shstr_tmp key) const
2777	*
2778	* key must be a passed in shared string - otherwise, this won't
2779	* do the desired thing.
2780	*/
2781	key_value *
2782	get_ob_key_link (const object *ob, const char *key)
2783	{	2500	{
2784	key_value *	2501	for (key_value *kv = key_values; kv; kv = kv->next)
2785	link;
2786
2787	for (link = ob->key_values; link != NULL; link = link->next)
2788	{
2789	if (link->key == key)	2502	if (kv->key == key)
		2503	return kv->value;
		2504
		2505	return shstr ();
		2506	}
		2507
		2508	void
		2509	object::kv_set (shstr_tmp key, shstr_tmp value)
		2510	{
		2511	for (key_value *kv = key_values; kv; kv = kv->next)
		2512	if (kv->key == key)
		2513	{
		2514	kv->value = value;
		2515	return;
		2516	}
		2517
		2518	key_value *kv = new key_value;
		2519
		2520	kv->next = key_values;
		2521	kv->key = key;
		2522	kv->value = value;
		2523
		2524	key_values = kv;
		2525	}
		2526
		2527	void
		2528	object::kv_del (shstr_tmp key)
		2529	{
		2530	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2531	if ((*kvp)->key == key)
		2532	{
		2533	key_value *kv = *kvp;
		2534	*kvp = (*kvp)->next;
		2535	delete kv;
		2536	return;
		2537	}
		2538	}
		2539
		2540	object::depth_iterator::depth_iterator (object *container)
		2541	: iterator_base (container)
		2542	{
		2543	while (item->inv)
		2544	item = item->inv;
		2545	}
		2546
		2547	void
		2548	object::depth_iterator::next ()
		2549	{
		2550	if (item->below)
		2551	{
		2552	item = item->below;
		2553
		2554	while (item->inv)
		2555	item = item->inv;
		2556	}
		2557	else
		2558	item = item->env;
		2559	}
		2560
		2561	const char *
		2562	object::flag_desc (char *desc, int len) const
		2563	{
		2564	char *p = desc;
		2565	bool first = true;
		2566
		2567	*p = 0;
		2568
		2569	for (int i = 0; i < NUM_FLAGS; i++)
		2570	{
		2571	if (len <= 10) // magic constant!
2790	{	2572	{
2791	return link;	2573	snprintf (p, len, ",...");
		2574	break;
2792	}	2575	}
2793	}
2794		2576
2795	return NULL;	2577	if (flag [i])
2796	}	2578	{
		2579	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2580	len -= cnt;
		2581	p += cnt;
		2582	first = false;
		2583	}
		2584	}
2797		2585
2798	/*	2586	return desc;
2799	* Returns the value of op has an extra_field for key, or NULL.	2587	}
2800	*	2588
2801	* The argument doesn't need to be a shared string.	2589	// return a suitable string describing an object in enough detail to find it
2802	*
2803	* The returned string is shared.
2804	*/
2805	const char *	2590	const char *
2806	get_ob_key_value (const object *op, const char *const key)	2591	object::debug_desc (char *info) const
2807	{	2592	{
2808	key_value *	2593	char flagdesc[512];
2809	link;	2594	char info2[256 * 4];
		2595	char *p = info;
		2596
		2597	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
		2598	count,
		2599	uuid.c_str (),
		2600	&name,
		2601	title ? ",title:\"" : "",
		2602	title ? (const char *)title : "",
		2603	title ? "\"" : "",
		2604	flag_desc (flagdesc, 512), type);
		2605
		2606	if (!flag[FLAG_REMOVED] && env)
		2607	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2608
		2609	if (map)
		2610	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
		2611
		2612	return info;
		2613	}
		2614
2810	const char *	2615	const char *
2811	canonical_key;	2616	object::debug_desc () const
		2617	{
		2618	static char info[3][256 * 4];
		2619	static int info_idx;
2812		2620
2813	canonical_key = shstr::find (key);	2621	return debug_desc (info [++info_idx % 3]);
		2622	}
2814		2623
2815	if (canonical_key == NULL)	2624	struct region *
2816	{	2625	object::region () const
2817	/* 1. There being a field named key on any object	2626	{
2818	* implies there'd be a shared string to find.	2627	return map ? map->region (x, y)
2819	* 2. Since there isn't, no object has this field.	2628	: region::default_region ();
2820	* 3. Therefore, *this* object doesn't have this field.	2629	}
2821	*/	2630
		2631	void
		2632	object::open_container (object *new_container)
		2633	{
		2634	if (container == new_container)
2822	return NULL;	2635	return;
		2636
		2637	object *old_container = container;
		2638
		2639	if (old_container)
2823	}	2640	{
		2641	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2642	return;
2824		2643
2825	/* This is copied from get_ob_key_link() above -	2644	#if 0
2826	* only 4 lines, and saves the function call overhead.	2645	// remove the "Close old_container" object.
		2646	if (object *closer = old_container->inv)
		2647	if (closer->type == CLOSE_CON)
		2648	closer->destroy ();
		2649	#endif
		2650
		2651	// make sure the container is available
		2652	esrv_send_item (this, old_container);
		2653
		2654	old_container->flag [FLAG_APPLIED] = false;
		2655	container = 0;
		2656
		2657	// client needs item update to make it work, client bug requires this to be separate
		2658	esrv_update_item (UPD_FLAGS, this, old_container);
		2659
		2660	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
		2661	play_sound (sound_find ("chest_close"));
		2662	}
		2663
		2664	if (new_container)
		2665	{
		2666	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2667	return;
		2668
		2669	// TODO: this does not seem to serve any purpose anymore?
		2670	#if 0
		2671	// insert the "Close Container" object.
		2672	if (archetype *closer = new_container->other_arch)
		2673	{
		2674	object *closer = new_container->other_arch->instance ();
		2675	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2676	new_container->insert (closer);
		2677	}
		2678	#endif
		2679
		2680	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
		2681
		2682	// make sure the container is available, client bug requires this to be separate
		2683	esrv_send_item (this, new_container);
		2684
		2685	new_container->flag [FLAG_APPLIED] = true;
		2686	container = new_container;
		2687
		2688	// client needs flag change
		2689	esrv_update_item (UPD_FLAGS, this, new_container);
		2690	esrv_send_inventory (this, new_container);
		2691	play_sound (sound_find ("chest_open"));
		2692	}
		2693	// else if (!old_container->env && contr && contr->ns)
		2694	// contr->ns->floorbox_reset ();
		2695	}
		2696
		2697	object *
		2698	object::force_find (shstr_tmp name)
		2699	{
		2700	/* cycle through his inventory to look for the MARK we want to
		2701	* place
2827	*/	2702	*/
2828	for (link = op->key_values; link != NULL; link = link->next)	2703	for (object *tmp = inv; tmp; tmp = tmp->below)
2829	{	2704	if (tmp->type == FORCE && tmp->slaying == name)
2830	if (link->key == canonical_key)	2705	return splay (tmp);
2831	{	2706
2832	return link->value;
2833	}
2834	}
2835	return NULL;	2707	return 0;
2836	}	2708	}
2837		2709
		2710	//-GPL
2838		2711
2839	/*	2712	void
2840	* Updates the canonical_key in op to value.	2713	object::force_set_timer (int duration)
2841	*
2842	* canonical_key is a shared string (value doesn't have to be).
2843	*
2844	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2845	* keys.
2846	*
2847	* Returns TRUE on success.
2848	*/
2849	int
2850	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2851	{	2714	{
2852	key_value *	2715	this->duration = 1;
2853	field = NULL, *last = NULL;	2716	this->speed_left = -1.f;
2854		2717
2855	for (field = op->key_values; field != NULL; field = field->next)	2718	this->set_speed (duration ? 1.f / duration : 0.f);
2856	{	2719	}
2857	if (field->key != canonical_key)
2858	{
2859	last = field;
2860	continue;
2861	}
2862		2720
2863	if (value)	2721	object *
2864	field->value = value;	2722	object::force_add (shstr_tmp name, int duration)
2865	else	2723	{
2866	{	2724	if (object *force = force_find (name))
2867	/* Basically, if the archetype has this key set,	2725	force->destroy ();
2868	* we need to store the null value so when we save
2869	* it, we save the empty value so that when we load,
2870	* we get this value back again.
2871	*/
2872	if (get_ob_key_link (&op->arch->clone, canonical_key))
2873	field->value = 0;
2874	else
2875	{
2876	if (last)
2877	last->next = field->next;
2878	else
2879	op->key_values = field->next;
2880		2726
2881	delete	2727	object *force = get_archetype (FORCE_NAME);
2882	field;	2728
2883	}	2729	force->slaying = name;
2884	}	2730	force->force_set_timer (duration);
		2731	force->flag [FLAG_APPLIED] = true;
		2732
		2733	return insert (force);
		2734	}
		2735
		2736	void
		2737	object::play_sound (faceidx sound) const
		2738	{
		2739	if (!sound)
2885	return TRUE;	2740	return;
		2741
		2742	if (is_on_map ())
		2743	map->play_sound (sound, x, y);
		2744	else if (object *pl = in_player ())
		2745	pl->contr->play_sound (sound);
		2746	}
		2747
		2748	void
		2749	object::say_msg (const char *msg) const
		2750	{
		2751	if (is_on_map ())
		2752	map->say_msg (msg, x, y);
		2753	else if (object *pl = in_player ())
		2754	pl->contr->play_sound (sound);
		2755	}
		2756
		2757	void
		2758	object::make_noise ()
		2759	{
		2760	// we do not model noise in the map, so instead put
		2761	// a temporary light into the noise source
		2762	// could use the map instead, but that's less reliable for our
		2763	// goal, which is to make invisibility a bit harder to exploit
		2764
		2765	// currently only works sensibly for players
		2766	if (!is_player ())
		2767	return;
		2768
		2769	// find old force, or create new one
		2770	object *force = force_find (shstr_noise_force);
		2771
		2772	if (force)
		2773	force->speed_left = -1.f; // patch old speed up
		2774	else
2886	}	2775	{
2887	/* IF we get here, key doesn't exist */	2776	force = archetype::get (shstr_noise_force);
2888		2777
2889	/* No field, we'll have to add it. */	2778	force->slaying = shstr_noise_force;
		2779	force->stats.food = 1;
		2780	force->speed_left = -1.f;
2890		2781
2891	if (!add_key)	2782	force->set_speed (1.f / 4.f);
		2783	force->flag [FLAG_IS_USED_UP] = true;
		2784	force->flag [FLAG_APPLIED] = true;
		2785
		2786	insert (force);
2892	{	2787	}
2893	return FALSE;	2788	}
		2789
		2790	void object::change_move_type (MoveType mt)
		2791	{
		2792	if (move_type == mt)
		2793	return;
		2794
		2795	if (is_on_map ())
2894	}	2796	{
2895	/* There isn't any good reason to store a null	2797	// we are on the map, so handle move_on/off effects
2896	* value in the key/value list. If the archetype has	2798	remove ();
2897	* this key, then we should also have it, so shouldn't	2799	move_type = mt;
2898	* be here. If user wants to store empty strings,	2800	map->insert (this, x, y, this);
2899	* should pass in ""	2801	}
		2802	else
		2803	move_type = mt;
		2804	}
		2805
		2806	/* object should be a player.
		2807	* we return the object the player has marked with the 'mark' command
		2808	* below. If no match is found (or object has changed), we return
		2809	* NULL. We leave it up to the calling function to print messages if
		2810	* nothing is found.
2900	*/	2811	*/
2901	if (value == NULL)	2812	object *
		2813	object::mark () const
		2814	{
		2815	if (contr && contr->mark && contr->mark->env == this)
		2816	return contr->mark;
		2817	else
2902	return TRUE;	2818	return 0;
2903
2904	field = new key_value;
2905
2906	field->key = canonical_key;
2907	field->value = value;
2908	/* Usual prepend-addition. */
2909	field->next = op->key_values;
2910	op->key_values = field;
2911
2912	return TRUE;
2913	}	2819	}
2914		2820
2915	/*	2821	// put marked object first in the inventory
2916	* Updates the key in op to value.	2822	// this is used by identify-like spells so players can influence
2917	*	2823	// the order a bit.
2918	* If add_key is FALSE, this will only update existing keys,	2824	void
2919	* and not add new ones.	2825	object::splay_marked ()
2920	* In general, should be little reason FALSE is ever passed in for add_key
2921	*
2922	* Returns TRUE on success.
2923	*/
2924	int
2925	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2926	{	2826	{
2927	shstr	2827	if (object *marked = mark ())
2928	key_ (key);	2828	splay (marked);
2929
2930	return set_ob_key_value_s (op, key_, value, add_key);
2931	}	2829	}
		2830

Diff Legend

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