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.143 by root, Tue May 1 05:48:20 2007 UTC vs.
Revision 1.323 by root, Sun Apr 11 23:56:09 2010 UTC

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

Diff Legend

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