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.188 by root, Wed Sep 12 11:10:09 2007 UTC vs.
Revision 1.222 by root, Wed Apr 30 05:06:36 2008 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 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
…		…
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
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,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
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	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	46	};
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,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
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	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	52	};
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,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
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	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	58	};
54	int freedir[SIZEOFFREE] = {	59	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,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
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	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	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	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	143	{
140	key_value *wants_field;	144	key_value *wants_field;
141		145
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	154	key_value *has_field;
151		155
152	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
154		158
155	if (has_field == NULL)	159	if (!has_field)
156	{
157	/* No field with that name. */	160	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		161
161	/* Found the matching field. */	162	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		165
168	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
169	}	167	}
170		168
171	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	170	return 1;
173	}	171	}
174		172
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	174	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	175	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	176	{
179	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	178	* so we need to run the comparison *twice*. :(
181	*/	179	*/
…		…
202	|| ob1->speed != ob2->speed	200	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	201	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	202	|| ob1->name != ob2->name)
205	return 0;	203	return 0;
206		204
207	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	206	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	208	* nrof values.
211	*/	209	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	211	return 0;
214		212
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* 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	214	* 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	215	* 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	216	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	217	* flags lose any meaning.
220	*/	218	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		221
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		224
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	226	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	227	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	228	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	229	|| 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	230	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	231	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	232	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	233	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	234	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	241	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	242	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	243	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	244	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	245	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	249	return 0;
253		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
254	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
256	*/	261	*/
257	if (ob1->inv || ob2->inv)	262	if (ob1->inv || ob2->inv)
258	{	263	{
259	/* if one object has inventory but the other doesn't, not equiv */	264	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	265	return 0; /* inventories differ in length */
261	return 0;
262		266
263	/* Now check to see if the two inventory objects could merge */	267	if (ob1->inv->below || ob2->inv->below)
		268	return 0; /* more than one object in inv */
		269
264	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	271	return 0; /* inventory objects differ */
266		272
267	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	274	* if it is valid.
269	*/	275	*/
270	}	276	}
…		…
289	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
290	return 0;	296	return 0;
291	break;	297	break;
292	}	298	}
293		299
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	300	if (ob1->key_values || ob2->key_values)
295	{	301	{
296	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	305
300	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	307	return 0;
302	}	308	}
303		309
304	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
305	{	311	{
306	ob1->optimise ();	312	ob1->optimise ();
307	ob2->optimise ();	313	ob2->optimise ();
308		314
309	if (ob1->self || ob2->self)	315	if (ob1->self || ob2->self)
		316	{
		317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		319
		320	if (k1 != k2)
		321	return 0;
		322
		323	if (k1 == 0)
		324	return 1;
		325
310	if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
311	return 0;	327	return 0;
		328	}
312	}	329	}
313		330
314	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
315	return 1;	332	return 1;
316	}	333	}
317		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container || this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
318	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
319	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
322	*/	408	*/
323	long	409	void
324	sum_weight (object *op)	410	object::update_weight ()
325	{	411	{
326	long sum;	412	sint32 sum = 0;
327	object *inv;
328		413
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
330	{	415	{
331	if (inv->inv)	416	if (op->inv)
332	sum_weight (inv);	417	op->update_weight ();
333		418
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
335	}	425	{
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;	426	carrying = sum;
342		427
343	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
344	}	432	}
345		433
346	/**	434	/*
347	* Return the outermost environment object for a given object.	435	* 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	*/	436	*/
363	char *	437	char *
364	dump_object (object *op)	438	dump_object (object *op)
365	{	439	{
366	if (!op)	440	if (!op)
…		…
380	get_nearest_part (object *op, const object *pl)	454	get_nearest_part (object *op, const object *pl)
381	{	455	{
382	object *tmp, *closest;	456	object *tmp, *closest;
383	int last_dist, i;	457	int last_dist, i;
384		458
385	if (op->more == NULL)	459	if (!op->more)
386	return op;	460	return op;
		461
387	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
388	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
389	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
390	return closest;	468	return closest;
391	}	469	}
392		470
393	/*	471	/*
394	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
395	*/	474	*/
396	object *	475	object *
397	find_object (tag_t i)	476	find_object (tag_t i)
398	{	477	{
399	for_all_objects (op)	478	for_all_objects (op)
…		…
417	for_all_objects (op)	496	for_all_objects (op)
418	if (op->name == str_)	497	if (op->name == str_)
419	break;	498	break;
420		499
421	return op;	500	return op;
422	}
423
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}	501	}
429		502
430	/*	503	/*
431	* Sets the owner and sets the skill and exp pointers to owner's current	504	* Sets the owner and sets the skill and exp pointers to owner's current
432	* skill and experience objects.	505	* skill and experience objects.
…		…
437	{	510	{
438	// allow objects which own objects	511	// allow objects which own objects
439	if (owner)	512	if (owner)
440	while (owner->owner)	513	while (owner->owner)
441	owner = owner->owner;	514	owner = owner->owner;
		515
		516	if (flag [FLAG_FREED])
		517	{
		518	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		519	return;
		520	}
442		521
443	this->owner = owner;	522	this->owner = owner;
444	}	523	}
445		524
446	int	525	int
…		…
587		666
588	void	667	void
589	object::instantiate ()	668	object::instantiate ()
590	{	669	{
591	if (!uuid.seq) // HACK	670	if (!uuid.seq) // HACK
592	uuid = gen_uuid ();	671	uuid = UUID::gen ();
593		672
594	speed_left = -0.1f;	673	speed_left = -0.1f;
595	/* copy the body_info to the body_used - this is only really	674	/* copy the body_info to the body_used - this is only really
596	* need for monsters, but doesn't hurt to do it for everything.	675	* need for monsters, but doesn't hurt to do it for everything.
597	* by doing so, when a monster is created, it has good starting	676	* by doing so, when a monster is created, it has good starting
…		…
667	* UP_OBJ_FACE: only the objects face has changed.	746	* UP_OBJ_FACE: only the objects face has changed.
668	*/	747	*/
669	void	748	void
670	update_object (object *op, int action)	749	update_object (object *op, int action)
671	{	750	{
672	if (op == NULL)	751	if (!op)
673	{	752	{
674	/* this should never happen */	753	/* this should never happen */
675	LOG (llevDebug, "update_object() called for NULL object.\n");	754	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
676	return;	755	return;
677	}	756	}
678		757
679	if (op->env)	758	if (!op->is_on_map ())
680	{	759	{
681	/* Animation is currently handled by client, so nothing	760	/* Animation is currently handled by client, so nothing
682	* to do in this case.	761	* to do in this case.
683	*/	762	*/
684	return;	763	return;
685	}	764	}
686
687	/* If the map is saving, don't do anything as everything is
688	* going to get freed anyways.
689	*/
690	if (!op->map || op->map->in_memory == MAP_SAVING)
691	return;
692		765
693	/* make sure the object is within map boundaries */	766	/* make sure the object is within map boundaries */
694	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	767	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
695	{	768	{
696	LOG (llevError, "update_object() called for object out of map!\n");	769	LOG (llevError, "update_object() called for object out of map!\n");
…		…
756	static int object_count;	829	static int object_count;
757		830
758	void object::link ()	831	void object::link ()
759	{	832	{
760	assert (!index);//D	833	assert (!index);//D
761	uuid = gen_uuid ();	834	uuid = UUID::gen ();
762	count = ++object_count;	835	count = ++object_count;
763		836
764	refcnt_inc ();	837	refcnt_inc ();
765	objects.insert (this);	838	objects.insert (this);
766	}	839	}
…		…
839	object::destroy_inv (bool drop_to_ground)	912	object::destroy_inv (bool drop_to_ground)
840	{	913	{
841	// need to check first, because the checks below might segfault	914	// need to check first, because the checks below might segfault
842	// as we might be on an invalid mapspace and crossfire code	915	// as we might be on an invalid mapspace and crossfire code
843	// is too buggy to ensure that the inventory is empty.	916	// is too buggy to ensure that the inventory is empty.
844	// corollary: if you create arrows etc. with stuff in tis inventory,	917	// corollary: if you create arrows etc. with stuff in its inventory,
845	// cf will crash below with off-map x and y	918	// cf will crash below with off-map x and y
846	if (!inv)	919	if (!inv)
847	return;	920	return;
848		921
849	/* Only if the space blocks everything do we not process -	922	/* Only if the space blocks everything do we not process -
850	* if some form of movement is allowed, let objects	923	* if some form of movement is allowed, let objects
851	* drop on that space.	924	* drop on that space.
852	*/	925	*/
853	if (!drop_to_ground	926	if (!drop_to_ground
854	|| !map	927	|| !map
855	|| map->in_memory != MAP_IN_MEMORY	928	|| map->in_memory != MAP_ACTIVE
856	|| map->nodrop	929	|| map->nodrop
857	|| ms ().move_block == MOVE_ALL)	930	|| ms ().move_block == MOVE_ALL)
858	{	931	{
859	while (inv)	932	while (inv)
860	{	933	{
861	inv->destroy_inv (drop_to_ground);	934	inv->destroy_inv (false);
862	inv->destroy ();	935	inv->destroy ();
863	}	936	}
864	}	937	}
865	else	938	else
866	{ /* Put objects in inventory onto this space */	939	{ /* Put objects in inventory onto this space */
…		…
872	|| op->flag [FLAG_NO_DROP]	945	|| op->flag [FLAG_NO_DROP]
873	|| op->type == RUNE	946	|| op->type == RUNE
874	|| op->type == TRAP	947	|| op->type == TRAP
875	|| op->flag [FLAG_IS_A_TEMPLATE]	948	|| op->flag [FLAG_IS_A_TEMPLATE]
876	|| op->flag [FLAG_DESTROY_ON_DEATH])	949	|| op->flag [FLAG_DESTROY_ON_DEATH])
877	op->destroy ();	950	op->destroy (true);
878	else	951	else
879	map->insert (op, x, y);	952	map->insert (op, x, y);
880	}	953	}
881	}	954	}
882	}	955	}
…		…
889	}	962	}
890		963
891	void	964	void
892	object::do_destroy ()	965	object::do_destroy ()
893	{	966	{
894	attachable::do_destroy ();
895
896	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
897	remove_button_link (this);	968	remove_button_link (this);
898		969
899	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
900	remove_friendly_object (this);	971	remove_friendly_object (this);
901		972
902	if (!flag [FLAG_REMOVED])
903	remove ();	973	remove ();
904		974
905	destroy_inv (true);	975	attachable::do_destroy ();
906		976
907	deactivate ();	977	deactivate ();
908	unlink ();	978	unlink ();
909		979
910	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
…		…
919		989
920	freed_map->path = "<freed objects map>";	990	freed_map->path = "<freed objects map>";
921	freed_map->name = "/internal/freed_objects_map";	991	freed_map->name = "/internal/freed_objects_map";
922	freed_map->width = 3;	992	freed_map->width = 3;
923	freed_map->height = 3;	993	freed_map->height = 3;
		994	freed_map->nodrop = 1;
924		995
925	freed_map->alloc ();	996	freed_map->alloc ();
926	freed_map->in_memory = MAP_IN_MEMORY;	997	freed_map->in_memory = MAP_ACTIVE;
927	}	998	}
928		999
929	map = freed_map;	1000	map = freed_map;
930	x = 1;	1001	x = 1;
931	y = 1;	1002	y = 1;
…		…
950	object::destroy (bool destroy_inventory)	1021	object::destroy (bool destroy_inventory)
951	{	1022	{
952	if (destroyed ())	1023	if (destroyed ())
953	return;	1024	return;
954		1025
		1026	if (!is_head () && !head->destroyed ())
		1027	{
		1028	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1029	head->destroy (destroy_inventory);
		1030	}
		1031
955	if (destroy_inventory)	1032	destroy_inv (!destroy_inventory);
956	destroy_inv (false);
957		1033
958	if (is_head ())	1034	if (is_head ())
959	if (sound_destroy)	1035	if (sound_destroy)
960	play_sound (sound_destroy);	1036	play_sound (sound_destroy);
961	else if (flag [FLAG_MONSTER])	1037	else if (flag [FLAG_MONSTER])
962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1038	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963		1039
964	attachable::destroy ();	1040	attachable::destroy ();
965	}
966
967	/*
968	* sub_weight() recursively (outwards) subtracts a number from the
969	* weight of an object (and what is carried by it's environment(s)).
970	*/
971	void
972	sub_weight (object *op, signed long weight)
973	{
974	while (op != NULL)
975	{
976	if (op->type == CONTAINER)
977	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
978
979	op->carrying -= weight;
980	op = op->env;
981	}
982	}	1041	}
983		1042
984	/* op->remove ():	1043	/* op->remove ():
985	* This function removes the object op from the linked list of objects	1044	* This function removes the object op from the linked list of objects
986	* which it is currently tied to. When this function is done, the	1045	* which it is currently tied to. When this function is done, the
…		…
992	object::do_remove ()	1051	object::do_remove ()
993	{	1052	{
994	object *tmp, *last = 0;	1053	object *tmp, *last = 0;
995	object *otmp;	1054	object *otmp;
996		1055
997	if (QUERY_FLAG (this, FLAG_REMOVED))	1056	if (flag [FLAG_REMOVED])
998	return;	1057	return;
999		1058
1000	SET_FLAG (this, FLAG_REMOVED);
1001	INVOKE_OBJECT (REMOVE, this);	1059	INVOKE_OBJECT (REMOVE, this);
		1060
		1061	flag [FLAG_REMOVED] = true;
1002		1062
1003	if (more)	1063	if (more)
1004	more->remove ();	1064	more->remove ();
1005		1065
1006	/*	1066	/*
1007	* In this case, the object to be removed is in someones	1067	* In this case, the object to be removed is in someones
1008	* inventory.	1068	* inventory.
1009	*/	1069	*/
1010	if (env)	1070	if (env)
1011	{	1071	{
		1072	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1073	if (object *pl = visible_to ())
		1074	esrv_del_item (pl->contr, count);
		1075	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1076
		1077	adjust_weight (env, -total_weight ());
		1078
		1079	*(above ? &above->below : &env->inv) = below;
		1080
1012	if (nrof)	1081	if (below)
1013	sub_weight (env, weight * nrof);	1082	below->above = above;
1014	else	1083
1015	sub_weight (env, weight + carrying);	1084	/* we set up values so that it could be inserted into
		1085	* the map, but we don't actually do that - it is up
		1086	* to the caller to decide what we want to do.
		1087	*/
		1088	map = env->map;
		1089	x = env->x;
		1090	y = env->y;
		1091	above = 0;
		1092	below = 0;
		1093	env = 0;
1016		1094
1017	/* NO_FIX_PLAYER is set when a great many changes are being	1095	/* NO_FIX_PLAYER is set when a great many changes are being
1018	* made to players inventory. If set, avoiding the call	1096	* made to players inventory. If set, avoiding the call
1019	* to save cpu time.	1097	* to save cpu time.
1020	*/	1098	*/
1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1099	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1022	otmp->update_stats ();	1100	otmp->update_stats ();
1023
1024	if (above)
1025	above->below = below;
1026	else
1027	env->inv = below;
1028
1029	if (below)
1030	below->above = above;
1031
1032	/* we set up values so that it could be inserted into
1033	* the map, but we don't actually do that - it is up
1034	* to the caller to decide what we want to do.
1035	*/
1036	x = env->x, y = env->y;
1037	map = env->map;
1038	above = 0, below = 0;
1039	env = 0;
1040	}	1101	}
1041	else if (map)	1102	else if (map)
1042	{	1103	{
1043	if (type == PLAYER)
1044	{
1045	// leaving a spot always closes any open container on the ground
1046	if (container && !container->env)
1047	// this causes spurious floorbox updates, but it ensures
1048	// that the CLOSE event is being sent.
1049	close_container ();
1050
1051	--map->players;
1052	map->touch ();
1053	}
1054
1055	map->dirty = true;	1104	map->dirty = true;
1056	mapspace &ms = this->ms ();	1105	mapspace &ms = this->ms ();
		1106
		1107	if (object *pl = ms.player ())
		1108	{
		1109	if (type == PLAYER) // this == pl(!)
		1110	{
		1111	// leaving a spot always closes any open container on the ground
		1112	if (container && !container->env)
		1113	// this causes spurious floorbox updates, but it ensures
		1114	// that the CLOSE event is being sent.
		1115	close_container ();
		1116
		1117	--map->players;
		1118	map->touch ();
		1119	}
		1120	else if (pl->container == this)
		1121	{
		1122	// removing a container should close it
		1123	close_container ();
		1124	}
		1125
		1126	esrv_del_item (pl->contr, count);
		1127	}
1057		1128
1058	/* link the object above us */	1129	/* link the object above us */
1059	if (above)	1130	if (above)
1060	above->below = below;	1131	above->below = below;
1061	else	1132	else
…		…
1091	* removed (most likely destroyed), update the player view	1162	* removed (most likely destroyed), update the player view
1092	* appropriately.	1163	* appropriately.
1093	*/	1164	*/
1094	pl->close_container ();	1165	pl->close_container ();
1095		1166
1096	pl->contr->ns->floorbox_update ();	1167	//TODO: the floorbox prev/next might need updating
		1168	esrv_del_item (pl->contr, count);
1097	}	1169	}
1098		1170
1099	for (tmp = ms.bot; tmp; tmp = tmp->above)	1171	for (tmp = ms.bot; tmp; tmp = tmp->above)
1100	{	1172	{
1101	/* No point updating the players look faces if he is the object	1173	/* No point updating the players look faces if he is the object
…		…
1140	merge_ob (object *op, object *top)	1212	merge_ob (object *op, object *top)
1141	{	1213	{
1142	if (!op->nrof)	1214	if (!op->nrof)
1143	return 0;	1215	return 0;
1144		1216
1145	if (top)	1217	if (!top)
1146	for (top = op; top && top->above; top = top->above)	1218	for (top = op; top && top->above; top = top->above)
1147	;	1219	;
1148		1220
1149	for (; top; top = top->below)	1221	for (; top; top = top->below)
1150	{
1151	if (top == op)
1152	continue;
1153
1154	if (object::can_merge (op, top))	1222	if (object::can_merge (op, top))
1155	{	1223	{
1156	top->nrof += op->nrof;	1224	top->nrof += op->nrof;
1157		1225
1158	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1226	if (object *pl = top->visible_to ())
1159	op->weight = 0; /* Don't want any adjustements now */	1227	esrv_update_item (UPD_NROF, pl, top);
		1228
		1229	op->weight = 0; // cancel the addition above
		1230	op->carrying = 0; // must be 0 already
		1231
1160	op->destroy ();	1232	op->destroy (1);
		1233
1161	return top;	1234	return top;
1162	}	1235	}
1163	}
1164		1236
1165	return 0;	1237	return 0;
1166	}	1238	}
1167		1239
1168	void	1240	void
…		…
1227	object *	1299	object *
1228	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1300	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1229	{	1301	{
1230	assert (!op->flag [FLAG_FREED]);	1302	assert (!op->flag [FLAG_FREED]);
1231		1303
1232	object *top, *floor = NULL;
1233
1234	op->remove ();	1304	op->remove ();
1235		1305
1236	/* Ideally, the caller figures this out. However, it complicates a lot	1306	/* Ideally, the caller figures this out. However, it complicates a lot
1237	* of areas of callers (eg, anything that uses find_free_spot would now	1307	* of areas of callers (eg, anything that uses find_free_spot would now
1238	* need extra work	1308	* need extra work
1239	*/	1309	*/
1240	if (!xy_normalise (m, op->x, op->y))	1310	if (!xy_normalise (m, op->x, op->y))
1241	{	1311	{
1242	op->destroy ();	1312	op->destroy (1);
1243	return 0;	1313	return 0;
1244	}	1314	}
1245		1315
1246	if (object *more = op->more)	1316	if (object *more = op->more)
1247	if (!insert_ob_in_map (more, m, originator, flag))	1317	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1256	*/	1326	*/
1257	if (op->nrof && !(flag & INS_NO_MERGE))	1327	if (op->nrof && !(flag & INS_NO_MERGE))
1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1328	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1259	if (object::can_merge (op, tmp))	1329	if (object::can_merge (op, tmp))
1260	{	1330	{
		1331	// TODO: we atcually want to update tmp, not op,
		1332	// but some caller surely breaks when we return tmp
		1333	// from here :/
1261	op->nrof += tmp->nrof;	1334	op->nrof += tmp->nrof;
1262	tmp->destroy ();	1335	tmp->destroy (1);
1263	}	1336	}
1264		1337
1265	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1266	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1267		1340
…		…
1287	/* since *below* originator, no need to update top */	1360	/* since *below* originator, no need to update top */
1288	originator->below = op;	1361	originator->below = op;
1289	}	1362	}
1290	else	1363	else
1291	{	1364	{
		1365	object *top, *floor = NULL;
		1366
1292	top = ms.bot;	1367	top = ms.bot;
1293		1368
1294	/* If there are other objects, then */	1369	/* If there are other objects, then */
1295	if ((!(flag & INS_MAP_LOAD)) && top)	1370	if (top)
1296	{	1371	{
1297	object *last = 0;	1372	object *last = 0;
1298		1373
1299	/*	1374	/*
1300	* If there are multiple objects on this space, we do some trickier handling.	1375	* If there are multiple objects on this space, we do some trickier handling.
…		…
1352	*/	1427	*/
1353	if (last && last->below && last != floor)	1428	if (last && last->below && last != floor)
1354	top = last->below;	1429	top = last->below;
1355	}	1430	}
1356	} /* If objects on this space */	1431	} /* If objects on this space */
1357	if (flag & INS_MAP_LOAD)
1358	top = ms.top;
1359		1432
1360	if (flag & INS_ABOVE_FLOOR_ONLY)	1433	if (flag & INS_ABOVE_FLOOR_ONLY)
1361	top = floor;	1434	top = floor;
1362		1435
1363	/* Top is the object that our object (op) is going to get inserted above.	1436	/* Top is the object that our object (op) is going to get inserted above.
…		…
1396	op->map->touch ();	1469	op->map->touch ();
1397	}	1470	}
1398		1471
1399	op->map->dirty = true;	1472	op->map->dirty = true;
1400		1473
1401	if (!(flag & INS_MAP_LOAD))
1402	if (object *pl = ms.player ())	1474	if (object *pl = ms.player ())
1403	pl->contr->ns->floorbox_update ();	1475	//TODO: the floorbox prev/next might need updating
		1476	esrv_send_item (pl, op);
1404		1477
1405	/* If this object glows, it may affect lighting conditions that are	1478	/* If this object glows, it may affect lighting conditions that are
1406	* visible to others on this map. But update_all_los is really	1479	* visible to others on this map. But update_all_los is really
1407	* an inefficient way to do this, as it means los for all players	1480	* an inefficient way to do this, as it means los for all players
1408	* on the map will get recalculated. The players could very well	1481	* on the map will get recalculated. The players could very well
…		…
1450	* op is the object to insert it under: supplies x and the map.	1523	* op is the object to insert it under: supplies x and the map.
1451	*/	1524	*/
1452	void	1525	void
1453	replace_insert_ob_in_map (const char *arch_string, object *op)	1526	replace_insert_ob_in_map (const char *arch_string, object *op)
1454	{	1527	{
1455	object *tmp, *tmp1;
1456
1457	/* first search for itself and remove any old instances */	1528	/* first search for itself and remove any old instances */
1458		1529
1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1530	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1531	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1461	tmp->destroy ();	1532	tmp->destroy (1);
1462		1533
1463	tmp1 = arch_to_object (archetype::find (arch_string));	1534	object *tmp = arch_to_object (archetype::find (arch_string));
1464		1535
1465	tmp1->x = op->x;	1536	tmp->x = op->x;
1466	tmp1->y = op->y;	1537	tmp->y = op->y;
		1538
1467	insert_ob_in_map (tmp1, op->map, op, 0);	1539	insert_ob_in_map (tmp, op->map, op, 0);
1468	}	1540	}
1469		1541
1470	object *	1542	object *
1471	object::insert_at (object *where, object *originator, int flags)	1543	object::insert_at (object *where, object *originator, int flags)
1472	{	1544	{
		1545	if (where->env)
		1546	return where->env->insert (this);
		1547	else
1473	return where->map->insert (this, where->x, where->y, originator, flags);	1548	return where->map->insert (this, where->x, where->y, originator, flags);
1474	}	1549	}
1475		1550
1476	/*	1551	/*
1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1478	* is returned contains nr objects, and the remaining parts contains
1479	* the rest (or is removed and freed if that number is 0).
1480	* On failure, NULL is returned, and the reason put into the
1481	* global static errmsg array.
1482	*/
1483	object *
1484	get_split_ob (object *orig_ob, uint32 nr)
1485	{
1486	object *newob;
1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1488
1489	if (orig_ob->nrof < nr)
1490	{
1491	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1492	return NULL;
1493	}
1494
1495	newob = object_create_clone (orig_ob);
1496
1497	if ((orig_ob->nrof -= nr) < 1)
1498	orig_ob->destroy (1);
1499	else if (!is_removed)
1500	{
1501	if (orig_ob->env != NULL)
1502	sub_weight (orig_ob->env, orig_ob->weight * nr);
1503	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1504	{
1505	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1506	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1507	return NULL;
1508	}
1509	}
1510
1511	newob->nrof = nr;
1512
1513	return newob;
1514	}
1515
1516	/*
1517	* decrease_ob_nr(object, number) decreases a specified number from	1552	* decrease(object, number) decreases a specified number from
1518	* the amount of an object. If the amount reaches 0, the object	1553	* the amount of an object. If the amount reaches 0, the object
1519	* is subsequently removed and freed.	1554	* is subsequently removed and freed.
1520	*	1555	*
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1556	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1557	*/
		1558	bool
		1559	object::decrease (sint32 nr)
		1560	{
		1561	if (!nr)
		1562	return true;
		1563
		1564	nr = min (nr, nrof);
		1565
		1566	nrof -= nr;
		1567
		1568	if (nrof)
		1569	{
		1570	adjust_weight (env, -weight * nr); // carrying == 0
		1571
		1572	if (object *pl = visible_to ())
		1573	esrv_update_item (UPD_NROF, pl, this);
		1574
		1575	return true;
		1576	}
		1577	else
		1578	{
		1579	destroy (1);
		1580	return false;
		1581	}
		1582	}
		1583
		1584	/*
		1585	* split(ob,nr) splits up ob into two parts. The part which
		1586	* is returned contains nr objects, and the remaining parts contains
		1587	* the rest (or is removed and returned if that number is 0).
		1588	* On failure, NULL is returned.
		1589	*/
