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.200 by root, Sun Jan 13 08:55:41 2008 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra 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
…		…
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 <support@deliantra.net>	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;
141
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
143	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
144	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
145	*/	147	*/
146		148
147	/* For each field in wants, */	149	/* For each field in wants, */
148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
149	{	151	if (has->kv_get (kv->key) != kv->value)
150	key_value *has_field;	152	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		153
171	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	155	return true;
173	}	156	}
174		157
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	159	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	161	{
179	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
181	*/	164	*/
182	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
183	}	167	}
184		168
185	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
186	* they can be merged together.	170	* they can be merged together.
187	*	171	*
…		…
202	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
205	return 0;	189	return 0;
206		190
207	//TODO: this ain't working well, use nicer and correct overflow check	191	/* 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	192	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	193	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	194	* nrof values.
211	*/	195	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	197	return 0;
214		198
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* 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	200	* 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	201	* 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	202	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	203	* flags lose any meaning.
220	*/	204	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		207
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		210
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	215	|| 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	216	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	227	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	228	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	229	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	230	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	231	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	232	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	235	return 0;
253		236
		237	if ((ob1->flag ^ ob2->flag)
		238	.reset (FLAG_INV_LOCKED)
		239	.reset (FLAG_CLIENT_SENT)
		240	.reset (FLAG_REMOVED)
		241	.any ())
		242	return 0;
		243
254	/* This is really a spellbook check - really, we should	244	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	245	* not merge objects with real inventories, as splitting them
		246	* is hard.
256	*/	247	*/
257	if (ob1->inv || ob2->inv)	248	if (ob1->inv || ob2->inv)
258	{	249	{
259	if (!(ob1->inv && ob2->inv))	250	if (!(ob1->inv && ob2->inv))
260	return 0; /* inventories differ in length */	251	return 0; /* inventories differ in length */
261		252
262	if (ob1->inv->below || ob2->inv->below)	253	if (ob1->inv->below || ob2->inv->below)
263	return 0; /* more than one object in inv */	254	return 0; /* more than one object in inv */
264		255
265	if (!object::can_merge (ob1->inv, ob2->inv))	256	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0; /* inventory objexts differ */	257	return 0; /* inventory objects differ */
267		258
268	/* inventory ok - still need to check rest of this object to see	259	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	260	* if it is valid.
270	*/	261	*/
271	}	262	}
…		…
290	if (ob1->level != ob2->level)	281	if (ob1->level != ob2->level)
291	return 0;	282	return 0;
292	break;	283	break;
293	}	284	}
294		285
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	286	if (ob1->key_values || ob2->key_values)
296	{	287	{
297	/* At least one of these has key_values. */	288	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	289	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	290	return 0; /* One has fields, but the other one doesn't. */
300	return 0;	291
301	else if (!compare_ob_value_lists (ob1, ob2))	292	if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	293	return 0;
303	}	294	}
304		295
305	if (ob1->self || ob2->self)	296	if (ob1->self || ob2->self)
306	{	297	{
…		…
312	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	303	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	304	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314		305
315	if (k1 != k2)	306	if (k1 != k2)
316	return 0;	307	return 0;
		308
317	else if (k1 == 0)	309	if (k1 == 0)
318	return 1;	310	return 1;
		311
319	else if (!cfperl_can_merge (ob1, ob2))	312	if (!cfperl_can_merge (ob1, ob2))
320	return 0;	313	return 0;
321	}	314	}
322	}	315	}
323		316
324	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
325	return 1;	318	return 1;
326	}	319	}
327		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container || this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
		357	// adjust weight per container type ("of holding")
		358	static sint32
		359	weight_adjust (object *op, sint32 weight)
		360	{
		361	return op->type == CONTAINER
		362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		363	: weight;
		364	}
		365
