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.202 by root, Thu Apr 10 15:35:15 2008 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 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;
43		42
44	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	43	//+GPL
		44
		45	short freearr_x[SIZEOFFREE] = {
		46	0,
		47	0, 1, 1, 1, 0, -1, -1, -1,
		48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
46	};	50	};
47	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	51	short freearr_y[SIZEOFFREE] = {
		52	0,
		53	-1, -1, 0, 1, 1, 1, 0, -1,
		54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
48	-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
49	};
50	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
51	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
52	};	56	};
53	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
54	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	58	0,
		59	1, 2, 3, 4, 5, 6, 7, 8,
		60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
55	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
56	};	62	};
57		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
58	static void	71	static void
59	write_uuid (void)	72	write_uuid (uval64 skip, bool sync)
60	{	73	{
61	char filename1[MAX_BUF], filename2[MAX_BUF];	74	CALL_BEGIN (2);
62		75	CALL_ARG_SV (newSVval64 (skip));
63	sprintf (filename1, "%s/uuid", settings.localdir);	76	CALL_ARG_SV (boolSV (sync));
64	sprintf (filename2, "%s/uuid~", settings.localdir);	77	CALL_CALL ("cf::write_uuid", G_DISCARD);
65		78	CALL_END;
66	FILE *fp;
67
68	if (!(fp = fopen (filename2, "w")))
69	{
70	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
71	return;
72	}
73
74	fprintf (fp, "<1,%llx>\n", (unsigned long long)UUID::cur.seq + UUID_SKIP * 2);
75	fclose (fp);
76	rename (filename2, filename1);
77	}	79	}
78		80
79	static void	81	static void
80	read_uuid (void)	82	read_uuid (void)
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 ();	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	int version;	106	UUID::BUF buf;
103	unsigned long long uid;	107	buf[0] = 0;
104	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	108	fgets (buf, sizeof (buf), fp);
		109
		110	if (!UUID::cur.parse (buf))
105	{	111	{
106	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	112	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
107	_exit (1);	113	_exit (1);
108	}	114	}
109		115
110	UUID::cur.seq = uid;	116	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
111	write_uuid ();	117
112	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	118	write_uuid (UUID_GAP, true);
113	fclose (fp);	119	fclose (fp);
114	}	120	}
115		121
116	UUID	122	UUID
117	UUID::gen ()	123	UUID::gen ()
118	{	124	{
119	UUID uid;	125	UUID uid;
120		126
121	uid.seq = ++cur.seq;	127	uid.seq = ++cur.seq;
122		128
123	if (!(cur.seq & (UUID_SKIP - 1)))	129	if (expect_false (cur.seq >= seq_next_save))
124	write_uuid ();	130	{
		131	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		132	write_uuid (UUID_GAP, false);
		133	}
		134
125		135
126	return uid;	136	return uid;
127	}	137	}
128		138
129	void	139	void
…		…
131	{	141	{
132	read_uuid ();	142	read_uuid ();
133	}	143	}
134		144
135	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
136	static int	146	static bool
137	compare_ob_value_lists_one (const object *wants, const object *has)	147	compare_ob_value_lists_one (const object *wants, const object *has)
138	{	148	{
139	key_value *wants_field;
140
141	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	149	/* n-squared behaviour (see kv_get), but I'm hoping both
142	* objects with lists are rare, and lists stay short. If not, use a	150	* objects with lists are rare, and lists stay short. If not, use a
143	* different structure or at least keep the lists sorted...	151	* different structure or at least keep the lists sorted...
144	*/	152	*/
145		153
146	/* For each field in wants, */	154	/* For each field in wants, */
147	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	155	for (key_value *kv = wants->key_values; kv; kv = kv->next)
148	{	156	if (has->kv_get (kv->key) != kv->value)
149	key_value *has_field;	157	return false;
150
151	/* Look for a field in has with the same key. */
152	has_field = get_ob_key_link (has, wants_field->key);
153
154	if (has_field == NULL)
155	{
156	/* No field with that name. */
157	return FALSE;
158	}
159
160	/* Found the matching field. */
161	if (has_field->value != wants_field->value)
162	{
163	/* Values don't match, so this half of the comparison is false. */
164	return FALSE;
165	}
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		158
170	/* If we get here, every field in wants has a matching field in has. */	159	/* If we get here, every field in wants has a matching field in has. */
171	return TRUE;	160	return true;
172	}	161	}
173		162
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	163	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static int	164	static bool
176	compare_ob_value_lists (const object *ob1, const object *ob2)	165	compare_ob_value_lists (const object *ob1, const object *ob2)
177	{	166	{
178	/* However, there may be fields in has which aren't partnered in wants,	167	/* However, there may be fields in has which aren't partnered in wants,
179	* so we need to run the comparison *twice*. :(	168	* so we need to run the comparison *twice*. :(
180	*/	169	*/
181	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	170	return compare_ob_value_lists_one (ob1, ob2)
		171	&& compare_ob_value_lists_one (ob2, ob1);
182	}	172	}
183		173
184	/* Function examines the 2 objects given to it, and returns true if	174	/* Function examines the 2 objects given to it, and returns true if
185	* they can be merged together.	175	* they can be merged together.
186	*	176	*
…		…
201	|| ob1->speed != ob2->speed	191	|| ob1->speed != ob2->speed
202	|| ob1->value != ob2->value	192	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	193	|| ob1->name != ob2->name)
204	return 0;	194	return 0;
205		195
206	//TODO: this ain't working well, use nicer and correct overflow check
207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	196	/* Do not merge objects if nrof would overflow, assume nrof
208	* value could not be stored in a sint32 (which unfortunately sometimes is	197	* is always 0 .. 2**31-1 */
209	* used to store nrof).	198	if (ob1->nrof > 0x7fffffff - ob2->nrof)
210	*/
211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
212	return 0;	199	return 0;
213		200
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	201	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* This is to the comparison of the flags below will be OK. We	202	* This is to the comparison of the flags below will be OK. We
216	* just can't ignore the been applied or identified flags, as they	203	* just can't ignore the been applied or identified flags, as they
217	* are not equal - just if it has been identified, the been_applied	204	* are not equal - just if it has been identified, the been_applied
218	* flags lose any meaning.	205	* flags lose any meaning.
219	*/	206	*/
220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	207	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	208	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		209
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	210	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	211	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		212
226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	213	if (ob1->arch->archname != ob2->arch->archname
227	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	214	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	215	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	216	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	217	|| ob1->weight != ob2->weight
232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
234	|| ob1->attacktype != ob2->attacktype	218	|| ob1->attacktype != ob2->attacktype
235	|| ob1->magic != ob2->magic	219	|| ob1->magic != ob2->magic
236	|| ob1->slaying != ob2->slaying	220	|| ob1->slaying != ob2->slaying
237	|| ob1->skill != ob2->skill	221	|| ob1->skill != ob2->skill
238	|| ob1->value != ob2->value	222	|| ob1->value != ob2->value
239	|| ob1->animation_id != ob2->animation_id	223	|| ob1->animation_id != ob2->animation_id
		224	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
240	|| ob1->client_type != ob2->client_type	225	|| ob1->client_type != ob2->client_type
241	|| ob1->materialname != ob2->materialname	226	|| ob1->materialname != ob2->materialname
242	|| ob1->lore != ob2->lore	227	|| ob1->lore != ob2->lore
243	|| ob1->subtype != ob2->subtype	228	|| ob1->subtype != ob2->subtype
244	|| ob1->move_type != ob2->move_type	229	|| ob1->move_type != ob2->move_type
245	|| ob1->move_block != ob2->move_block	230	|| ob1->move_block != ob2->move_block
246	|| ob1->move_allow != ob2->move_allow	231	|| ob1->move_allow != ob2->move_allow
247	|| ob1->move_on != ob2->move_on	232	|| ob1->move_on != ob2->move_on
248	|| ob1->move_off != ob2->move_off	233	|| ob1->move_off != ob2->move_off
249	|| ob1->move_slow != ob2->move_slow	234	|| ob1->move_slow != ob2->move_slow
250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	235	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		236	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		237	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
251	return 0;	238	return 0;
252		239
		240	if ((ob1->flag ^ ob2->flag)
		241	.reset (FLAG_INV_LOCKED)
		242	.reset (FLAG_REMOVED)
		243	.any ())
		244	return 0;
		245
253	/* This is really a spellbook check - really, we should	246	/* This is really a spellbook check - we should in general
254	* check all objects in the inventory.	247	* not merge objects with real inventories, as splitting them
		248	* is hard.
255	*/	249	*/
256	if (ob1->inv || ob2->inv)	250	if (ob1->inv || ob2->inv)
257	{	251	{
258	if (!(ob1->inv && ob2->inv))	252	if (!(ob1->inv && ob2->inv))
259	return 0; /* inventories differ in length */	253	return 0; /* inventories differ in length */
260		254
261	if (ob1->inv->below || ob2->inv->below)	255	if (ob1->inv->below || ob2->inv->below)
262	return 0; /* more than one object in inv */	256	return 0; /* more than one object in inv */
263		257
264	if (!object::can_merge (ob1->inv, ob2->inv))	258	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0; /* inventory objexts differ */	259	return 0; /* inventory objects differ */
266		260
267	/* inventory ok - still need to check rest of this object to see	261	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	262	* if it is valid.
269	*/	263	*/
270	}	264	}
…		…
289	if (ob1->level != ob2->level)	283	if (ob1->level != ob2->level)
290	return 0;	284	return 0;
291	break;	285	break;
292	}	286	}
293		287
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	288	if (ob1->key_values || ob2->key_values)
295	{	289	{
296	/* At least one of these has key_values. */	290	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	291	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	292	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	293
300	else if (!compare_ob_value_lists (ob1, ob2))	294	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	295	return 0;
302	}	296	}
303		297
304	if (ob1->self || ob2->self)	298	if (ob1->self || ob2->self)
305	{	299	{
…		…
311	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	305	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
312	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	306	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
313		307
314	if (k1 != k2)	308	if (k1 != k2)
315	return 0;	309	return 0;
		310
316	else if (k1 == 0)	311	if (k1 == 0)
317	return 1;	312	return 1;
		313
318	else if (!cfperl_can_merge (ob1, ob2))	314	if (!cfperl_can_merge (ob1, ob2))
319	return 0;	315	return 0;
320	}	316	}
321	}	317	}
322		318
323	/* Everything passes, must be OK. */	319	/* Everything passes, must be OK. */
324	return 1;	320	return 1;
325	}	321	}
326		322
		323	// find player who can see this object
		324	object *
		325	object::visible_to () const
		326	{
		327	if (client_visible () && !flag [FLAG_REMOVED])
		328	{
		329	// see if we are in a container of sorts
		330	if (env)
		331	{
		332	// the player inventory itself is always visible
		333	if (env->is_player ())
		334	return env;
		335
		336	// else a player could have our env open
		337	object *envest = env->outer_env_or_self ();
		338
		339	// the player itself is always on a map, so we will find him here
		340	// even if our inv is in a player.
		341	if (envest->is_on_map ())
		342	if (object *pl = envest->ms ().player ())
		343	if (pl->container_ () == env)
		344	return pl;
		345	}
		346	else
		347	{
		348	// maybe there is a player standing on the same mapspace
		349	// this will catch the case where "this" is a player
		350	if (object *pl = ms ().player ())
		351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		352	|| pl->container_ () == this)
		353	return pl;
		354	}
		355	}
		356
		357	return 0;
		358	}
		359
		360	// adjust weight per container type ("of holding")
		361	static sint32
		362	weight_adjust_for (object *op, sint32 weight)
		363	{
		364	return op->type == CONTAINER
		365	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		366	: weight;
		367	}
		368
