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.203 by root, Fri Apr 11 13:59:05 2008 UTC vs.
Revision 1.308 by root, Sun Nov 29 17:26:28 2009 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	25	#include <global.h>
28	#include <stdio.h>	26	#include <stdio.h>
29	#include <sys/types.h>	27	#include <sys/types.h>
30	#include <sys/uio.h>	28	#include <sys/uio.h>
31	#include <object.h>	29	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	30	#include <sproto.h>
34	#include <loader.h>	31	#include <loader.h>
35		32
36	#include <bitset>	33	#include <bitset>
37		34
38	UUID UUID::cur;	35	UUID UUID::cur;
		36	static uint64_t seq_next_save;
39	static const uint64 UUID_SKIP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
40		39
41	objectvec objects;	40	objectvec objects;
42	activevec actives;	41	activevec actives;
		42
		43	//+GPL
43		44
44	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
45	0,	46	0,
46	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
51	0,	52	0,
52	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	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
55	};	56	};
56	int maxfree[SIZEOFFREE] = {
57	0,
58	9, 10, 13, 14, 17, 18, 21, 22,
59	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
60	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
61	};
62	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
63	0,	58	0,
64	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	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
67	};	62	};
68		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
69	static void	71	static void
70	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
71	{	73	{
72	CALL_BEGIN (2);	74	CALL_BEGIN (2);
73	CALL_ARG_SV (newSVval64 (skip));	75	CALL_ARG_SV (newSVval64 (skip));
…		…
75	CALL_CALL ("cf::write_uuid", G_DISCARD);	77	CALL_CALL ("cf::write_uuid", G_DISCARD);
76	CALL_END;	78	CALL_END;
77	}	79	}
78		80
79	static void	81	static void
80	read_uuid (void)	82	read_uuid ()
81	{	83	{
82	char filename[MAX_BUF];	84	char filename[MAX_BUF];
83		85
84	sprintf (filename, "%s/uuid", settings.localdir);	86	sprintf (filename, "%s/uuid", settings.localdir);
		87
		88	seq_next_save = 0;
85		89
86	FILE *fp;	90	FILE *fp;
87		91
88	if (!(fp = fopen (filename, "r")))	92	if (!(fp = fopen (filename, "r")))
89	{	93	{
90	if (errno == ENOENT)	94	if (errno == ENOENT)
91	{	95	{
92	LOG (llevInfo, "RESET uid to 1\n");	96	LOG (llevInfo, "RESET uid to 1\n");
93	UUID::cur.seq = 0;	97	UUID::cur.seq = 0;
94	write_uuid (UUID_SKIP, true);	98	write_uuid (UUID_GAP, true);
95	return;	99	return;
96	}	100	}
97		101
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	103	_exit (1);
100	}	104	}
101		105
102	UUID::BUF buf;	106	char buf [UUID::MAX_LEN];
103	buf[0] = 0;	107	buf[0] = 0;
104	fgets (buf, sizeof (buf), fp);	108	fgets (buf, sizeof (buf), fp);
105		109
106	if (!UUID::cur.parse (buf))	110	if (!UUID::cur.parse (buf))
107	{	111	{
…		…
109	_exit (1);	113	_exit (1);
110	}	114	}
111		115
112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());	116	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113		117
114	write_uuid (UUID_SKIP, true);	118	write_uuid (UUID_GAP, true);
115	fclose (fp);	119	fclose (fp);
116	}	120	}
117		121
118	UUID	122	UUID
119	UUID::gen ()	123	UUID::gen ()
120	{	124	{
121	UUID uid;	125	UUID uid;
122		126
123	uid.seq = ++cur.seq;	127	uid.seq = ++cur.seq;
124		128
125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))	129	if (expect_false (cur.seq >= seq_next_save))
		130	{
		131	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
126	write_uuid (UUID_SKIP, false);	132	write_uuid (UUID_GAP, false);
		133	}
		134
127		135
128	return uid;	136	return uid;
129	}	137	}
130		138
131	void	139	void
132	UUID::init ()	140	UUID::init ()
133	{	141	{
134	read_uuid ();	142	read_uuid ();
135	}	143	}
136		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
137	/* 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. */
138	static int	211	static bool
139	compare_ob_value_lists_one (const object *wants, const object *has)	212	compare_ob_value_lists_one (const object *wants, const object *has)
140	{	213	{
141	key_value *wants_field;
142
143	/* 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
144	* 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
145	* different structure or at least keep the lists sorted...	216	* different structure or at least keep the lists sorted...
146	*/	217	*/
147		218
148	/* For each field in wants, */	219	/* For each field in wants, */
149	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)
150	{	221	if (has->kv_get (kv->key) != kv->value)
151	key_value *has_field;	222	return false;
152
153	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);
155
156	if (has_field == NULL)
157	{
158	/* No field with that name. */
159	return FALSE;
160	}
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168
169	/* If we get here, we found a match. Now for the next field in wants. */
170	}
171		223
172	/* 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. */
173	return TRUE;	225	return true;
174	}	226	}
175		227
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	228	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	229	static bool
178	compare_ob_value_lists (const object *ob1, const object *ob2)	230	compare_ob_value_lists (const object *ob1, const object *ob2)
179	{	231	{
180	/* 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,
181	* so we need to run the comparison *twice*. :(	233	* so we need to run the comparison *twice*. :(
182	*/	234	*/
183	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);
184	}	237	}
185		238
186	/* 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
187	* they can be merged together.	240	* they can be merged together.
188	*	241	*
…		…
198	bool object::can_merge_slow (object *ob1, object *ob2)	251	bool object::can_merge_slow (object *ob1, object *ob2)
199	{	252	{
200	/* A couple quicksanity checks */	253	/* A couple quicksanity checks */
201	if (ob1 == ob2	254	if (ob1 == ob2
202	|| ob1->type != ob2->type	255	|| ob1->type != ob2->type
203	|| ob1->speed != ob2->speed	256	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
204	|| ob1->value != ob2->value	257	|| ob1->value != ob2->value
205	|| ob1->name != ob2->name)	258	|| ob1->name != ob2->name)
206	return 0;	259	return 0;
207		260
208	//TODO: this ain't working well, use nicer and correct overflow check
209	/* 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
210	* value could not be stored in a sint32 (which unfortunately sometimes is	262	* is always 0 .. 2**31-1 */
211	* used to store nrof).	263	if (ob1->nrof > 0x7fffffff - ob2->nrof)
212	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)
214	return 0;	264	return 0;
215		265
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	266	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* 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
218	* 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
219	* 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
220	* flags lose any meaning.	270	* flags lose any meaning.
221	*/	271	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	272	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	273	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		274
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	275	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	276	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		277
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	278	if (ob1->arch->archname != ob2->arch->archname
229	|| ob1->arch != ob2->arch
230	|| ob1->name != ob2->name	279	|| ob1->name != ob2->name
231	|| ob1->title != ob2->title	280	|| ob1->title != ob2->title
232	|| ob1->msg != ob2->msg	281	|| ob1->msg != ob2->msg
233	|| ob1->weight != ob2->weight	282	|| ob1->weight != ob2->weight
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	|| ob1->attacktype != ob2->attacktype	283	|| ob1->attacktype != ob2->attacktype
237	|| ob1->magic != ob2->magic	284	|| ob1->magic != ob2->magic
238	|| ob1->slaying != ob2->slaying	285	|| ob1->slaying != ob2->slaying
239	|| ob1->skill != ob2->skill	286	|| ob1->skill != ob2->skill
240	|| ob1->value != ob2->value	287	|| ob1->value != ob2->value
241	|| ob1->animation_id != ob2->animation_id	288	|| ob1->animation_id != ob2->animation_id
		289	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
242	|| ob1->client_type != ob2->client_type	290	|| ob1->client_type != ob2->client_type
243	|| ob1->materialname != ob2->materialname	291	|| ob1->material != ob2->material
244	|| ob1->lore != ob2->lore	292	|| ob1->lore != ob2->lore
245	|| ob1->subtype != ob2->subtype	293	|| ob1->subtype != ob2->subtype
246	|| ob1->move_type != ob2->move_type	294	|| ob1->move_type != ob2->move_type
247	|| ob1->move_block != ob2->move_block	295	|| ob1->move_block != ob2->move_block
248	|| ob1->move_allow != ob2->move_allow	296	|| ob1->move_allow != ob2->move_allow
249	|| ob1->move_on != ob2->move_on	297	|| ob1->move_on != ob2->move_on
250	|| ob1->move_off != ob2->move_off	298	|| ob1->move_off != ob2->move_off
251	|| ob1->move_slow != ob2->move_slow	299	|| ob1->move_slow != ob2->move_slow
252	|| 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)))
253	return 0;	303	return 0;
254		304
		305	if ((ob1->flag ^ ob2->flag)
		306	.reset (FLAG_INV_LOCKED)
		307	.reset (FLAG_REMOVED)
		308	.any ())
		309	return 0;
		310