1523	object *	1590	object *
1524	decrease_ob_nr (object *op, uint32 i)	1591	object::split (sint32 nr)
1525	{	1592	{
1526	object *tmp;	1593	int have = number_of ();
1527		1594
1528	if (i == 0) /* objects with op->nrof require this check */	1595	if (have < nr)
1529	return op;	1596	return 0;
1530		1597	else if (have == nr)
1531	if (i > op->nrof)
1532	i = op->nrof;
1533
1534	if (QUERY_FLAG (op, FLAG_REMOVED))
1535	op->nrof -= i;
1536	else if (op->env)
1537	{	1598	{
1538	/* is this object in the players inventory, or sub container
1539	* therein?
1540	*/
1541	tmp = op->in_player ();
1542	/* nope. Is this a container the player has opened?
1543	* If so, set tmp to that player.
1544	* IMO, searching through all the players will mostly
1545	* likely be quicker than following op->env to the map,
1546	* and then searching the map for a player.
1547	*/
1548	if (!tmp)
1549	for_all_players (pl)
1550	if (pl->ob->container == op->env)
1551	{
1552	tmp = pl->ob;
1553	break;
1554	}
1555
1556	if (i < op->nrof)
1557	{
1558	sub_weight (op->env, op->weight * i);
1559	op->nrof -= i;
1560	if (tmp)
1561	esrv_send_item (tmp, op);
1562	}
1563	else
1564	{
1565	op->remove ();	1599	remove ();
1566	op->nrof = 0;	1600	return this;
1567	if (tmp)
1568	esrv_del_item (tmp->contr, op->count);
1569	}
1570	}	1601	}
1571	else	1602	else
1572	{	1603	{
1573	object *above = op->above;	1604	decrease (nr);
1574		1605
1575	if (i < op->nrof)	1606	object *op = object_create_clone (this);
1576	op->nrof -= i;	1607	op->nrof = nr;
1577	else
1578	{
1579	op->remove ();
1580	op->nrof = 0;
1581	}
1582
1583	/* Since we just removed op, op->above is null */
1584	for (tmp = above; tmp; tmp = tmp->above)
1585	if (tmp->type == PLAYER)
1586	{
1587	if (op->nrof)
1588	esrv_send_item (tmp, op);
1589	else
1590	esrv_del_item (tmp->contr, op->count);
1591	}
1592	}
1593
1594	if (op->nrof)
1595	return op;	1608	return op;
1596	else
1597	{
1598	op->destroy ();
1599	return 0;
1600	}
1601	}
1602
1603	/*
1604	* add_weight(object, weight) adds the specified weight to an object,
1605	* and also updates how much the environment(s) is/are carrying.
1606	*/
1607	void
1608	add_weight (object *op, signed long weight)
1609	{
1610	while (op != NULL)
1611	{
1612	if (op->type == CONTAINER)
1613	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1614
1615	op->carrying += weight;
1616	op = op->env;
1617	}	1609	}
1618	}	1610	}
1619		1611
1620	object *	1612	object *
1621	insert_ob_in_ob (object *op, object *where)	1613	insert_ob_in_ob (object *op, object *where)
…		…
1646	* be != op, if items are merged. -Tero	1638	* be != op, if items are merged. -Tero
1647	*/	1639	*/
1648	object *	1640	object *
1649	object::insert (object *op)	1641	object::insert (object *op)
1650	{	1642	{
1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1652	op->remove ();
1653
1654	if (op->more)	1643	if (op->more)
1655	{	1644	{
1656	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1645	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1657	return op;	1646	return op;
1658	}	1647	}
1659		1648
1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1649	op->remove ();
1661	CLEAR_FLAG (op, FLAG_REMOVED);	1650
		1651	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1662		1652
1663	if (op->nrof)	1653	if (op->nrof)
1664	{
1665	for (object *tmp = inv; tmp; tmp = tmp->below)	1654	for (object *tmp = inv; tmp; tmp = tmp->below)
1666	if (object::can_merge (tmp, op))	1655	if (object::can_merge (tmp, op))
1667	{	1656	{
1668	/* return the original object and remove inserted object	1657	/* return the original object and remove inserted object
1669	(client needs the original object) */	1658	(client needs the original object) */
1670	tmp->nrof += op->nrof;	1659	tmp->nrof += op->nrof;
1671	/* Weight handling gets pretty funky. Since we are adding to	1660
1672	* tmp->nrof, we need to increase the weight.	1661	if (object *pl = tmp->visible_to ())
1673	*/	1662	esrv_update_item (UPD_NROF, pl, tmp);
		1663
1674	add_weight (this, op->weight * op->nrof);	1664	adjust_weight (this, op->total_weight ());
1675	SET_FLAG (op, FLAG_REMOVED);	1665
1676	op->destroy (); /* free the inserted object */	1666	op->destroy (1);
1677	op = tmp;	1667	op = tmp;
1678	op->remove (); /* and fix old object's links */	1668	goto inserted;
1679	CLEAR_FLAG (op, FLAG_REMOVED);
1680	break;
1681	}	1669	}
1682		1670
1683	/* I assume combined objects have no inventory
1684	* We add the weight - this object could have just been removed
1685	* (if it was possible to merge). calling remove_ob will subtract
1686	* the weight, so we need to add it in again, since we actually do
1687	* the linking below
1688	*/
1689	add_weight (this, op->weight * op->nrof);
1690	}
1691	else
1692	add_weight (this, (op->weight + op->carrying));
1693
1694	if (object *otmp = this->in_player ())
1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1696	otmp->update_stats ();
1697
1698	op->owner = 0; // its his/hers now. period.	1671	op->owner = 0; // it's his/hers now. period.
1699	op->map = 0;	1672	op->map = 0;
		1673	op->x = 0;
		1674	op->y = 0;
		1675
		1676	op->above = 0;
		1677	op->below = inv;
1700	op->env = this;	1678	op->env = this;
1701	op->above = 0;
1702	op->below = 0;
1703	op->x = op->y = 0;
1704		1679
		1680	if (inv)
		1681	inv->above = op;
		1682
		1683	inv = op;
		1684
		1685	op->flag [FLAG_REMOVED] = 0;
		1686
		1687	if (object *pl = op->visible_to ())
		1688	esrv_send_item (pl, op);
		1689
		1690	adjust_weight (this, op->total_weight ());
		1691
		1692	inserted:
1705	/* reset the light list and los of the players on the map */	1693	/* reset the light list and los of the players on the map */
1706	if (op->glow_radius && map)	1694	if (op->glow_radius && map && map->darkness)
1707	{
1708	#ifdef DEBUG_LIGHTS
1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1710	#endif /* DEBUG_LIGHTS */
1711	if (map->darkness)
1712	update_all_los (map, x, y);	1695	update_all_los (map, x, y);
1713	}
1714		1696
1715	/* Client has no idea of ordering so lets not bother ordering it here.	1697	// if this is a player's inventory, update stats
1716	* It sure simplifies this function...	1698	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1717	*/	1699	update_stats ();
1718	if (!inv)
1719	inv = op;
1720	else
1721	{
1722	op->below = inv;
1723	op->below->above = op;
1724	inv = op;
1725	}
1726		1700
1727	INVOKE_OBJECT (INSERT, this);	1701	INVOKE_OBJECT (INSERT, this);
1728		1702
1729	return op;	1703	return op;
1730	}	1704	}
…		…
1945	* activate recursively a flag on an object inventory	1919	* activate recursively a flag on an object inventory
1946	*/	1920	*/
1947	void	1921	void
1948	flag_inv (object *op, int flag)	1922	flag_inv (object *op, int flag)
1949	{	1923	{
1950	if (op->inv)
1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1924	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952	{	1925	{
1953	SET_FLAG (tmp, flag);	1926	SET_FLAG (tmp, flag);
1954	flag_inv (tmp, flag);	1927	flag_inv (tmp, flag);
1955	}	1928	}
1956	}	1929	}
1957		1930
1958	/*	1931	/*
1959	* deactivate recursively a flag on an object inventory	1932	* deactivate recursively a flag on an object inventory
1960	*/	1933	*/
1961	void	1934	void
1962	unflag_inv (object *op, int flag)	1935	unflag_inv (object *op, int flag)
1963	{	1936	{
1964	if (op->inv)
1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1937	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1966	{	1938	{
1967	CLEAR_FLAG (tmp, flag);	1939	CLEAR_FLAG (tmp, flag);
1968	unflag_inv (tmp, flag);	1940	unflag_inv (tmp, flag);
1969	}	1941	}
1970	}	1942	}
1971		1943
1972	/*	1944	/*
1973	* find_free_spot(object, map, x, y, start, stop) will search for	1945	* find_free_spot(object, map, x, y, start, stop) will search for
1974	* a spot at the given map and coordinates which will be able to contain	1946	* a spot at the given map and coordinates which will be able to contain
…		…
1976	* to search (see the freearr_x/y[] definition).	1948	* to search (see the freearr_x/y[] definition).
1977	* It returns a random choice among the alternatives found.	1949	* It returns a random choice among the alternatives found.
1978	* start and stop are where to start relative to the free_arr array (1,9	1950	* start and stop are where to start relative to the free_arr array (1,9
1979	* does all 4 immediate directions). This returns the index into the	1951	* does all 4 immediate directions). This returns the index into the
1980	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1952	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1981	* Note - this only checks to see if there is space for the head of the
1982	* object - if it is a multispace object, this should be called for all
1983	* pieces.
1984	* Note2: This function does correctly handle tiled maps, but does not	1953	* Note: This function does correctly handle tiled maps, but does not
1985	* inform the caller. However, insert_ob_in_map will update as	1954	* inform the caller. However, insert_ob_in_map will update as
1986	* necessary, so the caller shouldn't need to do any special work.	1955	* necessary, so the caller shouldn't need to do any special work.
1987	* Note - updated to take an object instead of archetype - this is necessary	1956	* Note - updated to take an object instead of archetype - this is necessary
1988	* because arch_blocked (now ob_blocked) needs to know the movement type	1957	* because arch_blocked (now ob_blocked) needs to know the movement type
1989	* to know if the space in question will block the object. We can't use	1958	* to know if the space in question will block the object. We can't use
…		…
1991	* customized, changed states, etc.	1960	* customized, changed states, etc.
1992	*/	1961	*/
1993	int	1962	int
1994	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1963	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1995	{	1964	{
		1965	int altern[SIZEOFFREE];
1996	int index = 0, flag;	1966	int index = 0, flag;
1997	int altern[SIZEOFFREE];
1998		1967
1999	for (int i = start; i < stop; i++)	1968	for (int i = start; i < stop; i++)
2000	{	1969	{
2001	mapxy pos (m, x, y); pos.move (i);	1970	mapxy pos (m, x, y); pos.move (i);
2002		1971
2003	if (!pos.normalise ())	1972	if (!pos.normalise ())
2004	continue;	1973	continue;
2005		1974
2006	mapspace &ms = *pos;	1975	mapspace &ms = *pos;
2007	ms.update ();	1976
		1977	if (ms.flags () & P_IS_ALIVE)
		1978	continue;
2008		1979
2009	/* However, often	1980	/* However, often
2010	* ob doesn't have any move type (when used to place exits)	1981	* ob doesn't have any move type (when used to place exits)
2011	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.	1982	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2012	*/	1983	*/
2013	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)	1984	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1985	{
		1986	altern [index++] = i;
2014	continue;	1987	continue;
		1988	}
2015		1989
2016	/* Basically, if we find a wall on a space, we cut down the search size.	1990	/* Basically, if we find a wall on a space, we cut down the search size.
2017	* In this way, we won't return spaces that are on another side of a wall.	1991	* In this way, we won't return spaces that are on another side of a wall.
2018	* This mostly work, but it cuts down the search size in all directions -	1992	* This mostly work, but it cuts down the search size in all directions -
2019	* if the space being examined only has a wall to the north and empty	1993	* if the space being examined only has a wall to the north and empty
…		…
2029		2003
2030	/* Note it is intentional that we check ob - the movement type of the	2004	/* Note it is intentional that we check ob - the movement type of the
2031	* head of the object should correspond for the entire object.	2005	* head of the object should correspond for the entire object.
2032	*/	2006	*/
2033	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2007	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2008	continue;
		2009
		2010	if (ob->blocked (m, pos.x, pos.y))
2034	continue;	2011	continue;
2035		2012
2036	altern [index++] = i;	2013	altern [index++] = i;
2037	}	2014	}
2038		2015
…		…
2597	{	2574	{
2598	char flagdesc[512];	2575	char flagdesc[512];
2599	char info2[256 * 4];	2576	char info2[256 * 4];
2600	char *p = info;	2577	char *p = info;
2601		2578
2602	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2579	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2603	count, uuid.seq,	2580	count,
		2581	uuid.c_str (),
2604	&name,	2582	&name,
2605	title ? "\",title:\"" : "",	2583	title ? "\",title:\"" : "",
2606	title ? (const char *)title : "",	2584	title ? (const char *)title : "",
2607	flag_desc (flagdesc, 512), type);	2585	flag_desc (flagdesc, 512), type);
2608		2586
2609	if (!this->flag[FLAG_REMOVED] && env)	2587	if (!flag[FLAG_REMOVED] && env)
2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2588	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2611		2589
2612	if (map)	2590	if (map)
2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2591	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2614		2592
…		…
2644	object::open_container (object *new_container)	2622	object::open_container (object *new_container)
2645	{	2623	{
2646	if (container == new_container)	2624	if (container == new_container)
2647	return;	2625	return;
2648		2626
2649	if (object *old_container = container)	2627	object *old_container = container;
		2628
		2629	if (old_container)
2650	{	2630	{
2651	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2631	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2652	return;	2632	return;
2653		2633
2654	#if 0	2634	#if 0
…		…
2656	if (object *closer = old_container->inv)	2636	if (object *closer = old_container->inv)
2657	if (closer->type == CLOSE_CON)	2637	if (closer->type == CLOSE_CON)
2658	closer->destroy ();	2638	closer->destroy ();
2659	#endif	2639	#endif
2660		2640
		2641	// make sure the container is available
		2642	esrv_send_item (this, old_container);
		2643
2661	old_container->flag [FLAG_APPLIED] = 0;	2644	old_container->flag [FLAG_APPLIED] = false;
2662	container = 0;	2645	container = 0;
2663		2646
		2647	// client needs item update to make it work, client bug requires this to be separate
2664	esrv_update_item (UPD_FLAGS, this, old_container);	2648	esrv_update_item (UPD_FLAGS, this, old_container);
		2649
2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2650	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2666	play_sound (sound_find ("chest_close"));	2651	play_sound (sound_find ("chest_close"));
2667	}	2652	}
2668		2653
2669	if (new_container)	2654	if (new_container)
…		…
2682	}	2667	}
2683	#endif	2668	#endif
2684		2669
2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2670	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2686		2671
		2672	// make sure the container is available, client bug requires this to be separate
		2673	esrv_send_item (this, new_container);
		2674
2687	new_container->flag [FLAG_APPLIED] = 1;	2675	new_container->flag [FLAG_APPLIED] = true;
2688	container = new_container;	2676	container = new_container;
2689		2677
		2678	// client needs flag change
2690	esrv_update_item (UPD_FLAGS, this, new_container);	2679	esrv_update_item (UPD_FLAGS, this, new_container);
2691	esrv_send_inventory (this, new_container);	2680	esrv_send_inventory (this, new_container);
2692	play_sound (sound_find ("chest_open"));	2681	play_sound (sound_find ("chest_open"));
2693	}	2682	}
		2683	// else if (!old_container->env && contr && contr->ns)
		2684	// contr->ns->floorbox_reset ();
2694	}	2685	}
2695		2686
2696	object *	2687	object *
2697	object::force_find (const shstr name)	2688	object::force_find (const shstr name)
2698	{	2689	{
…		…
2724		2715
2725	insert (force);	2716	insert (force);
2726	}	2717	}
2727		2718
2728	void	2719	void
2729	object::play_sound (faceidx sound) const	2720	object::play_sound (faceidx sound)
2730	{	2721	{
2731	if (!sound)	2722	if (!sound)
2732	return;	2723	return;
2733		2724
2734	if (flag [FLAG_REMOVED])	2725	if (flag [FLAG_REMOVED])

Diff Legend

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