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

Diff Legend

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