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.149 by root, Mon May 14 19:56:45 2007 UTC vs.
Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC

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

Diff Legend

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