328	/*	366	/*
		367	* adjust_weight(object, weight) adds the specified weight to an object,
		368	* and also updates how much the environment(s) is/are carrying.
		369	*/
		370	static void
		371	adjust_weight (object *op, sint32 weight)
		372	{
		373	while (op)
		374	{
		375	weight = weight_adjust (op, weight);
		376
		377	if (!weight)
		378	return;
		379
		380	op->carrying += weight;
		381
		382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
		384	esrv_update_item (UPD_WEIGHT, pl, op);
		385
		386	op = op->env;
		387	}
		388	}
		389
		390	/*
329	* sum_weight() is a recursive function which calculates the weight	391	* this is a recursive function which calculates the weight
330	* an object is carrying. It goes through in figures out how much	392	* an object is carrying. It goes through op and figures out how much
331	* containers are carrying, and sums it up.	393	* containers are carrying, and sums it up.
332	*/	394	*/
333	long	395	void
334	sum_weight (object *op)	396	object::update_weight ()
335	{	397	{
336	long sum;	398	sint32 sum = 0;
337	object *inv;
338		399
339	for (sum = 0, inv = op->inv; inv; inv = inv->below)	400	for (object *op = inv; op; op = op->below)
340	{	401	{
341	if (inv->inv)	402	if (op->inv)
342	sum_weight (inv);	403	op->update_weight ();
343		404
344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	405	sum += op->total_weight ();
		406	}
		407
		408	sum = weight_adjust (this, sum);
		409
		410	if (sum != carrying)
345	}	411	{
346
347	if (op->type == CONTAINER && op->stats.Str)
348	sum = (sum * (100 - op->stats.Str)) / 100;
349
350	if (op->carrying != sum)
351	op->carrying = sum;	412	carrying = sum;
352		413
353	return sum;	414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
		416	esrv_update_item (UPD_WEIGHT, pl, this);
		417	}
354	}	418	}
355		419
356	/**	420	/*
357	* Return the outermost environment object for a given object.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
358	*/
359
360	object *
361	object_get_env_recursive (object *op)
362	{
363	while (op->env != NULL)
364	op = op->env;
365	return op;
366	}
367
368	/*
369	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
370	* Some error messages.
371	* The result of the dump is stored in the static global errmsg array.
372	*/	422	*/
373	char *	423	char *
374	dump_object (object *op)	424	dump_object (object *op)
375	{	425	{
376	if (!op)	426	if (!op)
…		…
390	get_nearest_part (object *op, const object *pl)	440	get_nearest_part (object *op, const object *pl)
391	{	441	{
392	object *tmp, *closest;	442	object *tmp, *closest;
393	int last_dist, i;	443	int last_dist, i;
394		444
395	if (op->more == NULL)	445	if (!op->more)
396	return op;	446	return op;
		447
397	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	448	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		449	tmp;
		450	tmp = tmp->more)
398	if ((i = distance (tmp, pl)) < last_dist)	451	if ((i = distance (tmp, pl)) < last_dist)
399	closest = tmp, last_dist = i;	452	closest = tmp, last_dist = i;
		453
400	return closest;	454	return closest;
401	}	455	}
402		456
403	/*	457	/*
404	* Returns the object which has the count-variable equal to the argument.	458	* Returns the object which has the count-variable equal to the argument.
		459	* VERRRY slow.
405	*/	460	*/
406	object *	461	object *
407	find_object (tag_t i)	462	find_object (tag_t i)
408	{	463	{
409	for_all_objects (op)	464	for_all_objects (op)
…		…
427	for_all_objects (op)	482	for_all_objects (op)
428	if (op->name == str_)	483	if (op->name == str_)
429	break;	484	break;
430		485
431	return op;	486	return op;
432	}
433
434	void
435	free_all_object_data ()
436	{
437	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
438	}	487	}
439		488
440	/*	489	/*
441	* Sets the owner and sets the skill and exp pointers to owner's current	490	* Sets the owner and sets the skill and exp pointers to owner's current
442	* skill and experience objects.	491	* skill and experience objects.
…		…
540	}	589	}
541		590
542	op->key_values = 0;	591	op->key_values = 0;
543	}	592	}
544		593
545	object &	594	/*
546	object::operator =(const object &src)	595	* copy_to first frees everything allocated by the dst object,
		596	* and then copies the contents of itself into the second
		597	* object, allocating what needs to be allocated. Basically, any
		598	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		599	* if the first object is freed, the pointers in the new object
		600	* will point at garbage.
		601	*/
		602	void
		603	object::copy_to (object *dst)
547	{	604	{
548	bool is_freed = flag [FLAG_FREED];	605	dst->remove ();
549	bool is_removed = flag [FLAG_REMOVED];
550
551	*(object_copy *)this = src;	606	*(object_copy *)dst = *this;
552
553	flag [FLAG_FREED] = is_freed;
554	flag [FLAG_REMOVED] = is_removed;	607	dst->flag [FLAG_REMOVED] = true;
555		608
556	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
557	if (src.key_values)	610	if (key_values)
558	{	611	{
559	key_value *tail = 0;	612	key_value *tail = 0;
560	key_values = 0;	613	dst->key_values = 0;
561		614
562	for (key_value *i = src.key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
563	{	616	{
564	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
565		618
566	new_link->next = 0;	619	new_link->next = 0;
567	new_link->key = i->key;	620	new_link->key = i->key;
568	new_link->value = i->value;	621	new_link->value = i->value;
569		622
570	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
571	if (!key_values)	624	if (!dst->key_values)
572	{	625	{
573	key_values = new_link;	626	dst->key_values = new_link;
574	tail = new_link;	627	tail = new_link;
575	}	628	}
576	else	629	else
577	{	630	{
578	tail->next = new_link;	631	tail->next = new_link;
579	tail = new_link;	632	tail = new_link;
580	}	633	}
581	}	634	}
582	}	635	}
583	}
584
585	/*
586	* copy_to first frees everything allocated by the dst object,
587	* and then copies the contents of itself into the second
588	* object, allocating what needs to be allocated. Basically, any
589	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
590	* if the first object is freed, the pointers in the new object
591	* will point at garbage.
592	*/
593	void
594	object::copy_to (object *dst)
595	{
596	*dst = *this;
597		636
598	if (speed < 0)	637	if (speed < 0)
599	dst->speed_left -= rndm ();	638	dst->speed_left -= rndm ();
600		639
601	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
…		…
603		642
604	void	643	void
605	object::instantiate ()	644	object::instantiate ()
606	{	645	{
607	if (!uuid.seq) // HACK	646	if (!uuid.seq) // HACK
608	uuid = gen_uuid ();	647	uuid = UUID::gen ();
609		648
610	speed_left = -0.1f;	649	speed_left = -0.1f;
611	/* copy the body_info to the body_used - this is only really	650	/* copy the body_info to the body_used - this is only really
612	* need for monsters, but doesn't hurt to do it for everything.	651	* need for monsters, but doesn't hurt to do it for everything.
613	* by doing so, when a monster is created, it has good starting	652	* by doing so, when a monster is created, it has good starting
…		…
623	object *	662	object *
624	object::clone ()	663	object::clone ()
625	{	664	{
626	object *neu = create ();	665	object *neu = create ();
627	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
628	return neu;	668	return neu;
629	}	669	}
630		670
631	/*	671	/*
632	* If an object with the IS_TURNABLE() flag needs to be turned due	672	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
683	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
684	*/	724	*/
685	void	725	void
686	update_object (object *op, int action)	726	update_object (object *op, int action)
687	{	727	{
688	if (op == NULL)	728	if (!op)
689	{	729	{
690	/* this should never happen */	730	/* this should never happen */
691	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
692	return;	732	return;
693	}	733	}
694		734
695	if (op->env)	735	if (!op->is_on_map ())
696	{	736	{
697	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
698	* to do in this case.	738	* to do in this case.
699	*/	739	*/
700	return;	740	return;
701	}	741	}
702
703	/* If the map is saving, don't do anything as everything is
704	* going to get freed anyways.
705	*/
706	if (!op->map || op->map->in_memory == MAP_SAVING)
707	return;
708		742
709	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
710	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	744	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
711	{	745	{
712	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
772	static int object_count;	806	static int object_count;
773		807
774	void object::link ()	808	void object::link ()
775	{	809	{
776	assert (!index);//D	810	assert (!index);//D
777	uuid = gen_uuid ();	811	uuid = UUID::gen ();
778	count = ++object_count;	812	count = ++object_count;
779		813
780	refcnt_inc ();	814	refcnt_inc ();
781	objects.insert (this);	815	objects.insert (this);
782	}	816	}
…		…
855	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
856	{	890	{
857	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
858	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
859	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
860	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
861	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
862	if (!inv)	896	if (!inv)
863	return;	897	return;
864		898
865	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
866	* if some form of movement is allowed, let objects	900	* if some form of movement is allowed, let objects
867	* drop on that space.	901	* drop on that space.
868	*/	902	*/
869	if (!drop_to_ground	903	if (!drop_to_ground
870	|| !map	904	|| !map
871	|| map->in_memory != MAP_IN_MEMORY	905	|| map->in_memory != MAP_ACTIVE
872	|| map->nodrop	906	|| map->nodrop
873	|| ms ().move_block == MOVE_ALL)	907	|| ms ().move_block == MOVE_ALL)
874	{	908	{
875	while (inv)	909	while (inv)
876	{	910	{
877	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
878	inv->destroy ();	912	inv->destroy ();
879	}	913	}
880	}	914	}
881	else	915	else
882	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
888	|| op->flag [FLAG_NO_DROP]	922	|| op->flag [FLAG_NO_DROP]
889	|| op->type == RUNE	923	|| op->type == RUNE
890	|| op->type == TRAP	924	|| op->type == TRAP
891	|| op->flag [FLAG_IS_A_TEMPLATE]	925	|| op->flag [FLAG_IS_A_TEMPLATE]
892	|| op->flag [FLAG_DESTROY_ON_DEATH])	926	|| op->flag [FLAG_DESTROY_ON_DEATH])
893	op->destroy ();	927	op->destroy (true);
894	else	928	else
895	map->insert (op, x, y);	929	map->insert (op, x, y);
896	}	930	}
897	}	931	}
898	}	932	}
…		…
902	object *op = new object;	936	object *op = new object;
903	op->link ();	937	op->link ();
904	return op;	938	return op;
905	}	939	}
906		940
		941	static struct freed_map : maptile
		942	{
		943	freed_map ()
		944	{
		945	path = "<freed objects map>";
		946	name = "/internal/freed_objects_map";
		947	width = 3;
		948	height = 3;
		949	nodrop = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954	} freed_map; // freed objects are moved here to avoid crashes
		955
907	void	956	void
908	object::do_destroy ()	957	object::do_destroy ()
909	{	958	{
910	attachable::do_destroy ();
911
912	if (flag [FLAG_IS_LINKED])	959	if (flag [FLAG_IS_LINKED])
913	remove_button_link (this);	960	remove_button_link (this);
914		961
915	if (flag [FLAG_FRIENDLY])	962	if (flag [FLAG_FRIENDLY])
916	remove_friendly_object (this);	963	remove_friendly_object (this);
917		964
918	if (!flag [FLAG_REMOVED])
919	remove ();	965	remove ();
920		966
921	destroy_inv (true);	967	attachable::do_destroy ();
922		968
923	deactivate ();	969	deactivate ();
924	unlink ();	970	unlink ();
925		971
926	flag [FLAG_FREED] = 1;	972	flag [FLAG_FREED] = 1;
927		973
928	// hack to ensure that freed objects still have a valid map	974	// hack to ensure that freed objects still have a valid map
929	{
930	static maptile *freed_map; // freed objects are moved here to avoid crashes
931
932	if (!freed_map)
933	{
934	freed_map = new maptile;
935
936	freed_map->path = "<freed objects map>";
937	freed_map->name = "/internal/freed_objects_map";
938	freed_map->width = 3;
939	freed_map->height = 3;
940
941	freed_map->alloc ();
942	freed_map->in_memory = MAP_IN_MEMORY;
943	}
944
945	map = freed_map;	975	map = &freed_map;
946	x = 1;	976	x = 1;
947	y = 1;	977	y = 1;
948	}
949		978
950	if (more)	979	if (more)
951	{	980	{
952	more->destroy ();	981	more->destroy ();
953	more = 0;	982	more = 0;
…		…
966	object::destroy (bool destroy_inventory)	995	object::destroy (bool destroy_inventory)
967	{	996	{
968	if (destroyed ())	997	if (destroyed ())
969	return;	998	return;
970		999
		1000	if (!is_head () && !head->destroyed ())
		1001	{
		1002	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1003	head->destroy (destroy_inventory);
		1004	return;
		1005	}
		1006
971	if (destroy_inventory)	1007	destroy_inv (!destroy_inventory);
972	destroy_inv (false);
973		1008
974	if (is_head ())	1009	if (is_head ())
975	if (sound_destroy)	1010	if (sound_destroy)
976	play_sound (sound_destroy);	1011	play_sound (sound_destroy);
977	else if (flag [FLAG_MONSTER])	1012	else if (flag [FLAG_MONSTER])
978	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1013	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
979		1014
980	attachable::destroy ();	1015	attachable::destroy ();
981	}
982
983	/*
984	* sub_weight() recursively (outwards) subtracts a number from the
985	* weight of an object (and what is carried by it's environment(s)).
986	*/
987	void
988	sub_weight (object *op, signed long weight)
989	{
990	while (op != NULL)
991	{
992	if (op->type == CONTAINER)
993	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
994
995	op->carrying -= weight;
996	op = op->env;
997	}
998	}	1016	}
999		1017
1000	/* op->remove ():	1018	/* op->remove ():
1001	* This function removes the object op from the linked list of objects	1019	* This function removes the object op from the linked list of objects
1002	* which it is currently tied to. When this function is done, the	1020	* which it is currently tied to. When this function is done, the
…		…
1008	object::do_remove ()	1026	object::do_remove ()
1009	{	1027	{
1010	object *tmp, *last = 0;	1028	object *tmp, *last = 0;
1011	object *otmp;	1029	object *otmp;
1012		1030
1013	if (QUERY_FLAG (this, FLAG_REMOVED))	1031	if (flag [FLAG_REMOVED])
1014	return;	1032	return;
1015		1033
1016	SET_FLAG (this, FLAG_REMOVED);
1017	INVOKE_OBJECT (REMOVE, this);	1034	INVOKE_OBJECT (REMOVE, this);
		1035
		1036	flag [FLAG_REMOVED] = true;
1018		1037
1019	if (more)	1038	if (more)
1020	more->remove ();	1039	more->remove ();
1021		1040
1022	/*	1041	/*
1023	* In this case, the object to be removed is in someones	1042	* In this case, the object to be removed is in someones
1024	* inventory.	1043	* inventory.
1025	*/	1044	*/
1026	if (env)	1045	if (env)
1027	{	1046	{
		1047	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1048	if (object *pl = visible_to ())
		1049	esrv_del_item (pl->contr, count);
		1050	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1051
		1052	adjust_weight (env, -total_weight ());
		1053
		1054	*(above ? &above->below : &env->inv) = below;
		1055
1028	if (nrof)	1056	if (below)
1029	sub_weight (env, weight * nrof);	1057	below->above = above;
1030	else	1058
1031	sub_weight (env, weight + carrying);	1059	/* we set up values so that it could be inserted into
		1060	* the map, but we don't actually do that - it is up
		1061	* to the caller to decide what we want to do.
		1062	*/
		1063	map = env->map;
		1064	x = env->x;
		1065	y = env->y;
		1066	above = 0;
		1067	below = 0;
		1068	env = 0;
1032		1069
1033	/* NO_FIX_PLAYER is set when a great many changes are being	1070	/* NO_FIX_PLAYER is set when a great many changes are being
1034	* made to players inventory. If set, avoiding the call	1071	* made to players inventory. If set, avoiding the call
1035	* to save cpu time.	1072	* to save cpu time.
1036	*/	1073	*/
1037	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1074	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1038	otmp->update_stats ();	1075	otmp->update_stats ();
1039
1040	if (above)
1041	above->below = below;
1042	else
1043	env->inv = below;
1044
1045	if (below)
1046	below->above = above;
1047
1048	/* we set up values so that it could be inserted into
1049	* the map, but we don't actually do that - it is up
1050	* to the caller to decide what we want to do.
1051	*/
1052	x = env->x, y = env->y;
1053	map = env->map;
1054	above = 0, below = 0;
1055	env = 0;
1056	}	1076	}
1057	else if (map)	1077	else if (map)
1058	{	1078	{
1059	if (type == PLAYER)
1060	{
1061	// leaving a spot always closes any open container on the ground
1062	if (container && !container->env)
1063	// this causes spurious floorbox updates, but it ensures
1064	// that the CLOSE event is being sent.
1065	close_container ();
1066
1067	--map->players;
1068	map->touch ();
1069	}
1070
1071	map->dirty = true;	1079	map->dirty = true;
1072	mapspace &ms = this->ms ();	1080	mapspace &ms = this->ms ();
		1081
		1082	if (object *pl = ms.player ())
		1083	{
		1084	if (type == PLAYER) // this == pl(!)
		1085	{
		1086	// leaving a spot always closes any open container on the ground
		1087	if (container && !container->env)
		1088	// this causes spurious floorbox updates, but it ensures
		1089	// that the CLOSE event is being sent.
		1090	close_container ();
		1091
		1092	--map->players;
		1093	map->touch ();
		1094	}
		1095	else if (pl->container == this)
		1096	{
		1097	// removing a container should close it
		1098	close_container ();
		1099	}
		1100
		1101	esrv_del_item (pl->contr, count);
		1102	}
1073		1103
1074	/* link the object above us */	1104	/* link the object above us */
1075	if (above)	1105	if (above)
1076	above->below = below;	1106	above->below = below;
1077	else	1107	else
…		…
1107	* removed (most likely destroyed), update the player view	1137	* removed (most likely destroyed), update the player view
1108	* appropriately.	1138	* appropriately.
1109	*/	1139	*/
1110	pl->close_container ();	1140	pl->close_container ();
1111		1141
		1142	//TODO: the floorbox prev/next might need updating
		1143	//esrv_del_item (pl->contr, count);
		1144	//TODO: update floorbox to preserve ordering
		1145	if (pl->contr->ns)
1112	pl->contr->ns->floorbox_update ();	1146	pl->contr->ns->floorbox_update ();
1113	}	1147	}
1114		1148
1115	for (tmp = ms.bot; tmp; tmp = tmp->above)	1149	for (tmp = ms.bot; tmp; tmp = tmp->above)
1116	{	1150	{
1117	/* No point updating the players look faces if he is the object	1151	/* No point updating the players look faces if he is the object
…		…
1161	if (!top)	1195	if (!top)
1162	for (top = op; top && top->above; top = top->above)	1196	for (top = op; top && top->above; top = top->above)
1163	;	1197	;
1164		1198
1165	for (; top; top = top->below)	1199	for (; top; top = top->below)
1166	{
1167	if (top == op)
1168	continue;
1169
1170	if (object::can_merge (op, top))	1200	if (object::can_merge (op, top))
1171	{	1201	{
1172	top->nrof += op->nrof;	1202	top->nrof += op->nrof;
1173		1203
1174	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1204	if (object *pl = top->visible_to ())
1175	op->weight = 0; /* Don't want any adjustements now */	1205	esrv_update_item (UPD_NROF, pl, top);
		1206
		1207	op->weight = 0; // cancel the addition above
		1208	op->carrying = 0; // must be 0 already
		1209
1176	op->destroy ();	1210	op->destroy (1);
		1211
1177	return top;	1212	return top;
1178	}	1213	}
1179	}
1180		1214
1181	return 0;	1215	return 0;
1182	}	1216	}
1183		1217
1184	void	1218	void
…		…
1243	object *	1277	object *
1244	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1278	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1245	{	1279	{
1246	assert (!op->flag [FLAG_FREED]);	1280	assert (!op->flag [FLAG_FREED]);
1247		1281
1248	object *top, *floor = NULL;
1249
1250	op->remove ();	1282	op->remove ();
1251		1283
1252	/* Ideally, the caller figures this out. However, it complicates a lot	1284	/* Ideally, the caller figures this out. However, it complicates a lot
1253	* of areas of callers (eg, anything that uses find_free_spot would now	1285	* of areas of callers (eg, anything that uses find_free_spot would now
1254	* need extra work	1286	* need extra work
1255	*/	1287	*/
1256	if (!xy_normalise (m, op->x, op->y))	1288	if (!xy_normalise (m, op->x, op->y))
1257	{	1289	{
1258	op->destroy ();	1290	op->destroy (1);
1259	return 0;	1291	return 0;
1260	}	1292	}
1261		1293
1262	if (object *more = op->more)	1294	if (object *more = op->more)
1263	if (!insert_ob_in_map (more, m, originator, flag))	1295	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1272	*/	1304	*/
1273	if (op->nrof && !(flag & INS_NO_MERGE))	1305	if (op->nrof && !(flag & INS_NO_MERGE))
1274	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1275	if (object::can_merge (op, tmp))	1307	if (object::can_merge (op, tmp))
1276	{	1308	{
		1309	// TODO: we atcually want to update tmp, not op,
		1310	// but some caller surely breaks when we return tmp
		1311	// from here :/
1277	op->nrof += tmp->nrof;	1312	op->nrof += tmp->nrof;
1278	tmp->destroy ();	1313	tmp->destroy (1);
1279	}	1314	}
1280		1315
1281	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1282	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1317	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1283		1318
…		…
1303	/* since *below* originator, no need to update top */	1338	/* since *below* originator, no need to update top */
1304	originator->below = op;	1339	originator->below = op;
1305	}	1340	}
1306	else	1341	else
1307	{	1342	{
		1343	object *top, *floor = NULL;
		1344
1308	top = ms.bot;	1345	top = ms.bot;
1309		1346
1310	/* If there are other objects, then */	1347	/* If there are other objects, then */
1311	if (top)	1348	if (top)
1312	{	1349	{
…		…
1411	}	1448	}
1412		1449
1413	op->map->dirty = true;	1450	op->map->dirty = true;
1414		1451
1415	if (object *pl = ms.player ())	1452	if (object *pl = ms.player ())
		1453	//TODO: the floorbox prev/next might need updating
		1454	//esrv_send_item (pl, op);
		1455	//TODO: update floorbox to preserve ordering
		1456	if (pl->contr->ns)
1416	pl->contr->ns->floorbox_update ();	1457	pl->contr->ns->floorbox_update ();
1417		1458
1418	/* If this object glows, it may affect lighting conditions that are	1459	/* If this object glows, it may affect lighting conditions that are
1419	* visible to others on this map. But update_all_los is really	1460	* visible to others on this map. But update_all_los is really
1420	* an inefficient way to do this, as it means los for all players	1461	* an inefficient way to do this, as it means los for all players
1421	* on the map will get recalculated. The players could very well	1462	* on the map will get recalculated. The players could very well
…		…
1463	* op is the object to insert it under: supplies x and the map.	1504	* op is the object to insert it under: supplies x and the map.
1464	*/	1505	*/
1465	void	1506	void
1466	replace_insert_ob_in_map (const char *arch_string, object *op)	1507	replace_insert_ob_in_map (const char *arch_string, object *op)
1467	{	1508	{
1468	object *tmp, *tmp1;
1469
1470	/* first search for itself and remove any old instances */	1509	/* first search for itself and remove any old instances */
1471		1510
1472	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1511	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1473	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1512	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1474	tmp->destroy ();	1513	tmp->destroy (1);
1475		1514
1476	tmp1 = arch_to_object (archetype::find (arch_string));	1515	object *tmp = arch_to_object (archetype::find (arch_string));
1477		1516
1478	tmp1->x = op->x;	1517	tmp->x = op->x;
1479	tmp1->y = op->y;	1518	tmp->y = op->y;
		1519
1480	insert_ob_in_map (tmp1, op->map, op, 0);	1520	insert_ob_in_map (tmp, op->map, op, 0);
1481	}	1521	}
1482		1522
1483	object *	1523	object *
1484	object::insert_at (object *where, object *originator, int flags)	1524	object::insert_at (object *where, object *originator, int flags)
1485	{	1525	{
		1526	if (where->env)
		1527	return where->env->insert (this);
		1528	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1529	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1530	}
1488		1531
1489	/*	1532	/*
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1491	* is returned contains nr objects, and the remaining parts contains
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *
1497	get_split_ob (object *orig_ob, uint32 nr)
1498	{
1499	object *newob;
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501
1502	if (orig_ob->nrof < nr)
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}
1507
1508	newob = object_create_clone (orig_ob);
1509
1510	if ((orig_ob->nrof -= nr) < 1)
1511	orig_ob->destroy (1);
1512	else if (!is_removed)
1513	{
1514	if (orig_ob->env != NULL)
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}
1522	}
1523
1524	newob->nrof = nr;
1525
1526	return newob;
1527	}
1528
1529	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1533	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1534	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1535	* is subsequently removed and freed.
1533	*	1536	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1537	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1538	*/
		1539	bool
		1540	object::decrease (sint32 nr)
		1541	{
		1542	if (!nr)
		1543	return true;
		1544
		1545	nr = min (nr, nrof);
		1546
		1547	nrof -= nr;
		1548
		1549	if (nrof)
		1550	{
		1551	adjust_weight (env, -weight * nr); // carrying == 0
		1552
		1553	if (object *pl = visible_to ())
		1554	esrv_update_item (UPD_NROF, pl, this);
		1555
		1556	return true;
		1557	}
		1558	else
		1559	{
		1560	destroy (1);
		1561	return false;
		1562	}
		1563	}
		1564
		1565	/*
		1566	* split(ob,nr) splits up ob into two parts. The part which
		1567	* is returned contains nr objects, and the remaining parts contains
		1568	* the rest (or is removed and returned if that number is 0).
		1569	* On failure, NULL is returned.
		1570	*/
1536	object *	1571	object *
1537	decrease_ob_nr (object *op, uint32 i)	1572	object::split (sint32 nr)
1538	{	1573	{
1539	object *tmp;	1574	int have = number_of ();
1540		1575
1541	if (i == 0) /* objects with op->nrof require this check */	1576	if (have < nr)
1542	return op;	1577	return 0;
1543		1578	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1579	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1580	remove ();
1579	op->nrof = 0;	1581	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1582	}
1584	else	1583	else
1585	{	1584	{
1586	object *above = op->above;	1585	decrease (nr);
1587		1586
1588	if (i < op->nrof)	1587	object *op = object_create_clone (this);
1589	op->nrof -= i;	1588	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1589	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}
1614	}
1615
1616	/*
1617	* add_weight(object, weight) adds the specified weight to an object,
1618	* and also updates how much the environment(s) is/are carrying.
1619	*/
1620	void
1621	add_weight (object *op, signed long weight)
1622	{
1623	while (op != NULL)
1624	{
1625	if (op->type == CONTAINER)
1626	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1627
1628	op->carrying += weight;
1629	op = op->env;
1630	}	1590	}
1631	}	1591	}
1632		1592
1633	object *	1593	object *
1634	insert_ob_in_ob (object *op, object *where)	1594	insert_ob_in_ob (object *op, object *where)
…		…
1659	* be != op, if items are merged. -Tero	1619	* be != op, if items are merged. -Tero
1660	*/	1620	*/
1661	object *	1621	object *
1662	object::insert (object *op)	1622	object::insert (object *op)
1663	{	1623	{
1664	if (!QUERY_FLAG (op, FLAG_REMOVED))
1665	op->remove ();
1666
1667	if (op->more)	1624	if (op->more)
1668	{	1625	{
1669	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1626	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1670	return op;	1627	return op;
1671	}	1628	}
1672		1629
1673	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1630	op->remove ();
1674	CLEAR_FLAG (op, FLAG_REMOVED);	1631
		1632	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1675		1633
1676	if (op->nrof)	1634	if (op->nrof)
1677	{
1678	for (object *tmp = inv; tmp; tmp = tmp->below)	1635	for (object *tmp = inv; tmp; tmp = tmp->below)
1679	if (object::can_merge (tmp, op))	1636	if (object::can_merge (tmp, op))
1680	{	1637	{
1681	/* return the original object and remove inserted object	1638	/* return the original object and remove inserted object
1682	(client needs the original object) */	1639	(client needs the original object) */
1683	tmp->nrof += op->nrof;	1640	tmp->nrof += op->nrof;
1684	/* Weight handling gets pretty funky. Since we are adding to	1641
1685	* tmp->nrof, we need to increase the weight.	1642	if (object *pl = tmp->visible_to ())
1686	*/	1643	esrv_update_item (UPD_NROF, pl, tmp);
		1644
1687	add_weight (this, op->weight * op->nrof);	1645	adjust_weight (this, op->total_weight ());
1688	SET_FLAG (op, FLAG_REMOVED);	1646
1689	op->destroy (); /* free the inserted object */	1647	op->destroy (1);
1690	op = tmp;	1648	op = tmp;
1691	op->remove (); /* and fix old object's links */	1649	goto inserted;
1692	CLEAR_FLAG (op, FLAG_REMOVED);
1693	break;
1694	}	1650	}
1695		1651
1696	/* I assume combined objects have no inventory
1697	* We add the weight - this object could have just been removed
1698	* (if it was possible to merge). calling remove_ob will subtract
1699	* the weight, so we need to add it in again, since we actually do
1700	* the linking below
1701	*/
1702	add_weight (this, op->weight * op->nrof);
1703	}
1704	else
1705	add_weight (this, (op->weight + op->carrying));
1706
1707	if (object *otmp = this->in_player ())
1708	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1709	otmp->update_stats ();
1710
1711	op->owner = 0; // its his/hers now. period.	1652	op->owner = 0; // it's his/hers now. period.
1712	op->map = 0;	1653	op->map = 0;
		1654	op->x = 0;
		1655	op->y = 0;
		1656
		1657	op->above = 0;
		1658	op->below = inv;
1713	op->env = this;	1659	op->env = this;
1714	op->above = 0;
1715	op->below = 0;
1716	op->x = op->y = 0;
1717		1660
		1661	if (inv)
		1662	inv->above = op;
		1663
		1664	inv = op;
		1665
		1666	op->flag [FLAG_REMOVED] = 0;
		1667
		1668	if (object *pl = op->visible_to ())
		1669	esrv_send_item (pl, op);
		1670
		1671	adjust_weight (this, op->total_weight ());
		1672
		1673	inserted:
1718	/* reset the light list and los of the players on the map */	1674	/* reset the light list and los of the players on the map */
1719	if (op->glow_radius && map)	1675	if (op->glow_radius && map && map->darkness)
1720	{
1721	#ifdef DEBUG_LIGHTS
1722	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1723	#endif /* DEBUG_LIGHTS */
1724	if (map->darkness)
1725	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1726	}
1727		1677
1728	/* Client has no idea of ordering so lets not bother ordering it here.	1678	// if this is a player's inventory, update stats
1729	* It sure simplifies this function...	1679	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1730	*/	1680	update_stats ();
1731	if (!inv)
1732	inv = op;
1733	else
1734	{
1735	op->below = inv;
1736	op->below->above = op;
1737	inv = op;
1738	}
1739		1681
1740	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1741		1683
1742	return op;	1684	return op;
1743	}	1685	}
…		…
2367	* create clone from object to another	2309	* create clone from object to another
2368	*/	2310	*/
2369	object *	2311	object *
2370	object_create_clone (object *asrc)	2312	object_create_clone (object *asrc)
2371	{	2313	{
2372	object *dst = 0, *tmp, *src, *prev, *item;	2314	object *dst = 0;
2373		2315
2374	if (!asrc)	2316	if (!asrc)
2375	return 0;	2317	return 0;
2376		2318
2377	src = asrc->head_ ();	2319	object *src = asrc->head_ ();
2378		2320
2379	prev = 0;	2321	object *prev = 0;
2380	for (object *part = src; part; part = part->more)	2322	for (object *part = src; part; part = part->more)
2381	{	2323	{
2382	tmp = part->clone ();	2324	object *tmp = part->clone ();
		2325
2383	tmp->x -= src->x;	2326	tmp->x -= src->x;
2384	tmp->y -= src->y;	2327	tmp->y -= src->y;
2385		2328
2386	if (!part->head)	2329	if (!part->head)
2387	{	2330	{
…		…
2397	prev->more = tmp;	2340	prev->more = tmp;
2398		2341
2399	prev = tmp;	2342	prev = tmp;
2400	}	2343	}
2401		2344
2402	for (item = src->inv; item; item = item->below)	2345	for (object *item = src->inv; item; item = item->below)
2403	insert_ob_in_ob (object_create_clone (item), dst);	2346	insert_ob_in_ob (object_create_clone (item), dst);
2404		2347
2405	return dst;	2348	return dst;
2406	}	2349	}
2407		2350
…		…
2417	return tmp;	2360	return tmp;
2418		2361
2419	return 0;	2362	return 0;
2420	}	2363	}
2421		2364
2422	/* If ob has a field named key, return the link from the list,	2365	const shstr &
2423	* otherwise return NULL.	2366	object::kv_get (const shstr &key) const
2424	*
2425	* key must be a passed in shared string - otherwise, this won't
2426	* do the desired thing.
2427	*/
2428	key_value *
2429	get_ob_key_link (const object *ob, const char *key)
2430	{	2367	{
2431	for (key_value *link = ob->key_values; link; link = link->next)	2368	for (key_value *kv = key_values; kv; kv = kv->next)
2432	if (link->key == key)	2369	if (kv->key == key)
2433	return link;
2434
2435	return 0;
2436	}
2437
2438	/*
2439	* Returns the value of op has an extra_field for key, or NULL.
2440	*
2441	* The argument doesn't need to be a shared string.
2442	*
2443	* The returned string is shared.
2444	*/
2445	const char *
2446	get_ob_key_value (const object *op, const char *const key)
2447	{
2448	key_value *link;
2449	shstr_cmp canonical_key (key);
2450
2451	if (!canonical_key)
2452	{
2453	/* 1. There being a field named key on any object
2454	* implies there'd be a shared string to find.
2455	* 2. Since there isn't, no object has this field.
2456	* 3. Therefore, *this* object doesn't have this field.
2457	*/
2458	return 0;
2459	}
2460
2461	/* This is copied from get_ob_key_link() above -
2462	* only 4 lines, and saves the function call overhead.
2463	*/
2464	for (link = op->key_values; link; link = link->next)
2465	if (link->key == canonical_key)
2466	return link->value;	2370	return kv->value;
2467		2371
2468	return 0;	2372	return shstr_null;
2469	}	2373	}
2470		2374
2471	/*	2375	void
2472	* Updates the canonical_key in op to value.	2376	object::kv_set (const shstr &key, const shstr &value)
2473	*
2474	* canonical_key is a shared string (value doesn't have to be).
2475	*
2476	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2477	* keys.
2478	*
2479	* Returns TRUE on success.
2480	*/
2481	int
2482	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2483	{	2377	{
2484	key_value *field = NULL, *last = NULL;	2378	for (key_value *kv = key_values; kv; kv = kv->next)
2485		2379	if (kv->key == key)
2486	for (field = op->key_values; field != NULL; field = field->next)
2487	{
2488	if (field->key != canonical_key)
2489	{	2380	{
2490	last = field;	2381	kv->value = value;
2491	continue;	2382	return;
2492	}	2383	}
2493		2384
2494	if (value)	2385	key_value *kv = new key_value;
2495	field->value = value;	2386
2496	else	2387	kv->next = key_values;
		2388	kv->key = key;
		2389	kv->value = value;
		2390
		2391	key_values = kv;
		2392	}
		2393
		2394	void
		2395	object::kv_del (const shstr &key)
		2396	{
		2397	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2398	if ((*kvp)->key == key)
2497	{	2399	{
2498	/* Basically, if the archetype has this key set,	2400	key_value *kv = *kvp;
2499	* we need to store the null value so when we save	2401	*kvp = (*kvp)->next;
2500	* it, we save the empty value so that when we load,	2402	delete kv;
2501	* we get this value back again.	2403	return;
2502	*/
2503	if (get_ob_key_link (op->arch, canonical_key))
2504	field->value = 0;
2505	else
2506	{
2507	if (last)
2508	last->next = field->next;
2509	else
2510	op->key_values = field->next;
2511
2512	delete field;
2513	}
2514	}	2404	}
2515	return TRUE;
2516	}
2517	/* IF we get here, key doesn't exist */
2518
2519	/* No field, we'll have to add it. */
2520
2521	if (!add_key)
2522	return FALSE;
2523
2524	/* There isn't any good reason to store a null
2525	* value in the key/value list. If the archetype has
2526	* this key, then we should also have it, so shouldn't
2527	* be here. If user wants to store empty strings,
2528	* should pass in ""
2529	*/
2530	if (value == NULL)
2531	return TRUE;
2532
2533	field = new key_value;
2534
2535	field->key = canonical_key;
2536	field->value = value;
2537	/* Usual prepend-addition. */
2538	field->next = op->key_values;
2539	op->key_values = field;
2540
2541	return TRUE;
2542	}
2543
2544	/*
2545	* Updates the key in op to value.
2546	*
2547	* If add_key is FALSE, this will only update existing keys,
2548	* and not add new ones.
2549	* In general, should be little reason FALSE is ever passed in for add_key
2550	*
2551	* Returns TRUE on success.
2552	*/
2553	int
2554	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2555	{
2556	shstr key_ (key);
2557
2558	return set_ob_key_value_s (op, key_, value, add_key);
2559	}	2405	}
2560		2406
2561	object::depth_iterator::depth_iterator (object *container)	2407	object::depth_iterator::depth_iterator (object *container)
2562	: iterator_base (container)	2408	: iterator_base (container)
2563	{	2409	{
…		…
2613	{	2459	{
2614	char flagdesc[512];	2460	char flagdesc[512];
2615	char info2[256 * 4];	2461	char info2[256 * 4];
2616	char *p = info;	2462	char *p = info;
2617		2463
2618	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2464	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2619	count, uuid.seq,	2465	count,
		2466	uuid.c_str (),
2620	&name,	2467	&name,
2621	title ? "\",title:\"" : "",	2468	title ? "\",title:\"" : "",
2622	title ? (const char *)title : "",	2469	title ? (const char *)title : "",
2623	flag_desc (flagdesc, 512), type);	2470	flag_desc (flagdesc, 512), type);
2624		2471
2625	if (!this->flag[FLAG_REMOVED] && env)	2472	if (!flag[FLAG_REMOVED] && env)
2626	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2627		2474
2628	if (map)	2475	if (map)
2629	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2476	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2630		2477
…		…
2660	object::open_container (object *new_container)	2507	object::open_container (object *new_container)
2661	{	2508	{
2662	if (container == new_container)	2509	if (container == new_container)
2663	return;	2510	return;
2664		2511
2665	if (object *old_container = container)	2512	object *old_container = container;
		2513
		2514	if (old_container)
2666	{	2515	{
2667	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2516	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2668	return;	2517	return;
2669		2518
2670	#if 0	2519	#if 0
…		…
2672	if (object *closer = old_container->inv)	2521	if (object *closer = old_container->inv)
2673	if (closer->type == CLOSE_CON)	2522	if (closer->type == CLOSE_CON)
2674	closer->destroy ();	2523	closer->destroy ();
2675	#endif	2524	#endif
2676		2525
		2526	// make sure the container is available
		2527	esrv_send_item (this, old_container);
		2528
2677	old_container->flag [FLAG_APPLIED] = 0;	2529	old_container->flag [FLAG_APPLIED] = false;
2678	container = 0;	2530	container = 0;
2679		2531
		2532	// client needs item update to make it work, client bug requires this to be separate
2680	esrv_update_item (UPD_FLAGS, this, old_container);	2533	esrv_update_item (UPD_FLAGS, this, old_container);
		2534
2681	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2535	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2682	play_sound (sound_find ("chest_close"));	2536	play_sound (sound_find ("chest_close"));
2683	}	2537	}
2684		2538
2685	if (new_container)	2539	if (new_container)
…		…
2698	}	2552	}
2699	#endif	2553	#endif
2700		2554
2701	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2555	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2702		2556
		2557	// make sure the container is available, client bug requires this to be separate
		2558	esrv_send_item (this, new_container);
		2559
2703	new_container->flag [FLAG_APPLIED] = 1;	2560	new_container->flag [FLAG_APPLIED] = true;
2704	container = new_container;	2561	container = new_container;
2705		2562
		2563	// client needs flag change
2706	esrv_update_item (UPD_FLAGS, this, new_container);	2564	esrv_update_item (UPD_FLAGS, this, new_container);
2707	esrv_send_inventory (this, new_container);	2565	esrv_send_inventory (this, new_container);
2708	play_sound (sound_find ("chest_open"));	2566	play_sound (sound_find ("chest_open"));
2709	}	2567	}
		2568	// else if (!old_container->env && contr && contr->ns)
		2569	// contr->ns->floorbox_reset ();
2710	}	2570	}
2711		2571
2712	object *	2572	object *
2713	object::force_find (const shstr name)	2573	object::force_find (const shstr name)
2714	{	2574	{
…		…
2740		2600
2741	insert (force);	2601	insert (force);
2742	}	2602	}
2743		2603
2744	void	2604	void
2745	object::play_sound (faceidx sound) const	2605	object::play_sound (faceidx sound)
2746	{	2606	{
2747	if (!sound)	2607	if (!sound)
2748	return;	2608	return;
2749		2609
2750	if (flag [FLAG_REMOVED])	2610	if (flag [FLAG_REMOVED])

Diff Legend

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