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.145 by root, Mon May 7 03:05:58 2007 UTC vs.
Revision 1.334 by root, Fri Apr 23 09:22:46 2010 UTC

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

Diff Legend

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