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

Diff Legend

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