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.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.309 by root, Sun Nov 29 17:41:07 2009 UTC

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

Diff Legend

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