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.173 by root, Sat Aug 4 22:23:47 2007 UTC vs.
Revision 1.299 by root, Sun Nov 8 20:55:39 2009 UTC

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

Diff Legend

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