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.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC

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

Diff Legend

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