255	/* This is really a spellbook check - really, we should	311	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	312	* not merge objects with real inventories, as splitting them
		313	* is hard.
257	*/	314	*/
258	if (ob1->inv || ob2->inv)	315	if (ob1->inv || ob2->inv)
259	{	316	{
260	if (!(ob1->inv && ob2->inv))	317	if (!(ob1->inv && ob2->inv))
261	return 0; /* inventories differ in length */	318	return 0; /* inventories differ in length */
262		319
263	if (ob1->inv->below || ob2->inv->below)	320	if (ob1->inv->below || ob2->inv->below)
264	return 0; /* more than one object in inv */	321	return 0; /* more than one object in inv */
265		322
266	if (!object::can_merge (ob1->inv, ob2->inv))	323	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0; /* inventory objexts differ */	324	return 0; /* inventory objects differ */
268		325
269	/* 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
270	* if it is valid.	327	* if it is valid.
271	*/	328	*/
272	}	329	}
…		…
291	if (ob1->level != ob2->level)	348	if (ob1->level != ob2->level)
292	return 0;	349	return 0;
293	break;	350	break;
294	}	351	}
295		352
296	if (ob1->key_values != NULL || ob2->key_values != NULL)	353	if (ob1->key_values || ob2->key_values)
297	{	354	{
298	/* At least one of these has key_values. */	355	/* At least one of these has key_values. */
299	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	356	if ((!ob1->key_values) != (!ob2->key_values))
300	/* One has fields, but the other one doesn't. */	357	return 0; /* One has fields, but the other one doesn't. */
301	return 0;	358
302	else if (!compare_ob_value_lists (ob1, ob2))	359	if (!compare_ob_value_lists (ob1, ob2))
303	return 0;	360	return 0;
304	}	361	}
305		362
306	if (ob1->self || ob2->self)	363	if (ob1->self || ob2->self)
307	{	364	{
…		…
313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	370	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	371	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
315		372
316	if (k1 != k2)	373	if (k1 != k2)
317	return 0;	374	return 0;
		375
318	else if (k1 == 0)	376	if (k1 == 0)
319	return 1;	377	return 1;
		378
320	else if (!cfperl_can_merge (ob1, ob2))	379	if (!cfperl_can_merge (ob1, ob2))
321	return 0;	380	return 0;
322	}	381	}
323	}	382	}
324		383
325	/* Everything passes, must be OK. */	384	/* Everything passes, must be OK. */
326	return 1;	385	return 1;
327	}	386	}
328		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
329	/*	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	/*
330	* sum_weight() is a recursive function which calculates the weight	462	* this is a recursive function which calculates the weight
331	* 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
332	* containers are carrying, and sums it up.	464	* containers are carrying, and sums it up.
333	*/	465	*/
334	long	466	void
335	sum_weight (object *op)	467	object::update_weight ()
336	{	468	{
337	long sum;	469	sint32 sum = 0;
338	object *inv;
339		470
340	for (sum = 0, inv = op->inv; inv; inv = inv->below)	471	for (object *op = inv; op; op = op->below)
341	{	472	{
342	if (inv->inv)	473	if (op->inv)
343	sum_weight (inv);	474	op->update_weight ();
344		475
345	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	476	sum += op->total_weight ();
		477	}
		478
		479	sum = weight_adjust_for (this, sum);
		480
		481	if (sum != carrying)
346	}	482	{
347
348	if (op->type == CONTAINER && op->stats.Str)
349	sum = (sum * (100 - op->stats.Str)) / 100;
350
351	if (op->carrying != sum)
352	op->carrying = sum;	483	carrying = sum;
353		484
354	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	}
355	}	489	}
356		490
357	/**	491	/*
358	* Return the outermost environment object for a given object.	492	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
359	*/
360
361	object *
362	object_get_env_recursive (object *op)
363	{
364	while (op->env != NULL)
365	op = op->env;
366	return op;
367	}
368
369	/*
370	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
371	* Some error messages.
372	* The result of the dump is stored in the static global errmsg array.
373	*/	493	*/
374	char *	494	char *
375	dump_object (object *op)	495	dump_object (object *op)
376	{	496	{
377	if (!op)	497	if (!op)
…		…
380	object_freezer freezer;	500	object_freezer freezer;
381	op->write (freezer);	501	op->write (freezer);
382	return freezer.as_string ();	502	return freezer.as_string ();
383	}	503	}
384		504
385	/*	505	char *
386	* get_nearest_part(multi-object, object 2) returns the part of the	506	object::as_string ()
387	* multi-object 1 which is closest to the second object.
388	* If it's not a multi-object, it is returned.
389	*/
390	object *
391	get_nearest_part (object *op, const object *pl)
392	{	507	{
393	object *tmp, *closest;	508	return dump_object (this);
394	int last_dist, i;
395
396	if (op->more == NULL)
397	return op;
398	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
399	if ((i = distance (tmp, pl)) < last_dist)
400	closest = tmp, last_dist = i;
401	return closest;
402	}	509	}
403		510
404	/*	511	/*
405	* 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.
406	*/	514	*/
407	object *	515	object *
408	find_object (tag_t i)	516	find_object (tag_t i)
409	{	517	{
410	for_all_objects (op)	518	for_all_objects (op)
…		…
421	*/	529	*/
422	object *	530	object *
423	find_object_name (const char *str)	531	find_object_name (const char *str)
424	{	532	{
425	shstr_cmp str_ (str);	533	shstr_cmp str_ (str);
426	object *op;
427		534
		535	if (str_)
428	for_all_objects (op)	536	for_all_objects (op)
429	if (op->name == str_)	537	if (op->name == str_)
430	break;	538	return op;
431		539
432	return op;	540	return 0;
433	}	541	}
434		542
435	/*	543	/*
436	* 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
437	* skill and experience objects.	545	* skill and experience objects.
…		…
499	update_stats ();	607	update_stats ();
500		608
501	new_draw_info_format (NDI_UNIQUE, 0, this,	609	new_draw_info_format (NDI_UNIQUE, 0, this,
502	"You try to balance all your items at once, "	610	"You try to balance all your items at once, "
503	"but the %s is just too much for your body. "	611	"but the %s is just too much for your body. "
504	"[You need to unapply some items first.]", &ob->name);	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);
505	return false;	614	return false;
506	}	615	}
507		616
508	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	617	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
509	}	618	}
…		…
535	}	644	}
536		645
537	op->key_values = 0;	646	op->key_values = 0;
538	}	647	}
539		648
540	object &	649	/*
541	object::operator =(const object &src)	650	* copy_to first frees everything allocated by the dst object,
		651	* and then copies the contents of itself into the second
		652	* object, allocating what needs to be allocated. Basically, any
		653	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		654	* if the first object is freed, the pointers in the new object
		655	* will point at garbage.
		656	*/
		657	void
		658	object::copy_to (object *dst)
542	{	659	{
543	bool is_freed = flag [FLAG_FREED];	660	dst->remove ();
544	bool is_removed = flag [FLAG_REMOVED];
545
546	*(object_copy *)this = src;	661	*(object_copy *)dst = *this;
547
548	flag [FLAG_FREED] = is_freed;
549	flag [FLAG_REMOVED] = is_removed;	662	dst->flag [FLAG_REMOVED] = true;
550		663
551	/* Copy over key_values, if any. */	664	/* Copy over key_values, if any. */
552	if (src.key_values)	665	if (key_values)
553	{	666	{
554	key_value *tail = 0;	667	key_value *tail = 0;
555	key_values = 0;	668	dst->key_values = 0;
556		669
557	for (key_value *i = src.key_values; i; i = i->next)	670	for (key_value *i = key_values; i; i = i->next)
558	{	671	{
559	key_value *new_link = new key_value;	672	key_value *new_link = new key_value;
560		673
561	new_link->next = 0;	674	new_link->next = 0;
562	new_link->key = i->key;	675	new_link->key = i->key;
563	new_link->value = i->value;	676	new_link->value = i->value;
564		677
565	/* Try and be clever here, too. */	678	/* Try and be clever here, too. */
566	if (!key_values)	679	if (!dst->key_values)
567	{	680	{
568	key_values = new_link;	681	dst->key_values = new_link;
569	tail = new_link;	682	tail = new_link;
570	}	683	}
571	else	684	else
572	{	685	{
573	tail->next = new_link;	686	tail->next = new_link;
574	tail = new_link;	687	tail = new_link;
575	}	688	}
576	}	689	}
577	}	690	}
578	}
579		691
580	/*	692	dst->activate ();
581	* copy_to first frees everything allocated by the dst object,
582	* and then copies the contents of itself into the second
583	* object, allocating what needs to be allocated. Basically, any
584	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
585	* if the first object is freed, the pointers in the new object
586	* will point at garbage.
587	*/
588	void
589	object::copy_to (object *dst)
590	{
591	*dst = *this;
592
593	if (speed < 0)
594	dst->speed_left -= rndm ();
595
596	dst->set_speed (dst->speed);
597	}	693	}
598		694
599	void	695	void
600	object::instantiate ()	696	object::instantiate ()
601	{	697	{
602	if (!uuid.seq) // HACK	698	if (!uuid.seq) // HACK
603	uuid = UUID::gen ();	699	uuid = UUID::gen ();
604		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
605	speed_left = -0.1f;	705	speed_left = -1.;
		706
606	/* 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
607	* 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.
608	* 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
609	* values for the body_used info, so when items are created	710	* values for the body_used info, so when items are created
610	* for it, they can be properly equipped.	711	* for it, they can be properly equipped.
…		…
618	object *	719	object *
619	object::clone ()	720	object::clone ()
620	{	721	{
621	object *neu = create ();	722	object *neu = create ();
622	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
623	return neu;	730	return neu;
624	}	731	}
625		732
626	/*	733	/*
627	* 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
…		…
644	* 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.
645	*/	752	*/
646	void	753	void
647	object::set_speed (float speed)	754	object::set_speed (float speed)
648	{	755	{
649	if (flag [FLAG_FREED] && speed)
650	{
651	LOG (llevError, "Object %s is freed but has speed.\n", &name);
652	speed = 0;
653	}
654
655	this->speed = speed;	756	this->speed = speed;
656		757
657	if (has_active_speed ())	758	if (has_active_speed ())
658	activate ();	759	activate ();
659	else	760	else
…		…
678	* UP_OBJ_FACE: only the objects face has changed.	779	* UP_OBJ_FACE: only the objects face has changed.
679	*/	780	*/
680	void	781	void
681	update_object (object *op, int action)	782	update_object (object *op, int action)
682	{	783	{
683	if (op == NULL)	784	if (!op)
684	{	785	{
685	/* this should never happen */	786	/* this should never happen */
686	LOG (llevDebug, "update_object() called for NULL object.\n");	787	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
687	return;	788	return;
688	}	789	}
689		790
690	if (op->env)	791	if (!op->is_on_map ())
691	{	792	{
692	/* Animation is currently handled by client, so nothing	793	/* Animation is currently handled by client, so nothing
693	* to do in this case.	794	* to do in this case.
694	*/	795	*/
695	return;	796	return;
696	}	797	}
697
698	/* If the map is saving, don't do anything as everything is
699	* going to get freed anyways.
700	*/
701	if (!op->map || op->map->in_memory == MAP_SAVING)
702	return;
703		798
704	/* make sure the object is within map boundaries */	799	/* make sure the object is within map boundaries */
705	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)
706	{	801	{
707	LOG (llevError, "update_object() called for object out of map!\n");	802	LOG (llevError, "update_object() called for object out of map!\n");
…		…
715		810
716	if (!(m.flags_ & P_UPTODATE))	811	if (!(m.flags_ & P_UPTODATE))
717	/* nop */;	812	/* nop */;
718	else if (action == UP_OBJ_INSERT)	813	else if (action == UP_OBJ_INSERT)
719	{	814	{
		815	#if 0
720	// this is likely overkill, TODO: revisit (schmorp)	816	// this is likely overkill, TODO: revisit (schmorp)
721	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	817	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
722	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	818	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
723	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	819	|| (op->is_player () && !(m.flags_ & P_PLAYER))
724	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	820	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
725	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	821	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
726	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	822	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
727	|| (m.move_on | op->move_on ) != m.move_on	823	|| (m.move_on | op->move_on ) != m.move_on
728	|| (m.move_off | op->move_off ) != m.move_off	824	|| (m.move_off | op->move_off ) != m.move_off
729	|| (m.move_slow | op->move_slow) != m.move_slow	825	|| (m.move_slow | op->move_slow) != m.move_slow
730	/* 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
731	* to have move_allow right now.	827	* have move_allow right now.
732	*/	828	*/
733	|| ((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
734	|| 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)
735	m.flags_ = 0;	833	m.invalidate ();
		834	#endif
736	}	835	}
737	/* if the object is being removed, we can't make intelligent	836	/* if the object is being removed, we can't make intelligent
738	* decisions, because remove_ob can't really pass the object	837	* decisions, because remove_ob can't really pass the object
739	* that is being removed.	838	* that is being removed.
740	*/	839	*/
741	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	840	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
742	m.flags_ = 0;	841	m.invalidate ();
743	else if (action == UP_OBJ_FACE)	842	else if (action == UP_OBJ_FACE)
744	/* Nothing to do for that case */ ;	843	/* Nothing to do for that case */ ;
745	else	844	else
746	LOG (llevError, "update_object called with invalid action: %d\n", action);	845	LOG (llevError, "update_object called with invalid action: %d\n", action);
747		846
…		…
751		850
752	object::object ()	851	object::object ()
753	{	852	{
754	SET_FLAG (this, FLAG_REMOVED);	853	SET_FLAG (this, FLAG_REMOVED);
755		854
756	expmul = 1.0;	855	//expmul = 1.0; declared const for the time being
757	face = blank_face;	856	face = blank_face;
		857	material = MATERIAL_NULL;
758	}	858	}
759		859
760	object::~object ()	860	object::~object ()
761	{	861	{
762	unlink ();	862	unlink ();
…		…
791	/* If already on active list, don't do anything */	891	/* If already on active list, don't do anything */
792	if (active)	892	if (active)
793	return;	893	return;
794		894
795	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
796	actives.insert (this);	900	actives.insert (this);
		901	}
797	}	902	}
798		903
799	void	904	void
800	object::activate_recursive ()	905	object::activate_recursive ()
801	{	906	{
…		…
850	object::destroy_inv (bool drop_to_ground)	955	object::destroy_inv (bool drop_to_ground)
851	{	956	{
852	// need to check first, because the checks below might segfault	957	// need to check first, because the checks below might segfault
853	// as we might be on an invalid mapspace and crossfire code	958	// as we might be on an invalid mapspace and crossfire code
854	// is too buggy to ensure that the inventory is empty.	959	// is too buggy to ensure that the inventory is empty.
855	// corollary: if you create arrows etc. with stuff in tis inventory,	960	// corollary: if you create arrows etc. with stuff in its inventory,
856	// cf will crash below with off-map x and y	961	// cf will crash below with off-map x and y
857	if (!inv)	962	if (!inv)
858	return;	963	return;
859		964
860	/* Only if the space blocks everything do we not process -	965	/* Only if the space blocks everything do we not process -
861	* if some form of movement is allowed, let objects	966	* if some form of movement is allowed, let objects
862	* drop on that space.	967	* drop on that space.
863	*/	968	*/
864	if (!drop_to_ground	969	if (!drop_to_ground
865	|| !map	970	|| !map
866	|| map->in_memory != MAP_IN_MEMORY	971	|| map->in_memory != MAP_ACTIVE
867	|| map->nodrop	972	|| map->no_drop
868	|| ms ().move_block == MOVE_ALL)	973	|| ms ().move_block == MOVE_ALL)
869	{	974	{
870	while (inv)	975	while (inv)
871	{
872	inv->destroy_inv (drop_to_ground);
873	inv->destroy ();	976	inv->destroy ();
874	}
875	}	977	}
876	else	978	else
877	{ /* Put objects in inventory onto this space */	979	{ /* Put objects in inventory onto this space */
878	while (inv)	980	while (inv)
879	{	981	{
…		…
897	object *op = new object;	999	object *op = new object;
898	op->link ();	1000	op->link ();
899	return op;	1001	return op;
900	}	1002	}
901		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
902	void	1025	void
903	object::do_destroy ()	1026	object::do_destroy ()
904	{	1027	{
905	attachable::do_destroy ();
906
907	if (flag [FLAG_IS_LINKED])	1028	if (flag [FLAG_IS_LINKED])
908	remove_button_link (this);	1029	remove_link ();
909		1030
910	if (flag [FLAG_FRIENDLY])	1031	if (flag [FLAG_FRIENDLY])
911	remove_friendly_object (this);	1032	remove_friendly_object (this);
912		1033
913	if (!flag [FLAG_REMOVED])
914	remove ();	1034	remove ();
915		1035
916	destroy_inv (true);	1036	attachable::do_destroy ();
917		1037
918	deactivate ();	1038	deactivate ();
919	unlink ();	1039	unlink ();
920		1040
921	flag [FLAG_FREED] = 1;	1041	flag [FLAG_FREED] = 1;
922		1042
923	// hack to ensure that freed objects still have a valid map	1043	// hack to ensure that freed objects still have a valid map
924	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes
926
927	if (!freed_map)
928	{
929	freed_map = new maptile;
930
931	freed_map->path = "<freed objects map>";
932	freed_map->name = "/internal/freed_objects_map";
933	freed_map->width = 3;
934	freed_map->height = 3;
935	freed_map->nodrop = 1;
936
937	freed_map->alloc ();
938	freed_map->in_memory = MAP_IN_MEMORY;
939	}
940
941	map = freed_map;	1044	map = &freed_map;
942	x = 1;	1045	x = 1;
943	y = 1;	1046	y = 1;
944	}
945		1047
946	if (more)	1048	if (more)
947	{	1049	{
948	more->destroy ();	1050	more->destroy ();
949	more = 0;	1051	more = 0;
…		…
957	attacked_by = 0;	1059	attacked_by = 0;
958	current_weapon = 0;	1060	current_weapon = 0;
959	}	1061	}
960		1062
961	void	1063	void
962	object::destroy (bool destroy_inventory)	1064	object::destroy ()
963	{	1065	{
964	if (destroyed ())	1066	if (destroyed ())
965	return;	1067	return;
966		1068
967	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
968	destroy_inv (false);	1076	destroy_inv (false);
969		1077
970	if (is_head ())	1078	if (is_head ())
971	if (sound_destroy)	1079	if (sound_destroy)
972	play_sound (sound_destroy);	1080	play_sound (sound_destroy);
973	else if (flag [FLAG_MONSTER])	1081	else if (flag [FLAG_MONSTER])
974	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1082	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
975		1083
976	attachable::destroy ();	1084	attachable::destroy ();
977	}
978
979	/*
980	* sub_weight() recursively (outwards) subtracts a number from the
981	* weight of an object (and what is carried by it's environment(s)).
982	*/
983	void
984	sub_weight (object *op, signed long weight)
985	{
986	while (op != NULL)
987	{
988	if (op->type == CONTAINER)
989	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
990
991	op->carrying -= weight;
992	op = op->env;
993	}
994	}	1085	}
995		1086
996	/* op->remove ():	1087	/* op->remove ():
997	* 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
998	* 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
…		…
1001	* the previous environment.	1092	* the previous environment.
1002	*/	1093	*/
1003	void	1094	void
1004	object::do_remove ()	1095	object::do_remove ()
1005	{	1096	{
1006	object *tmp, *last = 0;	1097	if (flag [FLAG_REMOVED])
1007	object *otmp;
1008
1009	if (QUERY_FLAG (this, FLAG_REMOVED))
1010	return;	1098	return;
1011		1099
1012	SET_FLAG (this, FLAG_REMOVED);
1013	INVOKE_OBJECT (REMOVE, this);	1100	INVOKE_OBJECT (REMOVE, this);
		1101
		1102	flag [FLAG_REMOVED] = true;
1014		1103
1015	if (more)	1104	if (more)
1016	more->remove ();	1105	more->remove ();
1017		1106
1018	/*	1107	/*
1019	* In this case, the object to be removed is in someones	1108	* In this case, the object to be removed is in someones
1020	* inventory.	1109	* inventory.
1021	*/	1110	*/
1022	if (env)	1111	if (env)
1023	{	1112	{
1024	if (nrof)	1113	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1025	sub_weight (env, weight * nrof);	1114	if (object *pl = visible_to ())
1026	else	1115	esrv_del_item (pl->contr, count);
1027	sub_weight (env, weight + carrying);	1116	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1028		1117
1029	/* NO_FIX_PLAYER is set when a great many changes are being	1118	adjust_weight (env, -total_weight ());
1030	* made to players inventory. If set, avoiding the call
1031	* to save cpu time.
1032	*/
1033	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1034	otmp->update_stats ();
1035		1119
1036	if (above)	1120	object *pl = in_player ();
1037	above->below = below;
1038	else
1039	env->inv = below;
1040
1041	if (below)
1042	below->above = above;
1043		1121
1044	/* we set up values so that it could be inserted into	1122	/* we set up values so that it could be inserted into
1045	* 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
1046	* to the caller to decide what we want to do.	1124	* to the caller to decide what we want to do.
1047	*/	1125	*/
1048	x = env->x, y = env->y;
1049	map = env->map;	1126	map = env->map;
1050	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;
1051	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	}
1052	}	1145	}
1053	else if (map)	1146	else if (map)
1054	{	1147	{
1055	if (type == PLAYER)
1056	{
1057	// leaving a spot always closes any open container on the ground
1058	if (container && !container->env)
1059	// this causes spurious floorbox updates, but it ensures
1060	// that the CLOSE event is being sent.
1061	close_container ();
1062
1063	--map->players;
1064	map->touch ();
1065	}
1066
1067	map->dirty = true;	1148	map->dirty = true;
1068	mapspace &ms = this->ms ();	1149	mapspace &ms = this->ms ();
1069		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
1070	/* link the object above us */	1176	/* link the object above us */
1071	if (above)	1177	// re-link, make sure compiler can easily use cmove
1072	above->below = below;	1178	*(above ? &above->below : &ms.top) = below;
1073	else	1179	*(below ? &below->above : &ms.bot) = above;
1074	ms.top = below; /* we were top, set new top */
1075
1076	/* Relink the object below us, if there is one */
1077	if (below)
1078	below->above = above;
1079	else
1080	{
1081	/* Nothing below, which means we need to relink map object for this space
1082	* use translated coordinates in case some oddness with map tiling is
1083	* evident
1084	*/
1085	if (GET_MAP_OB (map, x, y) != this)
1086	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 ());
1087
1088	ms.bot = above; /* goes on above it. */
1089	}
1090		1180
1091	above = 0;	1181	above = 0;
1092	below = 0;	1182	below = 0;
1093		1183
		1184	ms.invalidate ();
		1185
1094	if (map->in_memory == MAP_SAVING)	1186	if (map->in_memory == MAP_SAVING)
1095	return;	1187	return;
1096		1188
1097	int check_walk_off = !flag [FLAG_NO_APPLY];	1189	int check_walk_off = !flag [FLAG_NO_APPLY];
1098		1190
1099	if (object *pl = ms.player ())	1191	if (object *pl = ms.player ())
1100	{	1192	{
1101	if (pl->container == this)	1193	if (pl->container_ () == this)
1102	/* If a container that the player is currently using somehow gets	1194	/* If a container that the player is currently using somehow gets
1103	* removed (most likely destroyed), update the player view	1195	* removed (most likely destroyed), update the player view
1104	* appropriately.	1196	* appropriately.
1105	*/	1197	*/
1106	pl->close_container ();	1198	pl->close_container ();
1107		1199
		1200	//TODO: the floorbox prev/next might need updating
		1201	//esrv_del_item (pl->contr, count);
		1202	//TODO: update floorbox to preserve ordering
		1203	if (pl->contr->ns)
1108	pl->contr->ns->floorbox_update ();	1204	pl->contr->ns->floorbox_update ();
1109	}	1205	}
1110		1206
		1207	if (check_walk_off)
1111	for (tmp = ms.bot; tmp; tmp = tmp->above)	1208	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1112	{	1209	{
		1210	above = tmp->above;
		1211
1113	/* No point updating the players look faces if he is the object	1212	/* No point updating the players look faces if he is the object
1114	* being removed.	1213	* being removed.
1115	*/	1214	*/
1116		1215
1117	/* See if object moving off should effect something */	1216	/* See if object moving off should effect something */
1118	if (check_walk_off
1119	&& ((move_type & tmp->move_off)	1217	if ((move_type & tmp->move_off)
1120	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1218	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1121	{
1122	move_apply (tmp, this, 0);	1219	move_apply (tmp, this, 0);
1123
1124	if (destroyed ())
1125	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1126	}	1220	}
1127		1221
1128	last = tmp;	1222	if (affects_los ())
1129	}
1130
1131	/* last == NULL if there are no objects on this space */
1132	//TODO: this makes little sense, why only update the topmost object?
1133	if (!last)
1134	map->at (x, y).flags_ = 0;
1135	else
1136	update_object (last, UP_OBJ_REMOVE);
1137
1138	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1139	update_all_los (map, x, y);	1223	update_all_los (map, x, y);
1140	}	1224	}
1141	}	1225	}
1142		1226
1143	/*	1227	/*
…		…
1157	if (!top)	1241	if (!top)
1158	for (top = op; top && top->above; top = top->above)	1242	for (top = op; top && top->above; top = top->above)
1159	;	1243	;
1160		1244
1161	for (; top; top = top->below)	1245	for (; top; top = top->below)
1162	{
1163	if (top == op)
1164	continue;
1165
1166	if (object::can_merge (op, top))	1246	if (object::can_merge (op, top))
1167	{	1247	{
1168	top->nrof += op->nrof;	1248	top->nrof += op->nrof;
1169		1249
1170	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1250	if (object *pl = top->visible_to ())
1171	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
1172	op->destroy ();	1256	op->destroy ();
		1257
1173	return top;	1258	return top;
1174	}	1259	}
1175	}
1176		1260
1177	return 0;	1261	return 0;
1178	}	1262	}
1179		1263
1180	void	1264	void
…		…
1205	* job preparing multi-part monsters.	1289	* job preparing multi-part monsters.
1206	*/	1290	*/
1207	object *	1291	object *
1208	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)
1209	{	1293	{
		1294	op->remove ();
		1295
1210	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1296	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1211	{	1297	{
1212	tmp->x = x + tmp->arch->x;	1298	tmp->x = x + tmp->arch->x;
1213	tmp->y = y + tmp->arch->y;	1299	tmp->y = y + tmp->arch->y;
1214	}	1300	}
…		…
1237	* just 'op' otherwise	1323	* just 'op' otherwise
1238	*/	1324	*/
1239	object *	1325	object *
1240	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)
1241	{	1327	{
1242	assert (!op->flag [FLAG_FREED]);
1243
1244	object *top, *floor = NULL;
1245
1246	op->remove ();	1328	op->remove ();
		1329
		1330	if (m == &freed_map)//D TODO: remove soon
		1331	{//D
		1332	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1333	}//D
1247		1334
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1335	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* 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
1250	* need extra work	1337	* need extra work
1251	*/	1338	*/
		1339	maptile *newmap = m;
1252	if (!xy_normalise (m, op->x, op->y))	1340	if (!xy_normalise (newmap, op->x, op->y))
1253	{	1341	{
1254	op->destroy ();	1342	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1255	return 0;	1343	return 0;
1256	}	1344	}
1257		1345
1258	if (object *more = op->more)	1346	if (object *more = op->more)
1259	if (!insert_ob_in_map (more, m, originator, flag))	1347	if (!insert_ob_in_map (more, m, originator, flag))
1260	return 0;	1348	return 0;
1261		1349
1262	CLEAR_FLAG (op, FLAG_REMOVED);	1350	op->flag [FLAG_REMOVED] = false;
1263		1351	op->env = 0;
1264	op->map = m;	1352	op->map = newmap;
		1353
1265	mapspace &ms = op->ms ();	1354	mapspace &ms = op->ms ();
1266		1355
1267	/* this has to be done after we translate the coordinates.	1356	/* this has to be done after we translate the coordinates.
1268	*/	1357	*/
1269	if (op->nrof && !(flag & INS_NO_MERGE))	1358	if (op->nrof && !(flag & INS_NO_MERGE))
1270	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1359	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1271	if (object::can_merge (op, tmp))	1360	if (object::can_merge (op, tmp))
1272	{	1361	{
		1362	// TODO: we actually want to update tmp, not op,
		1363	// but some caller surely breaks when we return tmp
		1364	// from here :/
1273	op->nrof += tmp->nrof;	1365	op->nrof += tmp->nrof;
1274	tmp->destroy ();	1366	tmp->destroy ();
1275	}	1367	}
1276		1368
1277	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 */
…		…
1286	{	1378	{
1287	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");
1288	abort ();	1380	abort ();
1289	}	1381	}
1290		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
1291	op->above = originator;	1390	op->above = originator;
1292	op->below = originator->below;	1391	op->below = originator->below;
1293
1294	if (op->below)
1295	op->below->above = op;
1296	else
1297	ms.bot = op;
1298
1299	/* since *below* originator, no need to update top */
1300	originator->below = op;	1392	originator->below = op;
		1393
		1394	*(op->below ? &op->below->above : &ms.bot) = op;
1301	}	1395	}
1302	else	1396	else
1303	{	1397	{
1304	top = ms.bot;	1398	object *floor = 0;
		1399	object *top = ms.top;
1305		1400
1306	/* If there are other objects, then */	1401	/* If there are other objects, then */
1307	if (top)	1402	if (top)
1308	{	1403	{
1309	object *last = 0;
1310
1311	/*	1404	/*
1312	* 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.
1313	* We've already dealt with merging if appropriate.	1406	* We've already dealt with merging if appropriate.
1314	* 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
1315	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1408	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1318	* 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
1319	* 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
1320	* 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
1321	* that flying non pickable objects are spell objects.	1414	* that flying non pickable objects are spell objects.
1322	*/	1415	*/
1323	for (top = ms.bot; top; top = top->above)	1416	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1324	{	1417	{
1325	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))
1326	floor = top;	1419	floor = tmp;
1327		1420
1328	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))
1329	{	1422	{
1330	/* We insert above top, so we want this object below this */	1423	/* We insert above top, so we want this object below this */
1331	top = top->below;	1424	top = tmp->below;
1332	break;	1425	break;
1333	}	1426	}
1334		1427
1335	last = top;	1428	top = tmp;
1336	}	1429	}
1337
1338	/* Don't want top to be NULL, so set it to the last valid object */
1339	top = last;
1340		1430
1341	/* We let update_position deal with figuring out what the space	1431	/* We let update_position deal with figuring out what the space
1342	* looks like instead of lots of conditions here.	1432	* looks like instead of lots of conditions here.
1343	* makes things faster, and effectively the same result.	1433	* makes things faster, and effectively the same result.
1344	*/	1434	*/
…		…
1351	*/	1441	*/
1352	if (!(flag & INS_ON_TOP)	1442	if (!(flag & INS_ON_TOP)
1353	&& ms.flags () & P_BLOCKSVIEW	1443	&& ms.flags () & P_BLOCKSVIEW
1354	&& (op->face && !faces [op->face].visibility))	1444	&& (op->face && !faces [op->face].visibility))
1355	{	1445	{
		1446	object *last;
		1447
1356	for (last = top; last != floor; last = last->below)	1448	for (last = top; last != floor; last = last->below)
1357	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1449	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1358	break;	1450	break;
1359		1451
1360	/* Check to see if we found the object that blocks view,	1452	/* Check to see if we found the object that blocks view,
…		…
1368	} /* If objects on this space */	1460	} /* If objects on this space */
1369		1461
1370	if (flag & INS_ABOVE_FLOOR_ONLY)	1462	if (flag & INS_ABOVE_FLOOR_ONLY)
1371	top = floor;	1463	top = floor;
1372		1464
1373	/* 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
1374	*/
1375
1376	/* First object on this space */
1377	if (!top)	1466	if (!top)
1378	{	1467	{
		1468	op->below = 0;
1379	op->above = ms.bot;	1469	op->above = ms.bot;
1380
1381	if (op->above)
1382	op->above->below = op;
1383
1384	op->below = 0;
1385	ms.bot = op;	1470	ms.bot = op;
		1471
		1472	*(op->above ? &op->above->below : &ms.top) = op;
1386	}	1473	}
1387	else	1474	else
1388	{ /* get inserted into the stack above top */	1475	{
1389	op->above = top->above;	1476	op->above = top->above;
1390
1391	if (op->above)
1392	op->above->below = op;	1477	top->above = op;
1393		1478
1394	op->below = top;	1479	op->below = top;
1395	top->above = op;	1480	*(op->above ? &op->above->below : &ms.top) = op;
1396	}	1481	}
		1482	}
1397		1483
1398	if (!op->above)	1484	if (op->is_player ())
1399	ms.top = op;
1400	} /* else not INS_BELOW_ORIGINATOR */
1401
1402	if (op->type == PLAYER)
1403	{	1485	{
1404	op->contr->do_los = 1;	1486	op->contr->do_los = 1;
1405	++op->map->players;	1487	++op->map->players;
1406	op->map->touch ();	1488	op->map->touch ();
1407	}	1489	}
1408		1490
1409	op->map->dirty = true;	1491	op->map->dirty = true;
1410		1492
1411	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
		1497	if (pl->contr->ns)
1412	pl->contr->ns->floorbox_update ();	1498	pl->contr->ns->floorbox_update ();
1413		1499
1414	/* If this object glows, it may affect lighting conditions that are	1500	/* If this object glows, it may affect lighting conditions that are
1415	* 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
1416	* 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
1417	* on the map will get recalculated. The players could very well	1503	* on the map will get recalculated. The players could very well
1418	* 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 -
1419	* this should get redone to only look for players within range,	1505	* this should get redone to only look for players within range,
1420	* or just updating the P_UPTODATE for spaces within this area	1506	* or just updating the P_UPTODATE for spaces within this area
1421	* of effect may be sufficient.	1507	* of effect may be sufficient.
1422	*/	1508	*/
1423	if (op->map->darkness && (op->glow_radius != 0))	1509	if (op->affects_los ())
		1510	{
		1511	op->ms ().invalidate ();
1424	update_all_los (op->map, op->x, op->y);	1512	update_all_los (op->map, op->x, op->y);
		1513	}
1425		1514
1426	/* updates flags (blocked, alive, no magic, etc) for this map space */	1515	/* updates flags (blocked, alive, no magic, etc) for this map space */
1427	update_object (op, UP_OBJ_INSERT);	1516	update_object (op, UP_OBJ_INSERT);
1428		1517
1429	INVOKE_OBJECT (INSERT, op);	1518	INVOKE_OBJECT (INSERT, op);
…		…
1436	* blocked() and wall() work properly), and these flags are updated by	1525	* blocked() and wall() work properly), and these flags are updated by
1437	* update_object().	1526	* update_object().
1438	*/	1527	*/
1439		1528
1440	/* 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 */
1441	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1530	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1442	{	1531	{
1443	if (check_move_on (op, originator))	1532	if (check_move_on (op, originator))
1444	return 0;	1533	return 0;
1445		1534
1446	/* 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
…		…
1457	/* this function inserts an object in the map, but if it	1546	/* this function inserts an object in the map, but if it
1458	* 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.
1459	* 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.
1460	*/	1549	*/
1461	void	1550	void
1462	replace_insert_ob_in_map (const char *arch_string, object *op)	1551	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1463	{	1552	{
1464	object *tmp, *tmp1;
1465
1466	/* first search for itself and remove any old instances */	1553	/* first search for itself and remove any old instances */
1467		1554
1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1555	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1556	if (tmp->arch->archname == archname) /* same archetype */
1470	tmp->destroy ();	1557	tmp->destroy ();
1471		1558
1472	tmp1 = arch_to_object (archetype::find (arch_string));	1559	object *tmp = archetype::find (archname)->instance ();
1473		1560
1474	tmp1->x = op->x;	1561	tmp->x = op->x;
1475	tmp1->y = op->y;	1562	tmp->y = op->y;
		1563
1476	insert_ob_in_map (tmp1, op->map, op, 0);	1564	insert_ob_in_map (tmp, op->map, op, 0);
1477	}	1565	}
1478		1566
1479	object *	1567	object *
1480	object::insert_at (object *where, object *originator, int flags)	1568	object::insert_at (object *where, object *originator, int flags)
1481	{	1569	{
		1570	if (where->env)
		1571	return where->env->insert (this);
		1572	else
1482	return where->map->insert (this, where->x, where->y, originator, flags);	1573	return where->map->insert (this, where->x, where->y, originator, flags);
1483	}	1574	}
1484		1575
1485	/*	1576	// check whether we can put this into the map, respect max_volume, max_items
1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1577	bool
1487	* is returned contains nr objects, and the remaining parts contains	1578	object::can_drop_at (maptile *m, int x, int y, object *originator)
1488	* the rest (or is removed and freed if that number is 0).
1489	* On failure, NULL is returned, and the reason put into the
1490	* global static errmsg array.
1491	*/
1492	object *
1493	get_split_ob (object *orig_ob, uint32 nr)
1494	{	1579	{
1495	object *newob;	1580	mapspace &ms = m->at (x, y);
1496	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1497		1581
1498	if (orig_ob->nrof < nr)	1582	int items = ms.items ();
1499	{
1500	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1501	return NULL;
1502	}
1503		1583
1504	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;
1505		1588
1506	if ((orig_ob->nrof -= nr) < 1)	1589	if (originator && originator->is_player ())
1507	orig_ob->destroy (1);	1590	originator->contr->failmsg (format (
1508	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.>",
1509	{	1592	query_name ()
1510	if (orig_ob->env != NULL)	1593	));
1511	sub_weight (orig_ob->env, orig_ob->weight * nr);
1512	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1513	{
1514	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1515	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1516	return NULL;
1517	}
1518	}
1519		1594
1520	newob->nrof = nr;	1595	return false;
1521
1522	return newob;
1523	}	1596	}
1524		1597
1525	/*	1598	/*
1526	* decrease_ob_nr(object, number) decreases a specified number from	1599	* decrease(object, number) decreases a specified number from
1527	* 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
1528	* is subsequently removed and freed.	1601	* is subsequently removed and freed.
1529	*	1602	*
1530	* 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
1531	*/	1604	*/
		1605	bool
		1606	object::decrease (sint32 nr)
		1607	{
		1608	if (!nr)
		1609	return true;
		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	*/
1532	object *	1636	object *
1533	decrease_ob_nr (object *op, uint32 i)	1637	object::split (sint32 nr)
1534	{	1638	{
1535	object *tmp;	1639	int have = number_of ();
1536		1640
1537	if (i == 0) /* objects with op->nrof require this check */	1641	if (have < nr)
1538	return op;	1642	return 0;
1539		1643	else if (have == nr)
1540	if (i > op->nrof)
1541	i = op->nrof;
1542
1543	if (QUERY_FLAG (op, FLAG_REMOVED))
1544	op->nrof -= i;
1545	else if (op->env)
1546	{	1644	{
1547	/* is this object in the players inventory, or sub container
1548	* therein?
1549	*/
1550	tmp = op->in_player ();
1551	/* nope. Is this a container the player has opened?
1552	* If so, set tmp to that player.
1553	* IMO, searching through all the players will mostly
1554	* likely be quicker than following op->env to the map,
1555	* and then searching the map for a player.
1556	*/
1557	if (!tmp)
1558	for_all_players (pl)
1559	if (pl->ob->container == op->env)
1560	{
1561	tmp = pl->ob;
1562	break;
1563	}
1564
1565	if (i < op->nrof)
1566	{
1567	sub_weight (op->env, op->weight * i);
1568	op->nrof -= i;
1569	if (tmp)
1570	esrv_send_item (tmp, op);
1571	}
1572	else
1573	{
1574	op->remove ();	1645	remove ();
1575	op->nrof = 0;	1646	return this;
1576	if (tmp)
1577	esrv_del_item (tmp->contr, op->count);
1578	}
1579	}	1647	}
1580	else	1648	else
1581	{	1649	{
1582	object *above = op->above;	1650	decrease (nr);
1583		1651
1584	if (i < op->nrof)	1652	object *op = deep_clone ();
1585	op->nrof -= i;	1653	op->nrof = nr;
1586	else
1587	{
1588	op->remove ();
1589	op->nrof = 0;
1590	}
1591
1592	/* Since we just removed op, op->above is null */
1593	for (tmp = above; tmp; tmp = tmp->above)
1594	if (tmp->type == PLAYER)
1595	{
1596	if (op->nrof)
1597	esrv_send_item (tmp, op);
1598	else
1599	esrv_del_item (tmp->contr, op->count);
1600	}
1601	}
1602
1603	if (op->nrof)
1604	return op;	1654	return op;
1605	else
1606	{
1607	op->destroy ();
1608	return 0;
1609	}
1610	}
1611
1612	/*
1613	* add_weight(object, weight) adds the specified weight to an object,
1614	* and also updates how much the environment(s) is/are carrying.
1615	*/
1616	void
1617	add_weight (object *op, signed long weight)
1618	{
1619	while (op != NULL)
1620	{
1621	if (op->type == CONTAINER)
1622	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1623
1624	op->carrying += weight;
1625	op = op->env;
1626	}	1655	}
1627	}	1656	}
1628		1657
1629	object *	1658	object *
1630	insert_ob_in_ob (object *op, object *where)	1659	insert_ob_in_ob (object *op, object *where)
…		…
1655	* be != op, if items are merged. -Tero	1684	* be != op, if items are merged. -Tero
1656	*/	1685	*/
1657	object *	1686	object *
1658	object::insert (object *op)	1687	object::insert (object *op)
1659	{	1688	{
1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1661	op->remove ();
1662
1663	if (op->more)	1689	if (op->more)
1664	{	1690	{
1665	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);
1666	return op;	1692	return op;
1667	}	1693	}
1668		1694
1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1695	op->remove ();
1670	CLEAR_FLAG (op, FLAG_REMOVED);	1696
		1697	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1671		1698
1672	if (op->nrof)	1699	if (op->nrof)
1673	{
1674	for (object *tmp = inv; tmp; tmp = tmp->below)	1700	for (object *tmp = inv; tmp; tmp = tmp->below)
1675	if (object::can_merge (tmp, op))	1701	if (object::can_merge (tmp, op))
1676	{	1702	{
1677	/* return the original object and remove inserted object	1703	/* return the original object and remove inserted object
1678	(client needs the original object) */	1704	(client needs the original object) */
1679	tmp->nrof += op->nrof;	1705	tmp->nrof += op->nrof;
1680	/* Weight handling gets pretty funky. Since we are adding to	1706
1681	* tmp->nrof, we need to increase the weight.	1707	if (object *pl = tmp->visible_to ())
1682	*/	1708	esrv_update_item (UPD_NROF, pl, tmp);
		1709
1683	add_weight (this, op->weight * op->nrof);	1710	adjust_weight (this, op->total_weight ());
1684	SET_FLAG (op, FLAG_REMOVED);	1711
1685	op->destroy (); /* free the inserted object */	1712	op->destroy ();
1686	op = tmp;	1713	op = tmp;
1687	op->remove (); /* and fix old object's links */	1714	goto inserted;
1688	CLEAR_FLAG (op, FLAG_REMOVED);
1689	break;
1690	}	1715	}
1691		1716
1692	/* I assume combined objects have no inventory
1693	* We add the weight - this object could have just been removed
1694	* (if it was possible to merge). calling remove_ob will subtract
1695	* the weight, so we need to add it in again, since we actually do
1696	* the linking below
1697	*/
1698	add_weight (this, op->weight * op->nrof);
1699	}
1700	else
1701	add_weight (this, (op->weight + op->carrying));
1702
1703	if (object *otmp = this->in_player ())
1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1705	otmp->update_stats ();
1706
1707	op->owner = 0; // its his/hers now. period.	1717	op->owner = 0; // it's his/hers now. period.
1708	op->map = 0;	1718	op->map = 0;
		1719	op->x = 0;
		1720	op->y = 0;
		1721
		1722	op->above = 0;
		1723	op->below = inv;
1709	op->env = this;	1724	op->env = this;
1710	op->above = 0;
1711	op->below = 0;
1712	op->x = op->y = 0;
1713		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:
1714	/* 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 */
1715	if (op->glow_radius && map)	1740	if (op->glow_radius && is_on_map ())
1716	{	1741	{
1717	#ifdef DEBUG_LIGHTS	1742	update_stats ();
1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1719	#endif /* DEBUG_LIGHTS */
1720	if (map->darkness)
1721	update_all_los (map, x, y);	1743	update_all_los (map, x, y);
1722	}
1723
1724	/* Client has no idea of ordering so lets not bother ordering it here.
1725	* It sure simplifies this function...
1726	*/
1727	if (!inv)
1728	inv = op;
1729	else
1730	{	1744	}
1731	op->below = inv;	1745	else if (is_player ())
1732	op->below->above = op;	1746	// if this is a player's inventory, update stats
1733	inv = op;	1747	contr->queue_stats_update ();
1734	}
1735		1748
1736	INVOKE_OBJECT (INSERT, this);	1749	INVOKE_OBJECT (INSERT, this);
1737		1750
1738	return op;	1751	return op;
1739	}	1752	}
…		…
1759	* on top.	1772	* on top.
1760	*/	1773	*/
1761	int	1774	int
1762	check_move_on (object *op, object *originator)	1775	check_move_on (object *op, object *originator)
1763	{	1776	{
		1777	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1778	return 0;
		1779
1764	object *tmp;	1780	object *tmp;
1765	maptile *m = op->map;	1781	maptile *m = op->map;
1766	int x = op->x, y = op->y;	1782	int x = op->x, y = op->y;
1767		1783
1768	MoveType move_on, move_slow, move_block;	1784	mapspace &ms = m->at (x, y);
1769		1785
1770	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1786	ms.update ();
1771	return 0;
1772		1787
1773	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1788	MoveType move_on = ms.move_on;
1774	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1789	MoveType move_slow = ms.move_slow;
1775	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1790	MoveType move_block = ms.move_block;
1776		1791
1777	/* 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,
1778	* 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
1779	* 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
1780	* as walking.	1795	* as walking.
…		…
1791	return 0;	1806	return 0;
1792		1807
1793	/* The objects have to be checked from top to bottom.	1808	/* The objects have to be checked from top to bottom.
1794	* Hence, we first go to the top:	1809	* Hence, we first go to the top:
1795	*/	1810	*/
1796		1811	for (object *next, *tmp = ms.top; tmp; tmp = next)
1797	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1798	{
1799	/* Trim the search when we find the first other spell effect
1800	* this helps performance so that if a space has 50 spell objects,
1801	* we don't need to check all of them.
1802	*/
1803	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1804	break;
1805	}	1812	{
		1813	next = tmp->below;
1806		1814
1807	for (; tmp; tmp = tmp->below)
1808	{
1809	if (tmp == op)	1815	if (tmp == op)
1810	continue; /* Can't apply yourself */	1816	continue; /* Can't apply yourself */
1811		1817
1812	/* 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.
1813	* Second check makes sure that the movement types not being slowed	1819	* Second check makes sure that the movement types not being slowed
…		…
1818	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1824	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1819	{	1825	{
1820	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1826	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1821	((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))
1822	{	1828	{
1823
1824	float
1825	diff = tmp->move_slow_penalty * fabs (op->speed);	1829	float diff = tmp->move_slow_penalty * fabs (op->speed);
1826		1830
1827	if (op->type == PLAYER)	1831	if (op->is_player ())
1828	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)) ||
1829	(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)))
1830	diff /= 4.0;	1834	diff /= 4.0;
1831		1835
1832	op->speed_left -= diff;	1836	op->speed_left -= diff;
1833	}	1837	}
1834	}	1838	}
…		…
1867	LOG (llevError, "Present_arch called outside map.\n");	1871	LOG (llevError, "Present_arch called outside map.\n");
1868	return NULL;	1872	return NULL;
1869	}	1873	}
1870		1874
1871	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)
1872	if (tmp->arch == at)	1876	if (tmp->arch->archname == at->archname)
1873	return tmp;	1877	return tmp;
1874		1878
1875	return NULL;	1879	return NULL;
1876	}	1880	}
1877		1881
…		…
1941	* The first matching object is returned, or NULL if none.	1945	* The first matching object is returned, or NULL if none.
1942	*/	1946	*/
1943	object *	1947	object *
1944	present_arch_in_ob (const archetype *at, const object *op)	1948	present_arch_in_ob (const archetype *at, const object *op)
1945	{	1949	{
1946	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1950	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1947	if (tmp->arch == at)	1951	if (tmp->arch->archname == at->archname)
1948	return tmp;	1952	return tmp;
1949		1953
1950	return NULL;	1954	return NULL;
1951	}	1955	}
1952		1956
…		…
2040	* head of the object should correspond for the entire object.	2044	* head of the object should correspond for the entire object.
2041	*/	2045	*/
2042	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2046	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2043	continue;	2047	continue;
2044		2048
2045	if (ob->blocked (m, pos.x, pos.y))	2049	if (ob->blocked (pos.m, pos.x, pos.y))
2046	continue;	2050	continue;
2047		2051
2048	altern [index++] = i;	2052	altern [index++] = i;
2049	}	2053	}
2050		2054
…		…
2118	* there is capable of.	2122	* there is capable of.
2119	*/	2123	*/
2120	int	2124	int
2121	find_dir (maptile *m, int x, int y, object *exclude)	2125	find_dir (maptile *m, int x, int y, object *exclude)
2122	{	2126	{
2123	int i, max = SIZEOFFREE, mflags;	2127	int max = SIZEOFFREE, mflags;
2124
2125	sint16 nx, ny;
2126	object *tmp;
2127	maptile *mp;
2128
2129	MoveType blocked, move_type;	2128	MoveType move_type;
2130		2129
2131	if (exclude && exclude->head_ () != exclude)	2130	if (exclude && exclude->head_ () != exclude)
2132	{	2131	{
2133	exclude = exclude->head;	2132	exclude = exclude->head;
2134	move_type = exclude->move_type;	2133	move_type = exclude->move_type;
…		…
2137	{	2136	{
2138	/* 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. */
2139	move_type = MOVE_ALL;	2138	move_type = MOVE_ALL;
2140	}	2139	}
2141		2140
2142	for (i = 1; i < max; i++)	2141	for (int i = 1; i < max; i++)
2143	{	2142	{
2144	mp = m;	2143	mapxy pos (m, x, y);
2145	nx = x + freearr_x[i];	2144	pos.move (i);
2146	ny = y + freearr_y[i];
2147		2145
2148	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2146	if (!pos.normalise ())
2149
2150	if (mflags & P_OUT_OF_MAP)
2151	max = maxfree[i];	2147	max = maxfree[i];
2152	else	2148	else
2153	{	2149	{
2154	mapspace &ms = mp->at (nx, ny);	2150	mapspace &ms = *pos;
2155		2151
2156	blocked = ms.move_block;
2157
2158	if ((move_type & blocked) == move_type)	2152	if ((move_type & ms.move_block) == move_type)
2159	max = maxfree[i];	2153	max = maxfree [i];
2160	else if (mflags & P_IS_ALIVE)	2154	else if (ms.flags () & P_IS_ALIVE)
2161	{	2155	{
2162	for (tmp = ms.bot; tmp; tmp = tmp->above)	2156	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2163	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2157	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2164	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2158	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2165	break;
2166
2167	if (tmp)
2168	return freedir[i];	2159	return freedir [i];
2169	}	2160	}
2170	}	2161	}
2171	}	2162	}
2172		2163
2173	return 0;	2164	return 0;
…		…
2248	* 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
2249	* 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.
2250	* 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
2251	* functions.	2242	* functions.
2252	*/	2243	*/
2253	int reduction_dir[SIZEOFFREE][3] = {	2244	static const int reduction_dir[SIZEOFFREE][3] = {
2254	{0, 0, 0}, /* 0 */	2245	{0, 0, 0}, /* 0 */
2255	{0, 0, 0}, /* 1 */	2246	{0, 0, 0}, /* 1 */
2256	{0, 0, 0}, /* 2 */	2247	{0, 0, 0}, /* 2 */
2257	{0, 0, 0}, /* 3 */	2248	{0, 0, 0}, /* 3 */
2258	{0, 0, 0}, /* 4 */	2249	{0, 0, 0}, /* 4 */
…		…
2354	int	2345	int
2355	can_pick (const object *who, const object *item)	2346	can_pick (const object *who, const object *item)
2356	{	2347	{
2357	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2348	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2358	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2349	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2359	!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));
2360	}	2351	}
2361		2352
2362	/*	2353	/*
2363	* create clone from object to another	2354	* create clone from object to another
2364	*/	2355	*/
2365	object *	2356	object *
2366	object_create_clone (object *asrc)	2357	object::deep_clone ()
2367	{	2358	{
2368	object *dst = 0, *tmp, *src, *prev, *item;	2359	assert (("deep_clone called on non-head object", is_head ()));
2369		2360
2370	if (!asrc)	2361	object *dst = clone ();
2371	return 0;
2372		2362
2373	src = asrc->head_ ();	2363	object *prev = dst;
2374
2375	prev = 0;
2376	for (object *part = src; part; part = part->more)	2364	for (object *part = this->more; part; part = part->more)
2377	{	2365	{
2378	tmp = part->clone ();	2366	object *tmp = part->clone ();
2379	tmp->x -= src->x;
2380	tmp->y -= src->y;
2381
2382	if (!part->head)
2383	{
2384	dst = tmp;
2385	tmp->head = 0;
2386	}
2387	else
2388	tmp->head = dst;	2367	tmp->head = dst;
2389
2390	tmp->more = 0;
2391
2392	if (prev)
2393	prev->more = tmp;	2368	prev->more = tmp;
2394
2395	prev = tmp;	2369	prev = tmp;
2396	}	2370	}
2397		2371
2398	for (item = src->inv; item; item = item->below)	2372	for (object *item = inv; item; item = item->below)
2399	insert_ob_in_ob (object_create_clone (item), dst);	2373	insert_ob_in_ob (item->deep_clone (), dst);
2400		2374
2401	return dst;	2375	return dst;
2402	}	2376	}
2403		2377
2404	/* This returns the first object in who's inventory that	2378	/* This returns the first object in who's inventory that
…		…
2413	return tmp;	2387	return tmp;
2414		2388
2415	return 0;	2389	return 0;
2416	}	2390	}
2417		2391
2418	/* If ob has a field named key, return the link from the list,	2392	shstr_tmp
2419	* otherwise return NULL.	2393	object::kv_get (shstr_tmp key) const
2420	*
2421	* key must be a passed in shared string - otherwise, this won't
2422	* do the desired thing.
2423	*/
2424	key_value *
2425	get_ob_key_link (const object *ob, const char *key)
2426	{	2394	{
2427	for (key_value *link = ob->key_values; link; link = link->next)	2395	for (key_value *kv = key_values; kv; kv = kv->next)
2428	if (link->key == key)	2396	if (kv->key == key)
2429	return link;
2430
2431	return 0;
2432	}
2433
2434	/*
2435	* Returns the value of op has an extra_field for key, or NULL.
2436	*
2437	* The argument doesn't need to be a shared string.
2438	*
2439	* The returned string is shared.
2440	*/
2441	const char *
2442	get_ob_key_value (const object *op, const char *const key)
2443	{
2444	key_value *link;
2445	shstr_cmp canonical_key (key);
2446
2447	if (!canonical_key)
2448	{
2449	/* 1. There being a field named key on any object
2450	* implies there'd be a shared string to find.
2451	* 2. Since there isn't, no object has this field.
2452	* 3. Therefore, *this* object doesn't have this field.
2453	*/
2454	return 0;
2455	}
2456
2457	/* This is copied from get_ob_key_link() above -
2458	* only 4 lines, and saves the function call overhead.
2459	*/
2460	for (link = op->key_values; link; link = link->next)
2461	if (link->key == canonical_key)
2462	return link->value;	2397	return kv->value;
2463		2398
2464	return 0;	2399	return shstr ();
2465	}	2400	}
2466		2401
2467	/*	2402	void
2468	* Updates the canonical_key in op to value.	2403	object::kv_set (shstr_tmp key, shstr_tmp value)
2469	*
2470	* canonical_key is a shared string (value doesn't have to be).
2471	*
2472	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2473	* keys.
2474	*
2475	* Returns TRUE on success.
2476	*/
2477	int
2478	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2479	{	2404	{
2480	key_value *field = NULL, *last = NULL;	2405	for (key_value *kv = key_values; kv; kv = kv->next)
2481		2406	if (kv->key == key)
2482	for (field = op->key_values; field != NULL; field = field->next)
2483	{
2484	if (field->key != canonical_key)
2485	{	2407	{
2486	last = field;	2408	kv->value = value;
2487	continue;	2409	return;
2488	}	2410	}
2489		2411
2490	if (value)	2412	key_value *kv = new key_value;
2491	field->value = value;	2413
2492	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)
2493	{	2426	{
2494	/* Basically, if the archetype has this key set,	2427	key_value *kv = *kvp;
2495	* we need to store the null value so when we save	2428	*kvp = (*kvp)->next;
2496	* it, we save the empty value so that when we load,	2429	delete kv;
2497	* we get this value back again.	2430	return;
2498	*/
2499	if (get_ob_key_link (op->arch, canonical_key))
2500	field->value = 0;
2501	else
2502	{
2503	if (last)
2504	last->next = field->next;
2505	else
2506	op->key_values = field->next;
2507
2508	delete field;
2509	}
2510	}	2431	}
2511	return TRUE;
2512	}
2513	/* IF we get here, key doesn't exist */
2514
2515	/* No field, we'll have to add it. */
2516
2517	if (!add_key)
2518	return FALSE;
2519
2520	/* There isn't any good reason to store a null
2521	* value in the key/value list. If the archetype has
2522	* this key, then we should also have it, so shouldn't
2523	* be here. If user wants to store empty strings,
2524	* should pass in ""
2525	*/
2526	if (value == NULL)
2527	return TRUE;
2528
2529	field = new key_value;
2530
2531	field->key = canonical_key;
2532	field->value = value;
2533	/* Usual prepend-addition. */
2534	field->next = op->key_values;
2535	op->key_values = field;
2536
2537	return TRUE;
2538	}
2539
2540	/*
2541	* Updates the key in op to value.
2542	*
2543	* If add_key is FALSE, this will only update existing keys,
2544	* and not add new ones.
2545	* In general, should be little reason FALSE is ever passed in for add_key
2546	*
2547	* Returns TRUE on success.
2548	*/
2549	int
2550	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2551	{
2552	shstr key_ (key);
2553
2554	return set_ob_key_value_s (op, key_, value, add_key);
2555	}	2432	}
2556		2433
2557	object::depth_iterator::depth_iterator (object *container)	2434	object::depth_iterator::depth_iterator (object *container)
2558	: iterator_base (container)	2435	: iterator_base (container)
2559	{	2436	{
…		…
2609	{	2486	{
2610	char flagdesc[512];	2487	char flagdesc[512];
2611	char info2[256 * 4];	2488	char info2[256 * 4];
2612	char *p = info;	2489	char *p = info;
2613		2490
2614	p += snprintf (p, 512, "{cnt:%d,uuid:%s,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}",
2615	count,	2492	count,
2616	uuid.c_str (),	2493	uuid.c_str (),
2617	&name,	2494	&name,
2618	title ? "\",title:\"" : "",	2495	title ? ",title:\"" : "",
2619	title ? (const char *)title : "",	2496	title ? (const char *)title : "",
		2497	title ? "\"" : "",
2620	flag_desc (flagdesc, 512), type);	2498	flag_desc (flagdesc, 512), type);
2621		2499
2622	if (!this->flag[FLAG_REMOVED] && env)	2500	if (!flag[FLAG_REMOVED] && env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2501	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2624		2502
2625	if (map)	2503	if (map)
2626	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);
2627		2505
…		…
2642	{	2520	{
2643	return map ? map->region (x, y)	2521	return map ? map->region (x, y)
2644	: region::default_region ();	2522	: region::default_region ();
2645	}	2523	}
2646		2524
2647	const materialtype_t *
2648	object::dominant_material () const
2649	{
2650	if (materialtype_t *mt = name_to_material (materialname))
2651	return mt;
2652
2653	return name_to_material (shstr_unknown);
2654	}
2655
2656	void	2525	void
2657	object::open_container (object *new_container)	2526	object::open_container (object *new_container)
2658	{	2527	{
2659	if (container == new_container)	2528	if (container == new_container)
2660	return;	2529	return;
2661		2530
2662	if (object *old_container = container)	2531	object *old_container = container;
		2532
		2533	if (old_container)
2663	{	2534	{
2664	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2535	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2665	return;	2536	return;
2666		2537
2667	#if 0	2538	#if 0
…		…
2669	if (object *closer = old_container->inv)	2540	if (object *closer = old_container->inv)
2670	if (closer->type == CLOSE_CON)	2541	if (closer->type == CLOSE_CON)
2671	closer->destroy ();	2542	closer->destroy ();
2672	#endif	2543	#endif
2673		2544
		2545	// make sure the container is available
		2546	esrv_send_item (this, old_container);
		2547
2674	old_container->flag [FLAG_APPLIED] = 0;	2548	old_container->flag [FLAG_APPLIED] = false;
2675	container = 0;	2549	container = 0;
2676		2550
		2551	// client needs item update to make it work, client bug requires this to be separate
2677	esrv_update_item (UPD_FLAGS, this, old_container);	2552	esrv_update_item (UPD_FLAGS, this, old_container);
		2553
2678	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 ());
2679	play_sound (sound_find ("chest_close"));	2555	play_sound (sound_find ("chest_close"));
2680	}	2556	}
2681		2557
2682	if (new_container)	2558	if (new_container)
2683	{	2559	{
…		…
2693	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2569	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2694	new_container->insert (closer);	2570	new_container->insert (closer);
2695	}	2571	}
2696	#endif	2572	#endif
2697		2573
2698	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 ());
2699		2575
		2576	// make sure the container is available, client bug requires this to be separate
		2577	esrv_send_item (this, new_container);
		2578
2700	new_container->flag [FLAG_APPLIED] = 1;	2579	new_container->flag [FLAG_APPLIED] = true;
2701	container = new_container;	2580	container = new_container;
2702		2581
		2582	// client needs flag change
2703	esrv_update_item (UPD_FLAGS, this, new_container);	2583	esrv_update_item (UPD_FLAGS, this, new_container);
2704	esrv_send_inventory (this, new_container);	2584	esrv_send_inventory (this, new_container);
2705	play_sound (sound_find ("chest_open"));	2585	play_sound (sound_find ("chest_open"));
2706	}	2586	}
		2587	// else if (!old_container->env && contr && contr->ns)
		2588	// contr->ns->floorbox_reset ();
2707	}	2589	}
2708		2590
2709	object *	2591	object *
2710	object::force_find (const shstr name)	2592	object::force_find (shstr_tmp name)
2711	{	2593	{
2712	/* cycle through his inventory to look for the MARK we want to	2594	/* cycle through his inventory to look for the MARK we want to
2713	* place	2595	* place
2714	*/	2596	*/
2715	for (object *tmp = inv; tmp; tmp = tmp->below)	2597	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2717	return splay (tmp);	2599	return splay (tmp);
2718		2600
2719	return 0;	2601	return 0;
2720	}	2602	}
2721		2603
		2604	//-GPL
		2605
2722	void	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 *
2723	object::force_add (const shstr name, int duration)	2616	object::force_add (shstr_tmp name, int duration)
2724	{	2617	{
2725	if (object *force = force_find (name))	2618	if (object *force = force_find (name))
2726	force->destroy ();	2619	force->destroy ();
2727		2620
2728	object *force = get_archetype (FORCE_NAME);	2621	object *force = get_archetype (FORCE_NAME);
2729		2622
2730	force->slaying = name;	2623	force->slaying = name;
2731	force->stats.food = 1;	2624	force->force_set_timer (duration);
2732	force->speed_left = -1.f;
2733
2734	force->set_speed (duration ? 1.f / duration : 0.f);
2735	force->flag [FLAG_IS_USED_UP] = true;
2736	force->flag [FLAG_APPLIED] = true;	2625	force->flag [FLAG_APPLIED] = true;
2737		2626
2738	insert (force);	2627	return insert (force);
2739	}	2628	}
2740		2629
2741	void	2630	void
2742	object::play_sound (faceidx sound) const	2631	object::play_sound (faceidx sound) const
2743	{	2632	{
2744	if (!sound)	2633	if (!sound)
2745	return;	2634	return;
2746		2635
2747	if (flag [FLAG_REMOVED])	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 ())
2748	return;	2661	return;
2749		2662
2750	if (env)	2663	// find old force, or create new one
2751	{	2664	object *force = force_find (shstr_noise_force);
2752	if (object *pl = in_player ())	2665
2753	pl->contr->play_sound (sound);	2666	if (force)
2754	}	2667	force->speed_left = -1.f; // patch old speed up
2755	else	2668	else
2756	map->play_sound (sound, x, y);	2669	{
2757	}	2670	force = archetype::get (shstr_noise_force);
2758		2671
		2672	force->slaying = shstr_noise_force;
		2673	force->stats.food = 1;
		2674	force->speed_left = -1.f;
		2675
		2676	force->set_speed (1.f / 4.f);
		2677	force->flag [FLAG_IS_USED_UP] = true;
		2678	force->flag [FLAG_APPLIED] = true;
		2679
		2680	insert (force);
		2681	}
		2682	}
		2683

Diff Legend

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