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.133 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.310 by root, Thu Dec 17 01:04:37 2009 UTC

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

Diff Legend

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