327	/*	369	/*
		370	* adjust_weight(object, weight) adds the specified weight to an object,
		371	* and also updates how much the environment(s) is/are carrying.
		372	*/
		373	static void
		374	adjust_weight (object *op, sint32 weight)
		375	{
		376	while (op)
		377	{
		378	// adjust by actual difference to account for rounding errors
		379	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		380	weight = weight_adjust_for (op, op->carrying)
		381	- weight_adjust_for (op, op->carrying - weight);
		382
		383	if (!weight)
		384	return;
		385
		386	op->carrying += weight;
		387
		388	if (object *pl = op->visible_to ())
		389	if (pl != op) // player is handled lazily
		390	esrv_update_item (UPD_WEIGHT, pl, op);
		391
		392	op = op->env;
		393	}
		394	}
		395
		396	/*
328	* sum_weight() is a recursive function which calculates the weight	397	* this is a recursive function which calculates the weight
329	* an object is carrying. It goes through in figures out how much	398	* an object is carrying. It goes through op and figures out how much
330	* containers are carrying, and sums it up.	399	* containers are carrying, and sums it up.
331	*/	400	*/
332	long	401	void
333	sum_weight (object *op)	402	object::update_weight ()
334	{	403	{
335	long sum;	404	sint32 sum = 0;
336	object *inv;
337		405
338	for (sum = 0, inv = op->inv; inv; inv = inv->below)	406	for (object *op = inv; op; op = op->below)
339	{	407	{
340	if (inv->inv)	408	if (op->inv)
341	sum_weight (inv);	409	op->update_weight ();
342		410
343	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	411	sum += op->total_weight ();
		412	}
		413
		414	sum = weight_adjust_for (this, sum);
		415
		416	if (sum != carrying)
344	}	417	{
345
346	if (op->type == CONTAINER && op->stats.Str)
347	sum = (sum * (100 - op->stats.Str)) / 100;
348
349	if (op->carrying != sum)
350	op->carrying = sum;	418	carrying = sum;
351		419
352	return sum;	420	if (object *pl = visible_to ())
		421	if (pl != this) // player is handled lazily
		422	esrv_update_item (UPD_WEIGHT, pl, this);
		423	}
353	}	424	}
354		425
355	/**	426	/*
356	* Return the outermost environment object for a given object.	427	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
357	*/
358
359	object *
360	object_get_env_recursive (object *op)
361	{
362	while (op->env != NULL)
363	op = op->env;
364	return op;
365	}
366
367	/*
368	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
369	* Some error messages.
370	* The result of the dump is stored in the static global errmsg array.
371	*/	428	*/
372	char *	429	char *
373	dump_object (object *op)	430	dump_object (object *op)
374	{	431	{
375	if (!op)	432	if (!op)
…		…
378	object_freezer freezer;	435	object_freezer freezer;
379	op->write (freezer);	436	op->write (freezer);
380	return freezer.as_string ();	437	return freezer.as_string ();
381	}	438	}
382		439
383	/*	440	char *
384	* get_nearest_part(multi-object, object 2) returns the part of the	441	object::as_string ()
385	* multi-object 1 which is closest to the second object.
386	* If it's not a multi-object, it is returned.
387	*/
388	object *
389	get_nearest_part (object *op, const object *pl)
390	{	442	{
391	object *tmp, *closest;	443	return dump_object (this);
392	int last_dist, i;
393
394	if (op->more == NULL)
395	return op;
396	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
397	if ((i = distance (tmp, pl)) < last_dist)
398	closest = tmp, last_dist = i;
399	return closest;
400	}	444	}
401		445
402	/*	446	/*
403	* Returns the object which has the count-variable equal to the argument.	447	* Returns the object which has the count-variable equal to the argument.
		448	* VERRRY slow.
404	*/	449	*/
405	object *	450	object *
406	find_object (tag_t i)	451	find_object (tag_t i)
407	{	452	{
408	for_all_objects (op)	453	for_all_objects (op)
…		…
419	*/	464	*/
420	object *	465	object *
421	find_object_name (const char *str)	466	find_object_name (const char *str)
422	{	467	{
423	shstr_cmp str_ (str);	468	shstr_cmp str_ (str);
424	object *op;
425		469
		470	if (str_)
426	for_all_objects (op)	471	for_all_objects (op)
427	if (op->name == str_)	472	if (op->name == str_)
428	break;	473	return op;
429		474
430	return op;	475	return 0;
431	}	476	}
432		477
433	/*	478	/*
434	* Sets the owner and sets the skill and exp pointers to owner's current	479	* Sets the owner and sets the skill and exp pointers to owner's current
435	* skill and experience objects.	480	* skill and experience objects.
…		…
497	update_stats ();	542	update_stats ();
498		543
499	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
500	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
501	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
502	"[You need to unapply some items first.]", &ob->name);	547	"[You need to unapply some items first - use the 'body' command to see "
		548	"how many items you cna wera on a specific body part.]", &ob->name);
503	return false;	549	return false;
504	}	550	}
505		551
506	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	552	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
507	}	553	}
…		…
533	}	579	}
534		580
535	op->key_values = 0;	581	op->key_values = 0;
536	}	582	}
537		583
538	object &	584	/*
539	object::operator =(const object &src)	585	* copy_to first frees everything allocated by the dst object,
		586	* and then copies the contents of itself into the second
		587	* object, allocating what needs to be allocated. Basically, any
		588	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		589	* if the first object is freed, the pointers in the new object
		590	* will point at garbage.
		591	*/
		592	void
		593	object::copy_to (object *dst)
540	{	594	{
541	bool is_freed = flag [FLAG_FREED];	595	dst->remove ();
542	bool is_removed = flag [FLAG_REMOVED];
543
544	*(object_copy *)this = src;	596	*(object_copy *)dst = *this;
545
546	flag [FLAG_FREED] = is_freed;
547	flag [FLAG_REMOVED] = is_removed;	597	dst->flag [FLAG_REMOVED] = true;
548		598
549	/* Copy over key_values, if any. */	599	/* Copy over key_values, if any. */
550	if (src.key_values)	600	if (key_values)
551	{	601	{
552	key_value *tail = 0;	602	key_value *tail = 0;
553	key_values = 0;	603	dst->key_values = 0;
554		604
555	for (key_value *i = src.key_values; i; i = i->next)	605	for (key_value *i = key_values; i; i = i->next)
556	{	606	{
557	key_value *new_link = new key_value;	607	key_value *new_link = new key_value;
558		608
559	new_link->next = 0;	609	new_link->next = 0;
560	new_link->key = i->key;	610	new_link->key = i->key;
561	new_link->value = i->value;	611	new_link->value = i->value;
562		612
563	/* Try and be clever here, too. */	613	/* Try and be clever here, too. */
564	if (!key_values)	614	if (!dst->key_values)
565	{	615	{
566	key_values = new_link;	616	dst->key_values = new_link;
567	tail = new_link;	617	tail = new_link;
568	}	618	}
569	else	619	else
570	{	620	{
571	tail->next = new_link;	621	tail->next = new_link;
572	tail = new_link;	622	tail = new_link;
573	}	623	}
574	}	624	}
575	}	625	}
576	}
577
578	/*
579	* copy_to first frees everything allocated by the dst object,
580	* and then copies the contents of itself into the second
581	* object, allocating what needs to be allocated. Basically, any
582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
583	* if the first object is freed, the pointers in the new object
584	* will point at garbage.
585	*/
586	void
587	object::copy_to (object *dst)
588	{
589	*dst = *this;
590		626
591	if (speed < 0)	627	if (speed < 0)
592	dst->speed_left -= rndm ();	628	dst->speed_left -= rndm ();
593		629
594	dst->set_speed (dst->speed);	630	dst->activate ();
595	}	631	}
596		632
597	void	633	void
598	object::instantiate ()	634	object::instantiate ()
599	{	635	{
…		…
616	object *	652	object *
617	object::clone ()	653	object::clone ()
618	{	654	{
619	object *neu = create ();	655	object *neu = create ();
620	copy_to (neu);	656	copy_to (neu);
		657	neu->map = map; // not copied by copy_to
621	return neu;	658	return neu;
622	}	659	}
623		660
624	/*	661	/*
625	* If an object with the IS_TURNABLE() flag needs to be turned due	662	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
676	* UP_OBJ_FACE: only the objects face has changed.	713	* UP_OBJ_FACE: only the objects face has changed.
677	*/	714	*/
678	void	715	void
679	update_object (object *op, int action)	716	update_object (object *op, int action)
680	{	717	{
681	if (op == NULL)	718	if (!op)
682	{	719	{
683	/* this should never happen */	720	/* this should never happen */
684	LOG (llevDebug, "update_object() called for NULL object.\n");	721	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
685	return;	722	return;
686	}	723	}
687		724
688	if (op->env)	725	if (!op->is_on_map ())
689	{	726	{
690	/* Animation is currently handled by client, so nothing	727	/* Animation is currently handled by client, so nothing
691	* to do in this case.	728	* to do in this case.
692	*/	729	*/
693	return;	730	return;
694	}	731	}
695
696	/* If the map is saving, don't do anything as everything is
697	* going to get freed anyways.
698	*/
699	if (!op->map || op->map->in_memory == MAP_SAVING)
700	return;
701		732
702	/* make sure the object is within map boundaries */	733	/* make sure the object is within map boundaries */
703	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	734	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
704	{	735	{
705	LOG (llevError, "update_object() called for object out of map!\n");	736	LOG (llevError, "update_object() called for object out of map!\n");
…		…
716	else if (action == UP_OBJ_INSERT)	747	else if (action == UP_OBJ_INSERT)
717	{	748	{
718	// this is likely overkill, TODO: revisit (schmorp)	749	// this is likely overkill, TODO: revisit (schmorp)
719	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	750	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
720	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	751	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
721	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	752	|| (op->is_player () && !(m.flags_ & P_PLAYER))
722	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	753	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
723	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	754	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
724	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	755	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
725	|| (m.move_on | op->move_on ) != m.move_on	756	|| (m.move_on | op->move_on ) != m.move_on
726	|| (m.move_off | op->move_off ) != m.move_off	757	|| (m.move_off | op->move_off ) != m.move_off
727	|| (m.move_slow | op->move_slow) != m.move_slow	758	|| (m.move_slow | op->move_slow) != m.move_slow
728	/* This isn't perfect, but I don't expect a lot of objects to	759	/* This isn't perfect, but I don't expect a lot of objects to
729	* to have move_allow right now.	760	* have move_allow right now.
730	*/	761	*/
731	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	762	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
732	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	763	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
733	m.flags_ = 0;	764	m.invalidate ();
734	}	765	}
735	/* if the object is being removed, we can't make intelligent	766	/* if the object is being removed, we can't make intelligent
736	* decisions, because remove_ob can't really pass the object	767	* decisions, because remove_ob can't really pass the object
737	* that is being removed.	768	* that is being removed.
738	*/	769	*/
739	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	770	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
740	m.flags_ = 0;	771	m.invalidate ();
741	else if (action == UP_OBJ_FACE)	772	else if (action == UP_OBJ_FACE)
742	/* Nothing to do for that case */ ;	773	/* Nothing to do for that case */ ;
743	else	774	else
744	LOG (llevError, "update_object called with invalid action: %d\n", action);	775	LOG (llevError, "update_object called with invalid action: %d\n", action);
745		776
…		…
749		780
750	object::object ()	781	object::object ()
751	{	782	{
752	SET_FLAG (this, FLAG_REMOVED);	783	SET_FLAG (this, FLAG_REMOVED);
753		784
754	expmul = 1.0;	785	//expmul = 1.0; declared const for the time being
755	face = blank_face;	786	face = blank_face;
756	}	787	}
757		788
758	object::~object ()	789	object::~object ()
759	{	790	{
…		…
789	/* If already on active list, don't do anything */	820	/* If already on active list, don't do anything */
790	if (active)	821	if (active)
791	return;	822	return;
792		823
793	if (has_active_speed ())	824	if (has_active_speed ())
		825	{
		826	if (flag [FLAG_FREED])
		827	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		828
794	actives.insert (this);	829	actives.insert (this);
		830	}
795	}	831	}
796		832
797	void	833	void
798	object::activate_recursive ()	834	object::activate_recursive ()
799	{	835	{
…		…
848	object::destroy_inv (bool drop_to_ground)	884	object::destroy_inv (bool drop_to_ground)
849	{	885	{
850	// need to check first, because the checks below might segfault	886	// need to check first, because the checks below might segfault
851	// as we might be on an invalid mapspace and crossfire code	887	// as we might be on an invalid mapspace and crossfire code
852	// is too buggy to ensure that the inventory is empty.	888	// is too buggy to ensure that the inventory is empty.
853	// corollary: if you create arrows etc. with stuff in tis inventory,	889	// corollary: if you create arrows etc. with stuff in its inventory,
854	// cf will crash below with off-map x and y	890	// cf will crash below with off-map x and y
855	if (!inv)	891	if (!inv)
856	return;	892	return;
857		893
858	/* Only if the space blocks everything do we not process -	894	/* Only if the space blocks everything do we not process -
859	* if some form of movement is allowed, let objects	895	* if some form of movement is allowed, let objects
860	* drop on that space.	896	* drop on that space.
861	*/	897	*/
862	if (!drop_to_ground	898	if (!drop_to_ground
863	|| !map	899	|| !map
864	|| map->in_memory != MAP_IN_MEMORY	900	|| map->in_memory != MAP_ACTIVE
865	|| map->nodrop	901	|| map->no_drop
866	|| ms ().move_block == MOVE_ALL)	902	|| ms ().move_block == MOVE_ALL)
867	{	903	{
868	while (inv)	904	while (inv)
869	{
870	inv->destroy_inv (drop_to_ground);
871	inv->destroy ();	905	inv->destroy ();
872	}
873	}	906	}
874	else	907	else
875	{ /* Put objects in inventory onto this space */	908	{ /* Put objects in inventory onto this space */
876	while (inv)	909	while (inv)
877	{	910	{
…		…
895	object *op = new object;	928	object *op = new object;
896	op->link ();	929	op->link ();
897	return op;	930	return op;
898	}	931	}
899		932
		933	static struct freed_map : maptile
		934	{
		935	freed_map ()
		936	{
		937	path = "<freed objects map>";
		938	name = "/internal/freed_objects_map";
		939	width = 3;
		940	height = 3;
		941	no_drop = 1;
		942	no_reset = 1;
		943
		944	alloc ();
		945	in_memory = MAP_ACTIVE;
		946	}
		947
		948	~freed_map ()
		949	{
		950	destroy ();
		951	}
		952	} freed_map; // freed objects are moved here to avoid crashes
		953
900	void	954	void
901	object::do_destroy ()	955	object::do_destroy ()
902	{	956	{
903	attachable::do_destroy ();
904
905	if (flag [FLAG_IS_LINKED])	957	if (flag [FLAG_IS_LINKED])
906	remove_button_link (this);	958	remove_link ();
907		959
908	if (flag [FLAG_FRIENDLY])	960	if (flag [FLAG_FRIENDLY])
909	remove_friendly_object (this);	961	remove_friendly_object (this);
910		962
911	if (!flag [FLAG_REMOVED])
912	remove ();	963	remove ();
913		964
914	destroy_inv (true);	965	attachable::do_destroy ();
915		966
916	deactivate ();	967	deactivate ();
917	unlink ();	968	unlink ();
918		969
919	flag [FLAG_FREED] = 1;	970	flag [FLAG_FREED] = 1;
920		971
921	// hack to ensure that freed objects still have a valid map	972	// hack to ensure that freed objects still have a valid map
922	{
923	static maptile *freed_map; // freed objects are moved here to avoid crashes
924
925	if (!freed_map)
926	{
927	freed_map = new maptile;
928
929	freed_map->path = "<freed objects map>";
930	freed_map->name = "/internal/freed_objects_map";
931	freed_map->width = 3;
932	freed_map->height = 3;
933	freed_map->nodrop = 1;
934
935	freed_map->alloc ();
936	freed_map->in_memory = MAP_IN_MEMORY;
937	}
938
939	map = freed_map;	973	map = &freed_map;
940	x = 1;	974	x = 1;
941	y = 1;	975	y = 1;
942	}
943		976
944	if (more)	977	if (more)
945	{	978	{
946	more->destroy ();	979	more->destroy ();
947	more = 0;	980	more = 0;
…		…
955	attacked_by = 0;	988	attacked_by = 0;
956	current_weapon = 0;	989	current_weapon = 0;
957	}	990	}
958		991
959	void	992	void
960	object::destroy (bool destroy_inventory)	993	object::destroy ()
961	{	994	{
962	if (destroyed ())	995	if (destroyed ())
963	return;	996	return;
964		997
965	if (destroy_inventory)	998	if (!is_head () && !head->destroyed ())
		999	{
		1000	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1001	head->destroy ();
		1002	return;
		1003	}
		1004
966	destroy_inv (false);	1005	destroy_inv (false);
967		1006
968	if (is_head ())	1007	if (is_head ())
969	if (sound_destroy)	1008	if (sound_destroy)
970	play_sound (sound_destroy);	1009	play_sound (sound_destroy);
971	else if (flag [FLAG_MONSTER])	1010	else if (flag [FLAG_MONSTER])
972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1011	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
973		1012
974	attachable::destroy ();	1013	attachable::destroy ();
975	}
976
977	/*
978	* sub_weight() recursively (outwards) subtracts a number from the
979	* weight of an object (and what is carried by it's environment(s)).
980	*/
981	void
982	sub_weight (object *op, signed long weight)
983	{
984	while (op != NULL)
985	{
986	if (op->type == CONTAINER)
987	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
988
989	op->carrying -= weight;
990	op = op->env;
991	}
992	}	1014	}
993		1015
994	/* op->remove ():	1016	/* op->remove ():
995	* This function removes the object op from the linked list of objects	1017	* This function removes the object op from the linked list of objects
996	* which it is currently tied to. When this function is done, the	1018	* which it is currently tied to. When this function is done, the
…		…
999	* the previous environment.	1021	* the previous environment.
1000	*/	1022	*/
1001	void	1023	void
1002	object::do_remove ()	1024	object::do_remove ()
1003	{	1025	{
1004	object *tmp, *last = 0;	1026	if (flag [FLAG_REMOVED])
1005	object *otmp;
1006
1007	if (QUERY_FLAG (this, FLAG_REMOVED))
1008	return;	1027	return;
1009		1028
1010	SET_FLAG (this, FLAG_REMOVED);
1011	INVOKE_OBJECT (REMOVE, this);	1029	INVOKE_OBJECT (REMOVE, this);
		1030
		1031	flag [FLAG_REMOVED] = true;
1012		1032
1013	if (more)	1033	if (more)
1014	more->remove ();	1034	more->remove ();
1015		1035
1016	/*	1036	/*
1017	* In this case, the object to be removed is in someones	1037	* In this case, the object to be removed is in someones
1018	* inventory.	1038	* inventory.
1019	*/	1039	*/
1020	if (env)	1040	if (env)
1021	{	1041	{
1022	if (nrof)	1042	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1023	sub_weight (env, weight * nrof);	1043	if (object *pl = visible_to ())
1024	else	1044	esrv_del_item (pl->contr, count);
1025	sub_weight (env, weight + carrying);	1045	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1046
		1047	adjust_weight (env, -total_weight ());
		1048
		1049	object *pl = in_player ();
		1050
		1051	/* we set up values so that it could be inserted into
		1052	* the map, but we don't actually do that - it is up
		1053	* to the caller to decide what we want to do.
		1054	*/
		1055	map = env->map;
		1056	x = env->x;
		1057	y = env->y;
		1058
		1059	// make sure cmov optimisation is applicable
		1060	*(above ? &above->below : &env->inv) = below;
		1061	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1062
		1063	above = 0;
		1064	below = 0;
		1065	env = 0;
1026		1066
1027	/* NO_FIX_PLAYER is set when a great many changes are being	1067	/* NO_FIX_PLAYER is set when a great many changes are being
1028	* made to players inventory. If set, avoiding the call	1068	* made to players inventory. If set, avoiding the call
1029	* to save cpu time.	1069	* to save cpu time.
1030	*/	1070	*/
1031	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1071	if (pl)
		1072	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1073	{
1032	otmp->update_stats ();	1074	pl->update_stats ();
1033		1075
1034	if (above)	1076	if (glow_radius && pl->is_on_map ())
1035	above->below = below;	1077	update_all_los (pl->map, pl->x, pl->y);
1036	else	1078	}
1037	env->inv = below;
1038
1039	if (below)
1040	below->above = above;
1041
1042	/* we set up values so that it could be inserted into
1043	* the map, but we don't actually do that - it is up
1044	* to the caller to decide what we want to do.
1045	*/
1046	x = env->x, y = env->y;
1047	map = env->map;
1048	above = 0, below = 0;
1049	env = 0;
1050	}	1079	}
1051	else if (map)	1080	else if (map)
1052	{	1081	{
1053	if (type == PLAYER)
1054	{
1055	// leaving a spot always closes any open container on the ground
1056	if (container && !container->env)
1057	// this causes spurious floorbox updates, but it ensures
1058	// that the CLOSE event is being sent.
1059	close_container ();
1060
1061	--map->players;
1062	map->touch ();
1063	}
1064
1065	map->dirty = true;	1082	map->dirty = true;
1066	mapspace &ms = this->ms ();	1083	mapspace &ms = this->ms ();
1067		1084
		1085	if (object *pl = ms.player ())
		1086	{
		1087	if (is_player ())
		1088	{
		1089	if (!flag [FLAG_WIZPASS])
		1090	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1091
		1092	// leaving a spot always closes any open container on the ground
		1093	if (container && !container->env)
		1094	// this causes spurious floorbox updates, but it ensures
		1095	// that the CLOSE event is being sent.
		1096	close_container ();
		1097
		1098	--map->players;
		1099	map->touch ();
		1100	}
		1101	else if (pl->container_ () == this)
		1102	{
		1103	// removing a container should close it
		1104	close_container ();
		1105	}
		1106
		1107	esrv_del_item (pl->contr, count);
		1108	}
		1109
1068	/* link the object above us */	1110	/* link the object above us */
1069	if (above)	1111	// re-link, make sure compiler can easily use cmove
1070	above->below = below;	1112	*(above ? &above->below : &ms.top) = below;
1071	else	1113	*(below ? &below->above : &ms.bot) = above;
1072	ms.top = below; /* we were top, set new top */
1073
1074	/* Relink the object below us, if there is one */
1075	if (below)
1076	below->above = above;
1077	else
1078	{
1079	/* Nothing below, which means we need to relink map object for this space
1080	* use translated coordinates in case some oddness with map tiling is
1081	* evident
1082	*/
1083	if (GET_MAP_OB (map, x, y) != this)
1084	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 ());
1085
1086	ms.bot = above; /* goes on above it. */
1087	}
1088		1114
1089	above = 0;	1115	above = 0;
1090	below = 0;	1116	below = 0;
1091		1117
		1118	ms.invalidate ();
		1119
1092	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
1093	return;	1121	return;
1094		1122
1095	int check_walk_off = !flag [FLAG_NO_APPLY];	1123	int check_walk_off = !flag [FLAG_NO_APPLY];
1096		1124
1097	if (object *pl = ms.player ())	1125	if (object *pl = ms.player ())
1098	{	1126	{
1099	if (pl->container == this)	1127	if (pl->container_ () == this)
1100	/* If a container that the player is currently using somehow gets	1128	/* If a container that the player is currently using somehow gets
1101	* removed (most likely destroyed), update the player view	1129	* removed (most likely destroyed), update the player view
1102	* appropriately.	1130	* appropriately.
1103	*/	1131	*/
1104	pl->close_container ();	1132	pl->close_container ();
1105		1133
		1134	//TODO: the floorbox prev/next might need updating
		1135	//esrv_del_item (pl->contr, count);
		1136	//TODO: update floorbox to preserve ordering
		1137	if (pl->contr->ns)
1106	pl->contr->ns->floorbox_update ();	1138	pl->contr->ns->floorbox_update ();
1107	}	1139	}
1108		1140
		1141	if (check_walk_off)
1109	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1110	{	1143	{
		1144	above = tmp->above;
		1145
1111	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
1112	* being removed.	1147	* being removed.
1113	*/	1148	*/
1114		1149
1115	/* See if object moving off should effect something */	1150	/* See if object moving off should effect something */
1116	if (check_walk_off
1117	&& ((move_type & tmp->move_off)	1151	if ((move_type & tmp->move_off)
1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1119	{
1120	move_apply (tmp, this, 0);	1153	move_apply (tmp, this, 0);
1121
1122	if (destroyed ())
1123	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1124	}	1154	}
1125		1155
1126	last = tmp;	1156	if (affects_los ())
1127	}
1128
1129	/* last == NULL if there are no objects on this space */
1130	//TODO: this makes little sense, why only update the topmost object?
1131	if (!last)
1132	map->at (x, y).flags_ = 0;
1133	else
1134	update_object (last, UP_OBJ_REMOVE);
1135
1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1137	update_all_los (map, x, y);	1157	update_all_los (map, x, y);
1138	}	1158	}
1139	}	1159	}
1140		1160
1141	/*	1161	/*
…		…
1155	if (!top)	1175	if (!top)
1156	for (top = op; top && top->above; top = top->above)	1176	for (top = op; top && top->above; top = top->above)
1157	;	1177	;
1158		1178
1159	for (; top; top = top->below)	1179	for (; top; top = top->below)
1160	{
1161	if (top == op)
1162	continue;
1163
1164	if (object::can_merge (op, top))	1180	if (object::can_merge (op, top))
1165	{	1181	{
1166	top->nrof += op->nrof;	1182	top->nrof += op->nrof;
1167		1183
1168	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1184	if (object *pl = top->visible_to ())
1169	op->weight = 0; /* Don't want any adjustements now */	1185	esrv_update_item (UPD_NROF, pl, top);
		1186
		1187	op->weight = 0; // cancel the addition above
		1188	op->carrying = 0; // must be 0 already
		1189
1170	op->destroy ();	1190	op->destroy ();
		1191
1171	return top;	1192	return top;
1172	}	1193	}
1173	}
1174		1194
1175	return 0;	1195	return 0;
1176	}	1196	}
1177		1197
1178	void	1198	void
…		…
1203	* job preparing multi-part monsters.	1223	* job preparing multi-part monsters.
1204	*/	1224	*/
1205	object *	1225	object *
1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1226	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1207	{	1227	{
		1228	op->remove ();
		1229
1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1230	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1209	{	1231	{
1210	tmp->x = x + tmp->arch->x;	1232	tmp->x = x + tmp->arch->x;
1211	tmp->y = y + tmp->arch->y;	1233	tmp->y = y + tmp->arch->y;
1212	}	1234	}
…		…
1235	* just 'op' otherwise	1257	* just 'op' otherwise
1236	*/	1258	*/
1237	object *	1259	object *
1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1239	{	1261	{
1240	assert (!op->flag [FLAG_FREED]);
1241
1242	object *top, *floor = NULL;
1243
1244	op->remove ();	1262	op->remove ();
		1263
		1264	if (m == &freed_map)//D TODO: remove soon
		1265	{//D
		1266	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1267	}//D
1245		1268
1246	/* Ideally, the caller figures this out. However, it complicates a lot	1269	/* Ideally, the caller figures this out. However, it complicates a lot
1247	* of areas of callers (eg, anything that uses find_free_spot would now	1270	* of areas of callers (eg, anything that uses find_free_spot would now
1248	* need extra work	1271	* need extra work
1249	*/	1272	*/
		1273	maptile *newmap = m;
1250	if (!xy_normalise (m, op->x, op->y))	1274	if (!xy_normalise (newmap, op->x, op->y))
1251	{	1275	{
1252	op->destroy ();	1276	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1253	return 0;	1277	return 0;
1254	}	1278	}
1255		1279
1256	if (object *more = op->more)	1280	if (object *more = op->more)
1257	if (!insert_ob_in_map (more, m, originator, flag))	1281	if (!insert_ob_in_map (more, m, originator, flag))
1258	return 0;	1282	return 0;
1259		1283
1260	CLEAR_FLAG (op, FLAG_REMOVED);	1284	op->flag [FLAG_REMOVED] = false;
1261		1285	op->env = 0;
1262	op->map = m;	1286	op->map = newmap;
		1287
1263	mapspace &ms = op->ms ();	1288	mapspace &ms = op->ms ();
1264		1289
1265	/* this has to be done after we translate the coordinates.	1290	/* this has to be done after we translate the coordinates.
1266	*/	1291	*/
1267	if (op->nrof && !(flag & INS_NO_MERGE))	1292	if (op->nrof && !(flag & INS_NO_MERGE))
1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1293	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269	if (object::can_merge (op, tmp))	1294	if (object::can_merge (op, tmp))
1270	{	1295	{
		1296	// TODO: we actually want to update tmp, not op,
		1297	// but some caller surely breaks when we return tmp
		1298	// from here :/
1271	op->nrof += tmp->nrof;	1299	op->nrof += tmp->nrof;
1272	tmp->destroy ();	1300	tmp->destroy ();
1273	}	1301	}
1274		1302
1275	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1303	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1284	{	1312	{
1285	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1313	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1286	abort ();	1314	abort ();
1287	}	1315	}
1288		1316
		1317	if (!originator->is_on_map ())
		1318	{
		1319	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1320	op->debug_desc (), originator->debug_desc ());
		1321	abort ();
		1322	}
		1323
1289	op->above = originator;	1324	op->above = originator;
1290	op->below = originator->below;	1325	op->below = originator->below;
1291
1292	if (op->below)
1293	op->below->above = op;
1294	else
1295	ms.bot = op;
1296
1297	/* since *below* originator, no need to update top */
1298	originator->below = op;	1326	originator->below = op;
		1327
		1328	*(op->below ? &op->below->above : &ms.bot) = op;
1299	}	1329	}
1300	else	1330	else
1301	{	1331	{
1302	top = ms.bot;	1332	object *floor = 0;
		1333	object *top = ms.top;
1303		1334
1304	/* If there are other objects, then */	1335	/* If there are other objects, then */
1305	if (top)	1336	if (top)
1306	{	1337	{
1307	object *last = 0;
1308
1309	/*	1338	/*
1310	* If there are multiple objects on this space, we do some trickier handling.	1339	* If there are multiple objects on this space, we do some trickier handling.
1311	* We've already dealt with merging if appropriate.	1340	* We've already dealt with merging if appropriate.
1312	* Generally, we want to put the new object on top. But if	1341	* Generally, we want to put the new object on top. But if
1313	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1342	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1316	* once we get to them. This reduces the need to traverse over all of	1345	* once we get to them. This reduces the need to traverse over all of
1317	* them when adding another one - this saves quite a bit of cpu time	1346	* them when adding another one - this saves quite a bit of cpu time
1318	* when lots of spells are cast in one area. Currently, it is presumed	1347	* when lots of spells are cast in one area. Currently, it is presumed
1319	* that flying non pickable objects are spell objects.	1348	* that flying non pickable objects are spell objects.
1320	*/	1349	*/
1321	for (top = ms.bot; top; top = top->above)	1350	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1322	{	1351	{
1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1352	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1324	floor = top;	1353	floor = tmp;
1325		1354
1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1355	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1327	{	1356	{
1328	/* We insert above top, so we want this object below this */	1357	/* We insert above top, so we want this object below this */
1329	top = top->below;	1358	top = tmp->below;
1330	break;	1359	break;
1331	}	1360	}
1332		1361
1333	last = top;	1362	top = tmp;
1334	}	1363	}
1335
1336	/* Don't want top to be NULL, so set it to the last valid object */
1337	top = last;
1338		1364
1339	/* We let update_position deal with figuring out what the space	1365	/* We let update_position deal with figuring out what the space
1340	* looks like instead of lots of conditions here.	1366	* looks like instead of lots of conditions here.
1341	* makes things faster, and effectively the same result.	1367	* makes things faster, and effectively the same result.
1342	*/	1368	*/
…		…
1349	*/	1375	*/
1350	if (!(flag & INS_ON_TOP)	1376	if (!(flag & INS_ON_TOP)
1351	&& ms.flags () & P_BLOCKSVIEW	1377	&& ms.flags () & P_BLOCKSVIEW
1352	&& (op->face && !faces [op->face].visibility))	1378	&& (op->face && !faces [op->face].visibility))
1353	{	1379	{
		1380	object *last;
		1381
1354	for (last = top; last != floor; last = last->below)	1382	for (last = top; last != floor; last = last->below)
1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1383	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1356	break;	1384	break;
1357		1385
1358	/* Check to see if we found the object that blocks view,	1386	/* Check to see if we found the object that blocks view,
…		…
1366	} /* If objects on this space */	1394	} /* If objects on this space */
1367		1395
1368	if (flag & INS_ABOVE_FLOOR_ONLY)	1396	if (flag & INS_ABOVE_FLOOR_ONLY)
1369	top = floor;	1397	top = floor;
1370		1398
1371	/* Top is the object that our object (op) is going to get inserted above.	1399	// insert object above top, or bottom-most if top = 0
1372	*/
1373
1374	/* First object on this space */
1375	if (!top)	1400	if (!top)
1376	{	1401	{
		1402	op->below = 0;
1377	op->above = ms.bot;	1403	op->above = ms.bot;
1378
1379	if (op->above)
1380	op->above->below = op;
1381
1382	op->below = 0;
1383	ms.bot = op;	1404	ms.bot = op;
		1405
		1406	*(op->above ? &op->above->below : &ms.top) = op;
1384	}	1407	}
1385	else	1408	else
1386	{ /* get inserted into the stack above top */	1409	{
1387	op->above = top->above;	1410	op->above = top->above;
1388
1389	if (op->above)
1390	op->above->below = op;	1411	top->above = op;
1391		1412
1392	op->below = top;	1413	op->below = top;
1393	top->above = op;	1414	*(op->above ? &op->above->below : &ms.top) = op;
1394	}	1415	}
		1416	}
1395		1417
1396	if (!op->above)	1418	if (op->is_player ())
1397	ms.top = op;
1398	} /* else not INS_BELOW_ORIGINATOR */
1399
1400	if (op->type == PLAYER)
1401	{	1419	{
1402	op->contr->do_los = 1;	1420	op->contr->do_los = 1;
1403	++op->map->players;	1421	++op->map->players;
1404	op->map->touch ();	1422	op->map->touch ();
1405	}	1423	}
1406		1424
1407	op->map->dirty = true;	1425	op->map->dirty = true;
1408		1426
1409	if (object *pl = ms.player ())	1427	if (object *pl = ms.player ())
		1428	//TODO: the floorbox prev/next might need updating
		1429	//esrv_send_item (pl, op);
		1430	//TODO: update floorbox to preserve ordering
		1431	if (pl->contr->ns)
1410	pl->contr->ns->floorbox_update ();	1432	pl->contr->ns->floorbox_update ();
1411		1433
1412	/* If this object glows, it may affect lighting conditions that are	1434	/* If this object glows, it may affect lighting conditions that are
1413	* visible to others on this map. But update_all_los is really	1435	* visible to others on this map. But update_all_los is really
1414	* an inefficient way to do this, as it means los for all players	1436	* an inefficient way to do this, as it means los for all players
1415	* on the map will get recalculated. The players could very well	1437	* on the map will get recalculated. The players could very well
1416	* be far away from this change and not affected in any way -	1438	* be far away from this change and not affected in any way -
1417	* this should get redone to only look for players within range,	1439	* this should get redone to only look for players within range,
1418	* or just updating the P_UPTODATE for spaces within this area	1440	* or just updating the P_UPTODATE for spaces within this area
1419	* of effect may be sufficient.	1441	* of effect may be sufficient.
1420	*/	1442	*/
1421	if (op->map->darkness && (op->glow_radius != 0))	1443	if (op->affects_los ())
		1444	{
		1445	op->ms ().invalidate ();
1422	update_all_los (op->map, op->x, op->y);	1446	update_all_los (op->map, op->x, op->y);
		1447	}
1423		1448
1424	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1425	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1426		1451
1427	INVOKE_OBJECT (INSERT, op);	1452	INVOKE_OBJECT (INSERT, op);
…		…
1434	* blocked() and wall() work properly), and these flags are updated by	1459	* blocked() and wall() work properly), and these flags are updated by
1435	* update_object().	1460	* update_object().
1436	*/	1461	*/
1437		1462
1438	/* if this is not the head or flag has been passed, don't check walk on status */	1463	/* if this is not the head or flag has been passed, don't check walk on status */
1439	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1464	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1440	{	1465	{
1441	if (check_move_on (op, originator))	1466	if (check_move_on (op, originator))
1442	return 0;	1467	return 0;
1443		1468
1444	/* If we are a multi part object, lets work our way through the check	1469	/* If we are a multi part object, lets work our way through the check
…		…
1455	/* this function inserts an object in the map, but if it	1480	/* this function inserts an object in the map, but if it
1456	* finds an object of its own type, it'll remove that one first.	1481	* finds an object of its own type, it'll remove that one first.
1457	* op is the object to insert it under: supplies x and the map.	1482	* op is the object to insert it under: supplies x and the map.
1458	*/	1483	*/
1459	void	1484	void
1460	replace_insert_ob_in_map (const char *arch_string, object *op)	1485	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1461	{	1486	{
1462	object *tmp, *tmp1;
1463
1464	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1465		1488
1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1489	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1490	if (tmp->arch->archname == archname) /* same archetype */
1468	tmp->destroy ();	1491	tmp->destroy ();
1469		1492
1470	tmp1 = arch_to_object (archetype::find (arch_string));	1493	object *tmp = arch_to_object (archetype::find (archname));
1471		1494
1472	tmp1->x = op->x;	1495	tmp->x = op->x;
1473	tmp1->y = op->y;	1496	tmp->y = op->y;
		1497
1474	insert_ob_in_map (tmp1, op->map, op, 0);	1498	insert_ob_in_map (tmp, op->map, op, 0);
1475	}	1499	}
1476		1500
1477	object *	1501	object *
1478	object::insert_at (object *where, object *originator, int flags)	1502	object::insert_at (object *where, object *originator, int flags)
1479	{	1503	{
		1504	if (where->env)
		1505	return where->env->insert (this);
		1506	else
1480	return where->map->insert (this, where->x, where->y, originator, flags);	1507	return where->map->insert (this, where->x, where->y, originator, flags);
1481	}	1508	}
1482		1509
1483	/*	1510	/*
1484	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1485	* is returned contains nr objects, and the remaining parts contains
1486	* the rest (or is removed and freed if that number is 0).
1487	* On failure, NULL is returned, and the reason put into the
1488	* global static errmsg array.
1489	*/
1490	object *
1491	get_split_ob (object *orig_ob, uint32 nr)
1492	{
1493	object *newob;
1494	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1495
1496	if (orig_ob->nrof < nr)
1497	{
1498	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1499	return NULL;
1500	}
1501
1502	newob = object_create_clone (orig_ob);
1503
1504	if ((orig_ob->nrof -= nr) < 1)
1505	orig_ob->destroy (1);
1506	else if (!is_removed)
1507	{
1508	if (orig_ob->env != NULL)
1509	sub_weight (orig_ob->env, orig_ob->weight * nr);
1510	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1511	{
1512	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1513	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1514	return NULL;
1515	}
1516	}
1517
1518	newob->nrof = nr;
1519
1520	return newob;
1521	}
1522
1523	/*
1524	* decrease_ob_nr(object, number) decreases a specified number from	1511	* decrease(object, number) decreases a specified number from
1525	* the amount of an object. If the amount reaches 0, the object	1512	* the amount of an object. If the amount reaches 0, the object
1526	* is subsequently removed and freed.	1513	* is subsequently removed and freed.
1527	*	1514	*
1528	* Return value: 'op' if something is left, NULL if the amount reached 0	1515	* Return value: 'op' if something is left, NULL if the amount reached 0
1529	*/	1516	*/
		1517	bool
		1518	object::decrease (sint32 nr)
		1519	{
		1520	if (!nr)
		1521	return true;
		1522
		1523	nr = min (nr, nrof);
		1524
		1525	if (nrof > nr)
		1526	{
		1527	nrof -= nr;
		1528	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1529
		1530	if (object *pl = visible_to ())
		1531	esrv_update_item (UPD_NROF, pl, this);
		1532
		1533	return true;
		1534	}
		1535	else
		1536	{
		1537	destroy ();
		1538	return false;
		1539	}
		1540	}
		1541
		1542	/*
		1543	* split(ob,nr) splits up ob into two parts. The part which
		1544	* is returned contains nr objects, and the remaining parts contains
		1545	* the rest (or is removed and returned if that number is 0).
		1546	* On failure, NULL is returned.
		1547	*/
1530	object *	1548	object *
1531	decrease_ob_nr (object *op, uint32 i)	1549	object::split (sint32 nr)
1532	{	1550	{
1533	object *tmp;	1551	int have = number_of ();
1534		1552
1535	if (i == 0) /* objects with op->nrof require this check */	1553	if (have < nr)
1536	return op;	1554	return 0;
1537		1555	else if (have == nr)
1538	if (i > op->nrof)
1539	i = op->nrof;
1540
1541	if (QUERY_FLAG (op, FLAG_REMOVED))
1542	op->nrof -= i;
1543	else if (op->env)
1544	{	1556	{
1545	/* is this object in the players inventory, or sub container
1546	* therein?
1547	*/
1548	tmp = op->in_player ();
1549	/* nope. Is this a container the player has opened?
1550	* If so, set tmp to that player.
1551	* IMO, searching through all the players will mostly
1552	* likely be quicker than following op->env to the map,
1553	* and then searching the map for a player.
1554	*/
1555	if (!tmp)
1556	for_all_players (pl)
1557	if (pl->ob->container == op->env)
1558	{
1559	tmp = pl->ob;
1560	break;
1561	}
1562
1563	if (i < op->nrof)
1564	{
1565	sub_weight (op->env, op->weight * i);
1566	op->nrof -= i;
1567	if (tmp)
1568	esrv_send_item (tmp, op);
1569	}
1570	else
1571	{
1572	op->remove ();	1557	remove ();
1573	op->nrof = 0;	1558	return this;
1574	if (tmp)
1575	esrv_del_item (tmp->contr, op->count);
1576	}
1577	}	1559	}
1578	else	1560	else
1579	{	1561	{
1580	object *above = op->above;	1562	decrease (nr);
1581		1563
1582	if (i < op->nrof)	1564	object *op = deep_clone ();
1583	op->nrof -= i;	1565	op->nrof = nr;
1584	else
1585	{
1586	op->remove ();
1587	op->nrof = 0;
1588	}
1589
1590	/* Since we just removed op, op->above is null */
1591	for (tmp = above; tmp; tmp = tmp->above)
1592	if (tmp->type == PLAYER)
1593	{
1594	if (op->nrof)
1595	esrv_send_item (tmp, op);
1596	else
1597	esrv_del_item (tmp->contr, op->count);
1598	}
1599	}
1600
1601	if (op->nrof)
1602	return op;	1566	return op;
1603	else
1604	{
1605	op->destroy ();
1606	return 0;
1607	}
1608	}
1609
1610	/*
1611	* add_weight(object, weight) adds the specified weight to an object,
1612	* and also updates how much the environment(s) is/are carrying.
1613	*/
1614	void
1615	add_weight (object *op, signed long weight)
1616	{
1617	while (op != NULL)
1618	{
1619	if (op->type == CONTAINER)
1620	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1621
1622	op->carrying += weight;
1623	op = op->env;
1624	}	1567	}
1625	}	1568	}
1626		1569
1627	object *	1570	object *
1628	insert_ob_in_ob (object *op, object *where)	1571	insert_ob_in_ob (object *op, object *where)
…		…
1653	* be != op, if items are merged. -Tero	1596	* be != op, if items are merged. -Tero
1654	*/	1597	*/
1655	object *	1598	object *
1656	object::insert (object *op)	1599	object::insert (object *op)
1657	{	1600	{
1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1659	op->remove ();
1660
1661	if (op->more)	1601	if (op->more)
1662	{	1602	{
1663	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1603	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1664	return op;	1604	return op;
1665	}	1605	}
1666		1606
1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1607	op->remove ();
1668	CLEAR_FLAG (op, FLAG_REMOVED);	1608
		1609	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1669		1610
1670	if (op->nrof)	1611	if (op->nrof)
1671	{
1672	for (object *tmp = inv; tmp; tmp = tmp->below)	1612	for (object *tmp = inv; tmp; tmp = tmp->below)
1673	if (object::can_merge (tmp, op))	1613	if (object::can_merge (tmp, op))
1674	{	1614	{
1675	/* return the original object and remove inserted object	1615	/* return the original object and remove inserted object
1676	(client needs the original object) */	1616	(client needs the original object) */
1677	tmp->nrof += op->nrof;	1617	tmp->nrof += op->nrof;
1678	/* Weight handling gets pretty funky. Since we are adding to	1618
1679	* tmp->nrof, we need to increase the weight.	1619	if (object *pl = tmp->visible_to ())
1680	*/	1620	esrv_update_item (UPD_NROF, pl, tmp);
		1621
1681	add_weight (this, op->weight * op->nrof);	1622	adjust_weight (this, op->total_weight ());
1682	SET_FLAG (op, FLAG_REMOVED);	1623
1683	op->destroy (); /* free the inserted object */	1624	op->destroy ();
1684	op = tmp;	1625	op = tmp;
1685	op->remove (); /* and fix old object's links */	1626	goto inserted;
1686	CLEAR_FLAG (op, FLAG_REMOVED);
1687	break;
1688	}	1627	}
1689		1628
1690	/* I assume combined objects have no inventory
1691	* We add the weight - this object could have just been removed
1692	* (if it was possible to merge). calling remove_ob will subtract
1693	* the weight, so we need to add it in again, since we actually do
1694	* the linking below
1695	*/
1696	add_weight (this, op->weight * op->nrof);
1697	}
1698	else
1699	add_weight (this, (op->weight + op->carrying));
1700
1701	if (object *otmp = this->in_player ())
1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1703	otmp->update_stats ();
1704
1705	op->owner = 0; // its his/hers now. period.	1629	op->owner = 0; // it's his/hers now. period.
1706	op->map = 0;	1630	op->map = 0;
		1631	op->x = 0;
		1632	op->y = 0;
		1633
		1634	op->above = 0;
		1635	op->below = inv;
1707	op->env = this;	1636	op->env = this;
1708	op->above = 0;
1709	op->below = 0;
1710	op->x = op->y = 0;
1711		1637
		1638	if (inv)
		1639	inv->above = op;
		1640
		1641	inv = op;
		1642
		1643	op->flag [FLAG_REMOVED] = 0;
		1644
		1645	if (object *pl = op->visible_to ())
		1646	esrv_send_item (pl, op);
		1647
		1648	adjust_weight (this, op->total_weight ());
		1649
		1650	inserted:
1712	/* reset the light list and los of the players on the map */	1651	/* reset the light list and los of the players on the map */
1713	if (op->glow_radius && map)	1652	if (op->glow_radius && is_on_map ())
1714	{	1653	{
1715	#ifdef DEBUG_LIGHTS	1654	update_stats ();
1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1717	#endif /* DEBUG_LIGHTS */
1718	if (map->darkness)
1719	update_all_los (map, x, y);	1655	update_all_los (map, x, y);
1720	}
1721
1722	/* Client has no idea of ordering so lets not bother ordering it here.
1723	* It sure simplifies this function...
1724	*/
1725	if (!inv)
1726	inv = op;
1727	else
1728	{	1656	}
1729	op->below = inv;	1657	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1730	op->below->above = op;	1658	// if this is a player's inventory, update stats
1731	inv = op;	1659	update_stats ();
1732	}
1733		1660
1734	INVOKE_OBJECT (INSERT, this);	1661	INVOKE_OBJECT (INSERT, this);
1735		1662
1736	return op;	1663	return op;
1737	}	1664	}
…		…
1757	* on top.	1684	* on top.
1758	*/	1685	*/
1759	int	1686	int
1760	check_move_on (object *op, object *originator)	1687	check_move_on (object *op, object *originator)
1761	{	1688	{
		1689	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1690	return 0;
		1691
1762	object *tmp;	1692	object *tmp;
1763	maptile *m = op->map;	1693	maptile *m = op->map;
1764	int x = op->x, y = op->y;	1694	int x = op->x, y = op->y;
1765		1695
1766	MoveType move_on, move_slow, move_block;	1696	mapspace &ms = m->at (x, y);
1767		1697
1768	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1698	ms.update ();
1769	return 0;
1770		1699
1771	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1700	MoveType move_on = ms.move_on;
1772	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1701	MoveType move_slow = ms.move_slow;
1773	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1702	MoveType move_block = ms.move_block;
1774		1703
1775	/* if nothing on this space will slow op down or be applied,	1704	/* if nothing on this space will slow op down or be applied,
1776	* no need to do checking below. have to make sure move_type	1705	* no need to do checking below. have to make sure move_type
1777	* is set, as lots of objects don't have it set - we treat that	1706	* is set, as lots of objects don't have it set - we treat that
1778	* as walking.	1707	* as walking.
…		…
1789	return 0;	1718	return 0;
1790		1719
1791	/* The objects have to be checked from top to bottom.	1720	/* The objects have to be checked from top to bottom.
1792	* Hence, we first go to the top:	1721	* Hence, we first go to the top:
1793	*/	1722	*/
1794		1723	for (object *next, *tmp = ms.top; tmp; tmp = next)
1795	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1796	{
1797	/* Trim the search when we find the first other spell effect
1798	* this helps performance so that if a space has 50 spell objects,
1799	* we don't need to check all of them.
1800	*/
1801	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1802	break;
1803	}	1724	{
		1725	next = tmp->below;
1804		1726
1805	for (; tmp; tmp = tmp->below)
1806	{
1807	if (tmp == op)	1727	if (tmp == op)
1808	continue; /* Can't apply yourself */	1728	continue; /* Can't apply yourself */
1809		1729
1810	/* Check to see if one of the movement types should be slowed down.	1730	/* Check to see if one of the movement types should be slowed down.
1811	* Second check makes sure that the movement types not being slowed	1731	* Second check makes sure that the movement types not being slowed
…		…
1816	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1736	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1817	{	1737	{
1818	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1738	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1819	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1739	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1820	{	1740	{
1821
1822	float
1823	diff = tmp->move_slow_penalty * fabs (op->speed);	1741	float diff = tmp->move_slow_penalty * fabs (op->speed);
1824		1742
1825	if (op->type == PLAYER)	1743	if (op->is_player ())
1826	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1744	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1827	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1745	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1828	diff /= 4.0;	1746	diff /= 4.0;
1829		1747
1830	op->speed_left -= diff;	1748	op->speed_left -= diff;
1831	}	1749	}
1832	}	1750	}
…		…
1865	LOG (llevError, "Present_arch called outside map.\n");	1783	LOG (llevError, "Present_arch called outside map.\n");
1866	return NULL;	1784	return NULL;
1867	}	1785	}
1868		1786
1869	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1787	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1870	if (tmp->arch == at)	1788	if (tmp->arch->archname == at->archname)
1871	return tmp;	1789	return tmp;
1872		1790
1873	return NULL;	1791	return NULL;
1874	}	1792	}
1875		1793
…		…
1939	* The first matching object is returned, or NULL if none.	1857	* The first matching object is returned, or NULL if none.
1940	*/	1858	*/
1941	object *	1859	object *
1942	present_arch_in_ob (const archetype *at, const object *op)	1860	present_arch_in_ob (const archetype *at, const object *op)
1943	{	1861	{
1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1862	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1945	if (tmp->arch == at)	1863	if (tmp->arch->archname == at->archname)
1946	return tmp;	1864	return tmp;
1947		1865
1948	return NULL;	1866	return NULL;
1949	}	1867	}
1950		1868
…		…
2038	* head of the object should correspond for the entire object.	1956	* head of the object should correspond for the entire object.
2039	*/	1957	*/
2040	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1958	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2041	continue;	1959	continue;
2042		1960
2043	if (ob->blocked (m, pos.x, pos.y))	1961	if (ob->blocked (pos.m, pos.x, pos.y))
2044	continue;	1962	continue;
2045		1963
2046	altern [index++] = i;	1964	altern [index++] = i;
2047	}	1965	}
2048		1966
…		…
2116	* there is capable of.	2034	* there is capable of.
2117	*/	2035	*/
2118	int	2036	int
2119	find_dir (maptile *m, int x, int y, object *exclude)	2037	find_dir (maptile *m, int x, int y, object *exclude)
2120	{	2038	{
2121	int i, max = SIZEOFFREE, mflags;	2039	int max = SIZEOFFREE, mflags;
2122
2123	sint16 nx, ny;
2124	object *tmp;
2125	maptile *mp;
2126
2127	MoveType blocked, move_type;	2040	MoveType move_type;
2128		2041
2129	if (exclude && exclude->head_ () != exclude)	2042	if (exclude && exclude->head_ () != exclude)
2130	{	2043	{
2131	exclude = exclude->head;	2044	exclude = exclude->head;
2132	move_type = exclude->move_type;	2045	move_type = exclude->move_type;
…		…
2135	{	2048	{
2136	/* If we don't have anything, presume it can use all movement types. */	2049	/* If we don't have anything, presume it can use all movement types. */
2137	move_type = MOVE_ALL;	2050	move_type = MOVE_ALL;
2138	}	2051	}
2139		2052
2140	for (i = 1; i < max; i++)	2053	for (int i = 1; i < max; i++)
2141	{	2054	{
2142	mp = m;	2055	mapxy pos (m, x, y);
2143	nx = x + freearr_x[i];	2056	pos.move (i);
2144	ny = y + freearr_y[i];
2145		2057
2146	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2058	if (!pos.normalise ())
2147
2148	if (mflags & P_OUT_OF_MAP)
2149	max = maxfree[i];	2059	max = maxfree[i];
2150	else	2060	else
2151	{	2061	{
2152	mapspace &ms = mp->at (nx, ny);	2062	mapspace &ms = *pos;
2153		2063
2154	blocked = ms.move_block;
2155
2156	if ((move_type & blocked) == move_type)	2064	if ((move_type & ms.move_block) == move_type)
2157	max = maxfree[i];	2065	max = maxfree [i];
2158	else if (mflags & P_IS_ALIVE)	2066	else if (ms.flags () & P_IS_ALIVE)
2159	{	2067	{
2160	for (tmp = ms.bot; tmp; tmp = tmp->above)	2068	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2161	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2069	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2162	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2070	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2163	break;
2164
2165	if (tmp)
2166	return freedir[i];	2071	return freedir [i];
2167	}	2072	}
2168	}	2073	}
2169	}	2074	}
2170		2075
2171	return 0;	2076	return 0;
…		…
2246	* This basically means that if direction is 15, then it could either go	2151	* This basically means that if direction is 15, then it could either go
2247	* direction 4, 14, or 16 to get back to where we are.	2152	* direction 4, 14, or 16 to get back to where we are.
2248	* Moved from spell_util.c to object.c with the other related direction	2153	* Moved from spell_util.c to object.c with the other related direction
2249	* functions.	2154	* functions.
2250	*/	2155	*/
2251	int reduction_dir[SIZEOFFREE][3] = {	2156	static const int reduction_dir[SIZEOFFREE][3] = {
2252	{0, 0, 0}, /* 0 */	2157	{0, 0, 0}, /* 0 */
2253	{0, 0, 0}, /* 1 */	2158	{0, 0, 0}, /* 1 */
2254	{0, 0, 0}, /* 2 */	2159	{0, 0, 0}, /* 2 */
2255	{0, 0, 0}, /* 3 */	2160	{0, 0, 0}, /* 3 */
2256	{0, 0, 0}, /* 4 */	2161	{0, 0, 0}, /* 4 */
…		…
2352	int	2257	int
2353	can_pick (const object *who, const object *item)	2258	can_pick (const object *who, const object *item)
2354	{	2259	{
2355	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2260	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2356	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2261	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2357	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2262	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2358	}	2263	}
2359		2264
2360	/*	2265	/*
2361	* create clone from object to another	2266	* create clone from object to another
2362	*/	2267	*/
2363	object *	2268	object *
2364	object_create_clone (object *asrc)	2269	object::deep_clone ()
2365	{	2270	{
2366	object *dst = 0, *tmp, *src, *prev, *item;	2271	assert (("deep_clone called on non-head object", is_head ()));
2367		2272
2368	if (!asrc)	2273	object *dst = clone ();
2369	return 0;
2370		2274
2371	src = asrc->head_ ();	2275	object *prev = dst;
2372
2373	prev = 0;
2374	for (object *part = src; part; part = part->more)	2276	for (object *part = this->more; part; part = part->more)
2375	{	2277	{
2376	tmp = part->clone ();	2278	object *tmp = part->clone ();
2377	tmp->x -= src->x;
2378	tmp->y -= src->y;
2379
2380	if (!part->head)
2381	{
2382	dst = tmp;
2383	tmp->head = 0;
2384	}
2385	else
2386	tmp->head = dst;	2279	tmp->head = dst;
2387
2388	tmp->more = 0;
2389
2390	if (prev)
2391	prev->more = tmp;	2280	prev->more = tmp;
2392
2393	prev = tmp;	2281	prev = tmp;
2394	}	2282	}
2395		2283
2396	for (item = src->inv; item; item = item->below)	2284	for (object *item = inv; item; item = item->below)
2397	insert_ob_in_ob (object_create_clone (item), dst);	2285	insert_ob_in_ob (item->deep_clone (), dst);
2398		2286
2399	return dst;	2287	return dst;
2400	}	2288	}
2401		2289
2402	/* This returns the first object in who's inventory that	2290	/* This returns the first object in who's inventory that
…		…
2411	return tmp;	2299	return tmp;
2412		2300
2413	return 0;	2301	return 0;
2414	}	2302	}
2415		2303
2416	/* If ob has a field named key, return the link from the list,	2304	shstr_tmp
2417	* otherwise return NULL.	2305	object::kv_get (shstr_tmp key) const
2418	*
2419	* key must be a passed in shared string - otherwise, this won't
2420	* do the desired thing.
2421	*/
2422	key_value *
2423	get_ob_key_link (const object *ob, const char *key)
2424	{	2306	{
2425	for (key_value *link = ob->key_values; link; link = link->next)	2307	for (key_value *kv = key_values; kv; kv = kv->next)
2426	if (link->key == key)	2308	if (kv->key == key)
2427	return link;
2428
2429	return 0;
2430	}
2431
2432	/*
2433	* Returns the value of op has an extra_field for key, or NULL.
2434	*
2435	* The argument doesn't need to be a shared string.
2436	*
2437	* The returned string is shared.
2438	*/
2439	const char *
2440	get_ob_key_value (const object *op, const char *const key)
2441	{
2442	key_value *link;
2443	shstr_cmp canonical_key (key);
2444
2445	if (!canonical_key)
2446	{
2447	/* 1. There being a field named key on any object
2448	* implies there'd be a shared string to find.
2449	* 2. Since there isn't, no object has this field.
2450	* 3. Therefore, *this* object doesn't have this field.
2451	*/
2452	return 0;
2453	}
2454
2455	/* This is copied from get_ob_key_link() above -
2456	* only 4 lines, and saves the function call overhead.
2457	*/
2458	for (link = op->key_values; link; link = link->next)
2459	if (link->key == canonical_key)
2460	return link->value;	2309	return kv->value;
2461		2310
2462	return 0;	2311	return shstr ();
2463	}	2312	}
2464		2313
2465	/*	2314	void
2466	* Updates the canonical_key in op to value.	2315	object::kv_set (shstr_tmp key, shstr_tmp value)
2467	*
2468	* canonical_key is a shared string (value doesn't have to be).
2469	*
2470	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2471	* keys.
2472	*
2473	* Returns TRUE on success.
2474	*/
2475	int
2476	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2477	{	2316	{
2478	key_value *field = NULL, *last = NULL;	2317	for (key_value *kv = key_values; kv; kv = kv->next)
2479		2318	if (kv->key == key)
2480	for (field = op->key_values; field != NULL; field = field->next)
2481	{
2482	if (field->key != canonical_key)
2483	{	2319	{
2484	last = field;	2320	kv->value = value;
2485	continue;	2321	return;
2486	}	2322	}
2487		2323
2488	if (value)	2324	key_value *kv = new key_value;
2489	field->value = value;	2325
2490	else	2326	kv->next = key_values;
		2327	kv->key = key;
		2328	kv->value = value;
		2329
		2330	key_values = kv;
		2331	}
		2332
		2333	void
		2334	object::kv_del (shstr_tmp key)
		2335	{
		2336	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2337	if ((*kvp)->key == key)
2491	{	2338	{
2492	/* Basically, if the archetype has this key set,	2339	key_value *kv = *kvp;
2493	* we need to store the null value so when we save	2340	*kvp = (*kvp)->next;
2494	* it, we save the empty value so that when we load,	2341	delete kv;
2495	* we get this value back again.	2342	return;
2496	*/
2497	if (get_ob_key_link (op->arch, canonical_key))
2498	field->value = 0;
2499	else
2500	{
2501	if (last)
2502	last->next = field->next;
2503	else
2504	op->key_values = field->next;
2505
2506	delete field;
2507	}
2508	}	2343	}
2509	return TRUE;
2510	}
2511	/* IF we get here, key doesn't exist */
2512
2513	/* No field, we'll have to add it. */
2514
2515	if (!add_key)
2516	return FALSE;
2517
2518	/* There isn't any good reason to store a null
2519	* value in the key/value list. If the archetype has
2520	* this key, then we should also have it, so shouldn't
2521	* be here. If user wants to store empty strings,
2522	* should pass in ""
2523	*/
2524	if (value == NULL)
2525	return TRUE;
2526
2527	field = new key_value;
2528
2529	field->key = canonical_key;
2530	field->value = value;
2531	/* Usual prepend-addition. */
2532	field->next = op->key_values;
2533	op->key_values = field;
2534
2535	return TRUE;
2536	}
2537
2538	/*
2539	* Updates the key in op to value.
2540	*
2541	* If add_key is FALSE, this will only update existing keys,
2542	* and not add new ones.
2543	* In general, should be little reason FALSE is ever passed in for add_key
2544	*
2545	* Returns TRUE on success.
2546	*/
2547	int
2548	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2549	{
2550	shstr key_ (key);
2551
2552	return set_ob_key_value_s (op, key_, value, add_key);
2553	}	2344	}
2554		2345
2555	object::depth_iterator::depth_iterator (object *container)	2346	object::depth_iterator::depth_iterator (object *container)
2556	: iterator_base (container)	2347	: iterator_base (container)
2557	{	2348	{
…		…
2607	{	2398	{
2608	char flagdesc[512];	2399	char flagdesc[512];
2609	char info2[256 * 4];	2400	char info2[256 * 4];
2610	char *p = info;	2401	char *p = info;
2611		2402
2612	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2403	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2613	count, uuid.seq,	2404	count,
		2405	uuid.c_str (),
2614	&name,	2406	&name,
2615	title ? "\",title:\"" : "",	2407	title ? ",title:\"" : "",
2616	title ? (const char *)title : "",	2408	title ? (const char *)title : "",
		2409	title ? "\"" : "",
2617	flag_desc (flagdesc, 512), type);	2410	flag_desc (flagdesc, 512), type);
2618		2411
2619	if (!this->flag[FLAG_REMOVED] && env)	2412	if (!flag[FLAG_REMOVED] && env)
2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2413	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2621		2414
2622	if (map)	2415	if (map)
2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2416	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2624		2417
…		…
2654	object::open_container (object *new_container)	2447	object::open_container (object *new_container)
2655	{	2448	{
2656	if (container == new_container)	2449	if (container == new_container)
2657	return;	2450	return;
2658		2451
2659	if (object *old_container = container)	2452	object *old_container = container;
		2453
		2454	if (old_container)
2660	{	2455	{
2661	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2456	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2662	return;	2457	return;
2663		2458
2664	#if 0	2459	#if 0
…		…
2666	if (object *closer = old_container->inv)	2461	if (object *closer = old_container->inv)
2667	if (closer->type == CLOSE_CON)	2462	if (closer->type == CLOSE_CON)
2668	closer->destroy ();	2463	closer->destroy ();
2669	#endif	2464	#endif
2670		2465
		2466	// make sure the container is available
		2467	esrv_send_item (this, old_container);
		2468
2671	old_container->flag [FLAG_APPLIED] = 0;	2469	old_container->flag [FLAG_APPLIED] = false;
2672	container = 0;	2470	container = 0;
2673		2471
		2472	// client needs item update to make it work, client bug requires this to be separate
2674	esrv_update_item (UPD_FLAGS, this, old_container);	2473	esrv_update_item (UPD_FLAGS, this, old_container);
		2474
2675	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2475	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2676	play_sound (sound_find ("chest_close"));	2476	play_sound (sound_find ("chest_close"));
2677	}	2477	}
2678		2478
2679	if (new_container)	2479	if (new_container)
2680	{	2480	{
…		…
2690	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2490	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2691	new_container->insert (closer);	2491	new_container->insert (closer);
2692	}	2492	}
2693	#endif	2493	#endif
2694		2494
2695	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2495	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2696		2496
		2497	// make sure the container is available, client bug requires this to be separate
		2498	esrv_send_item (this, new_container);
		2499
2697	new_container->flag [FLAG_APPLIED] = 1;	2500	new_container->flag [FLAG_APPLIED] = true;
2698	container = new_container;	2501	container = new_container;
2699		2502
		2503	// client needs flag change
2700	esrv_update_item (UPD_FLAGS, this, new_container);	2504	esrv_update_item (UPD_FLAGS, this, new_container);
2701	esrv_send_inventory (this, new_container);	2505	esrv_send_inventory (this, new_container);
2702	play_sound (sound_find ("chest_open"));	2506	play_sound (sound_find ("chest_open"));
2703	}	2507	}
		2508	// else if (!old_container->env && contr && contr->ns)
		2509	// contr->ns->floorbox_reset ();
2704	}	2510	}
2705		2511
2706	object *	2512	object *
2707	object::force_find (const shstr name)	2513	object::force_find (shstr_tmp name)
2708	{	2514	{
2709	/* cycle through his inventory to look for the MARK we want to	2515	/* cycle through his inventory to look for the MARK we want to
2710	* place	2516	* place
2711	*/	2517	*/
2712	for (object *tmp = inv; tmp; tmp = tmp->below)	2518	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2714	return splay (tmp);	2520	return splay (tmp);
2715		2521
2716	return 0;	2522	return 0;
2717	}	2523	}
2718		2524
		2525	//-GPL
		2526
2719	void	2527	void
		2528	object::force_set_timer (int duration)
		2529	{
		2530	this->duration = 1;
		2531	this->speed_left = -1.f;
		2532
		2533	this->set_speed (duration ? 1.f / duration : 0.f);
		2534	}
		2535
		2536	object *
2720	object::force_add (const shstr name, int duration)	2537	object::force_add (shstr_tmp name, int duration)
2721	{	2538	{
2722	if (object *force = force_find (name))	2539	if (object *force = force_find (name))
2723	force->destroy ();	2540	force->destroy ();
2724		2541
2725	object *force = get_archetype (FORCE_NAME);	2542	object *force = get_archetype (FORCE_NAME);
2726		2543
2727	force->slaying = name;	2544	force->slaying = name;
2728	force->stats.food = 1;	2545	force->force_set_timer (duration);
2729	force->speed_left = -1.f;
2730
2731	force->set_speed (duration ? 1.f / duration : 0.f);
2732	force->flag [FLAG_IS_USED_UP] = true;
2733	force->flag [FLAG_APPLIED] = true;	2546	force->flag [FLAG_APPLIED] = true;
2734		2547
2735	insert (force);	2548	return insert (force);
2736	}	2549	}
2737		2550
2738	void	2551	void
2739	object::play_sound (faceidx sound) const	2552	object::play_sound (faceidx sound) const
2740	{	2553	{
2741	if (!sound)	2554	if (!sound)
2742	return;	2555	return;
2743		2556
2744	if (flag [FLAG_REMOVED])	2557	if (is_on_map ())
		2558	map->play_sound (sound, x, y);
		2559	else if (object *pl = in_player ())
		2560	pl->contr->play_sound (sound);
		2561	}
		2562
		2563	void
		2564	object::say_msg (const char *msg) const
		2565	{
		2566	if (is_on_map ())
		2567	map->say_msg (msg, x, y);
		2568	else if (object *pl = in_player ())
		2569	pl->contr->play_sound (sound);
		2570	}
		2571
		2572	void
		2573	object::make_noise ()
		2574	{
		2575	// we do not model noise in the map, so instead put
		2576	// a temporary light into the noise source
		2577	// could use the map instead, but that's less reliable for our
		2578	// goal, which is to make invisibility a bit harder to exploit
		2579
		2580	// currently only works sensibly for players
		2581	if (!is_player ())
2745	return;	2582	return;
2746		2583
2747	if (env)	2584	// find old force, or create new one
2748	{	2585	object *force = force_find (shstr_noise_force);
2749	if (object *pl = in_player ())	2586
2750	pl->contr->play_sound (sound);	2587	if (force)
2751	}	2588	force->speed_left = -1.f; // patch old speed up
2752	else	2589	else
2753	map->play_sound (sound, x, y);	2590	{
2754	}	2591	force = archetype::get (shstr_noise_force);
2755		2592
		2593	force->slaying = shstr_noise_force;
		2594	force->stats.food = 1;
		2595	force->speed_left = -1.f;
		2596
		2597	force->set_speed (1.f / 4.f);
		2598	force->flag [FLAG_IS_USED_UP] = true;
		2599	force->flag [FLAG_APPLIED] = true;
		2600
		2601	insert (force);
		2602	}
		2603	}
		2604

Diff Legend

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