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.203 by root, Fri Apr 11 13:59:05 2008 UTC vs.
Revision 1.264 by root, Sun Dec 21 23:29:27 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	UUID UUID::cur;	34	UUID UUID::cur;
		35	static uint64_t seq_next_save;
39	static const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
40		37
41	objectvec objects;	38	objectvec objects;
42	activevec actives;	39	activevec actives;
43		40
44	short freearr_x[SIZEOFFREE] = {	41	short freearr_x[SIZEOFFREE] = {
…		…
81	{	78	{
82	char filename[MAX_BUF];	79	char filename[MAX_BUF];
83		80
84	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
85		82
		83	seq_next_save = 0;
		84
86	FILE *fp;	85	FILE *fp;
87		86
88	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
89	{	88	{
90	if (errno == ENOENT)	89	if (errno == ENOENT)
91	{	90	{
92	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
93	UUID::cur.seq = 0;	92	UUID::cur.seq = 0;
94	write_uuid (UUID_SKIP, true);	93	write_uuid (UUID_GAP, true);
95	return;	94	return;
96	}	95	}
97		96
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	98	_exit (1);
…		…
109	_exit (1);	108	_exit (1);
110	}	109	}
111		110
112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113		112
114	write_uuid (UUID_SKIP, true);	113	write_uuid (UUID_GAP, true);
115	fclose (fp);	114	fclose (fp);
116	}	115	}
117		116
118	UUID	117	UUID
119	UUID::gen ()	118	UUID::gen ()
120	{	119	{
121	UUID uid;	120	UUID uid;
122		121
123	uid.seq = ++cur.seq;	122	uid.seq = ++cur.seq;
124		123
125	if (expect_false (!(cur.seq & (UUID_SKIP - 1))))	124	if (expect_false (cur.seq >= seq_next_save))
		125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
126	write_uuid (UUID_SKIP, false);	127	write_uuid (UUID_GAP, false);
		128	}
		129
127		130
128	return uid;	131	return uid;
129	}	132	}
130		133
131	void	134	void
…		…
133	{	136	{
134	read_uuid ();	137	read_uuid ();
135	}	138	}
136		139
137	/* 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. */
138	static int	141	static bool
139	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
140	{	143	{
141	key_value *wants_field;
142
143	/* 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
144	* 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
145	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
146	*/	147	*/
147		148
148	/* For each field in wants, */	149	/* For each field in wants, */
149	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)
150	{	151	if (has->kv_get (kv->key) != kv->value)
151	key_value *has_field;	152	return false;
152
153	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);
155
156	if (has_field == NULL)
157	{
158	/* No field with that name. */
159	return FALSE;
160	}
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168
169	/* If we get here, we found a match. Now for the next field in wants. */
170	}
171		153
172	/* 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. */
173	return TRUE;	155	return true;
174	}	156	}
175		157
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	159	static bool
178	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
179	{	161	{
180	/* 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,
181	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
182	*/	164	*/
183	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);
184	}	167	}
185		168
186	/* 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
187	* they can be merged together.	170	* they can be merged together.
188	*	171	*
…		…
203	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
204	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
205	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
206	return 0;	189	return 0;
207		190
208	//TODO: this ain't working well, use nicer and correct overflow check
209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	191	/* Do not merge objects if nrof would overflow, assume nrof
210	* value could not be stored in a sint32 (which unfortunately sometimes is	192	* is always 0 .. 2**31-1 */
211	* used to store nrof).	193	if (ob1->nrof > 0x7fffffff - ob2->nrof)
212	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)
214	return 0;	194	return 0;
215		195
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* This is to the comparison of the flags below will be OK. We	197	* This is to the comparison of the flags below will be OK. We
218	* just can't ignore the been applied or identified flags, as they	198	* just can't ignore the been applied or identified flags, as they
219	* are not equal - just if it has been identified, the been_applied	199	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	200	* flags lose any meaning.
221	*/	201	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	202	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		204
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		207
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	208	if (ob1->arch->archname != ob2->arch->archname
229	|| ob1->arch != ob2->arch
230	|| ob1->name != ob2->name	209	|| ob1->name != ob2->name
231	|| ob1->title != ob2->title	210	|| ob1->title != ob2->title
232	|| ob1->msg != ob2->msg	211	|| ob1->msg != ob2->msg
233	|| ob1->weight != ob2->weight	212	|| ob1->weight != ob2->weight
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	|| ob1->attacktype != ob2->attacktype	213	|| ob1->attacktype != ob2->attacktype
237	|| ob1->magic != ob2->magic	214	|| ob1->magic != ob2->magic
238	|| ob1->slaying != ob2->slaying	215	|| ob1->slaying != ob2->slaying
239	|| ob1->skill != ob2->skill	216	|| ob1->skill != ob2->skill
240	|| ob1->value != ob2->value	217	|| ob1->value != ob2->value
241	|| ob1->animation_id != ob2->animation_id	218	|| ob1->animation_id != ob2->animation_id
		219	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
242	|| ob1->client_type != ob2->client_type	220	|| ob1->client_type != ob2->client_type
243	|| ob1->materialname != ob2->materialname	221	|| ob1->materialname != ob2->materialname
244	|| ob1->lore != ob2->lore	222	|| ob1->lore != ob2->lore
245	|| ob1->subtype != ob2->subtype	223	|| ob1->subtype != ob2->subtype
246	|| ob1->move_type != ob2->move_type	224	|| ob1->move_type != ob2->move_type
247	|| ob1->move_block != ob2->move_block	225	|| ob1->move_block != ob2->move_block
248	|| ob1->move_allow != ob2->move_allow	226	|| ob1->move_allow != ob2->move_allow
249	|| ob1->move_on != ob2->move_on	227	|| ob1->move_on != ob2->move_on
250	|| ob1->move_off != ob2->move_off	228	|| ob1->move_off != ob2->move_off
251	|| ob1->move_slow != ob2->move_slow	229	|| ob1->move_slow != ob2->move_slow
252	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	230	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	233	return 0;
254		234
		235	if ((ob1->flag ^ ob2->flag)
		236	.reset (FLAG_INV_LOCKED)
		237	.reset (FLAG_REMOVED)
		238	.any ())
		239	return 0;
		240
255	/* This is really a spellbook check - really, we should	241	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	242	* not merge objects with real inventories, as splitting them
		243	* is hard.
257	*/	244	*/
258	if (ob1->inv || ob2->inv)	245	if (ob1->inv || ob2->inv)
259	{	246	{
260	if (!(ob1->inv && ob2->inv))	247	if (!(ob1->inv && ob2->inv))
261	return 0; /* inventories differ in length */	248	return 0; /* inventories differ in length */
262		249
263	if (ob1->inv->below || ob2->inv->below)	250	if (ob1->inv->below || ob2->inv->below)
264	return 0; /* more than one object in inv */	251	return 0; /* more than one object in inv */
265		252
266	if (!object::can_merge (ob1->inv, ob2->inv))	253	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0; /* inventory objexts differ */	254	return 0; /* inventory objects differ */
268		255
269	/* inventory ok - still need to check rest of this object to see	256	/* inventory ok - still need to check rest of this object to see
270	* if it is valid.	257	* if it is valid.
271	*/	258	*/
272	}	259	}
…		…
291	if (ob1->level != ob2->level)	278	if (ob1->level != ob2->level)
292	return 0;	279	return 0;
293	break;	280	break;
294	}	281	}
295		282
296	if (ob1->key_values != NULL || ob2->key_values != NULL)	283	if (ob1->key_values || ob2->key_values)
297	{	284	{
298	/* At least one of these has key_values. */	285	/* At least one of these has key_values. */
299	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	286	if ((!ob1->key_values) != (!ob2->key_values))
300	/* One has fields, but the other one doesn't. */	287	return 0; /* One has fields, but the other one doesn't. */
301	return 0;	288
302	else if (!compare_ob_value_lists (ob1, ob2))	289	if (!compare_ob_value_lists (ob1, ob2))
303	return 0;	290	return 0;
304	}	291	}
305		292
306	if (ob1->self || ob2->self)	293	if (ob1->self || ob2->self)
307	{	294	{
…		…
313	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	300	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
314	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	301	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
315		302
316	if (k1 != k2)	303	if (k1 != k2)
317	return 0;	304	return 0;
		305
318	else if (k1 == 0)	306	if (k1 == 0)
319	return 1;	307	return 1;
		308
320	else if (!cfperl_can_merge (ob1, ob2))	309	if (!cfperl_can_merge (ob1, ob2))
321	return 0;	310	return 0;
322	}	311	}
323	}	312	}
324		313
325	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
326	return 1;	315	return 1;
327	}	316	}
328		317
		318	// find player who can see this object
		319	object *
		320	object::visible_to () const
		321	{
		322	if (client_visible () && !flag [FLAG_REMOVED])
		323	{
		324	// see if we are in a container of sorts
		325	if (env)
		326	{
		327	// the player inventory itself is always visible
		328	if (env->type == PLAYER)
		329	return env;
		330
		331	// else a player could have our env open
		332	object *envest = env->outer_env ();
		333
		334	// the player itself is always on a map, so we will find him here
		335	// even if our inv is in a player.
		336	if (envest->is_on_map ())
		337	if (object *pl = envest->ms ().player ())
		338	if (pl->container == env)
		339	return pl;
		340	}
		341	else
		342	{
		343	// maybe there is a player standing on the same mapspace
		344	// this will catch the case where "this" is a player
		345	if (object *pl = ms ().player ())
		346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		347	|| this == pl->container)
		348	return pl;
		349	}
		350	}
		351
		352	return 0;
		353	}
		354
		355	// adjust weight per container type ("of holding")
		356	static sint32
		357	weight_adjust_for (object *op, sint32 weight)
		358	{
		359	return op->type == CONTAINER
		360	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		361	: weight;
		362	}
		363
329	/*	364	/*
		365	* adjust_weight(object, weight) adds the specified weight to an object,
		366	* and also updates how much the environment(s) is/are carrying.
		367	*/
		368	static void
		369	adjust_weight (object *op, sint32 weight)
		370	{
		371	while (op)
		372	{
		373	// adjust by actual difference to account for rounding errors
		374	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		375	weight = weight_adjust_for (op, op->carrying)
		376	- weight_adjust_for (op, op->carrying - weight);
		377
		378	if (!weight)
		379	return;
		380
		381	op->carrying += weight;
		382
		383	if (object *pl = op->visible_to ())
		384	if (pl != op) // player is handled lazily
		385	esrv_update_item (UPD_WEIGHT, pl, op);
		386
		387	op = op->env;
		388	}
		389	}
		390
		391	/*
330	* sum_weight() is a recursive function which calculates the weight	392	* this is a recursive function which calculates the weight
331	* an object is carrying. It goes through in figures out how much	393	* an object is carrying. It goes through op and figures out how much
332	* containers are carrying, and sums it up.	394	* containers are carrying, and sums it up.
333	*/	395	*/
334	long	396	void
335	sum_weight (object *op)	397	object::update_weight ()
336	{	398	{
337	long sum;	399	sint32 sum = 0;
338	object *inv;
339		400
340	for (sum = 0, inv = op->inv; inv; inv = inv->below)	401	for (object *op = inv; op; op = op->below)
341	{	402	{
342	if (inv->inv)	403	if (op->inv)
343	sum_weight (inv);	404	op->update_weight ();
344		405
345	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	406	sum += op->total_weight ();
		407	}
		408
		409	sum = weight_adjust_for (this, sum);
		410
		411	if (sum != carrying)
346	}	412	{
347
348	if (op->type == CONTAINER && op->stats.Str)
349	sum = (sum * (100 - op->stats.Str)) / 100;
350
351	if (op->carrying != sum)
352	op->carrying = sum;	413	carrying = sum;
353		414
354	return sum;	415	if (object *pl = visible_to ())
		416	if (pl != this) // player is handled lazily
		417	esrv_update_item (UPD_WEIGHT, pl, this);
		418	}
355	}	419	}
356		420
357	/**	421	/*
358	* Return the outermost environment object for a given object.	422	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
359	*/
360
361	object *
362	object_get_env_recursive (object *op)
363	{
364	while (op->env != NULL)
365	op = op->env;
366	return op;
367	}
368
369	/*
370	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
371	* Some error messages.
372	* The result of the dump is stored in the static global errmsg array.
373	*/	423	*/
374	char *	424	char *
375	dump_object (object *op)	425	dump_object (object *op)
376	{	426	{
377	if (!op)	427	if (!op)
…		…
391	get_nearest_part (object *op, const object *pl)	441	get_nearest_part (object *op, const object *pl)
392	{	442	{
393	object *tmp, *closest;	443	object *tmp, *closest;
394	int last_dist, i;	444	int last_dist, i;
395		445
396	if (op->more == NULL)	446	if (!op->more)
397	return op;	447	return op;
		448
398	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	449	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		450	tmp;
		451	tmp = tmp->more)
399	if ((i = distance (tmp, pl)) < last_dist)	452	if ((i = distance (tmp, pl)) < last_dist)
400	closest = tmp, last_dist = i;	453	closest = tmp, last_dist = i;
		454
401	return closest;	455	return closest;
402	}	456	}
403		457
404	/*	458	/*
405	* Returns the object which has the count-variable equal to the argument.	459	* Returns the object which has the count-variable equal to the argument.
		460	* VERRRY slow.
406	*/	461	*/
407	object *	462	object *
408	find_object (tag_t i)	463	find_object (tag_t i)
409	{	464	{
410	for_all_objects (op)	465	for_all_objects (op)
…		…
421	*/	476	*/
422	object *	477	object *
423	find_object_name (const char *str)	478	find_object_name (const char *str)
424	{	479	{
425	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
426	object *op;
427		481
		482	if (str_)
428	for_all_objects (op)	483	for_all_objects (op)
429	if (op->name == str_)	484	if (op->name == str_)
430	break;	485	return op;
431		486
432	return op;	487	return 0;
433	}	488	}
434		489
435	/*	490	/*
436	* Sets the owner and sets the skill and exp pointers to owner's current	491	* Sets the owner and sets the skill and exp pointers to owner's current
437	* skill and experience objects.	492	* skill and experience objects.
…		…
535	}	590	}
536		591
537	op->key_values = 0;	592	op->key_values = 0;
538	}	593	}
539		594
540	object &	595	/*
541	object::operator =(const object &src)	596	* copy_to first frees everything allocated by the dst object,
		597	* and then copies the contents of itself into the second
		598	* object, allocating what needs to be allocated. Basically, any
		599	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		600	* if the first object is freed, the pointers in the new object
		601	* will point at garbage.
		602	*/
		603	void
		604	object::copy_to (object *dst)
542	{	605	{
543	bool is_freed = flag [FLAG_FREED];	606	dst->remove ();
544	bool is_removed = flag [FLAG_REMOVED];
545
546	*(object_copy *)this = src;	607	*(object_copy *)dst = *this;
547
548	flag [FLAG_FREED] = is_freed;
549	flag [FLAG_REMOVED] = is_removed;	608	dst->flag [FLAG_REMOVED] = true;
550		609
551	/* Copy over key_values, if any. */	610	/* Copy over key_values, if any. */
552	if (src.key_values)	611	if (key_values)
553	{	612	{
554	key_value *tail = 0;	613	key_value *tail = 0;
555	key_values = 0;	614	dst->key_values = 0;
556		615
557	for (key_value *i = src.key_values; i; i = i->next)	616	for (key_value *i = key_values; i; i = i->next)
558	{	617	{
559	key_value *new_link = new key_value;	618	key_value *new_link = new key_value;
560		619
561	new_link->next = 0;	620	new_link->next = 0;
562	new_link->key = i->key;	621	new_link->key = i->key;
563	new_link->value = i->value;	622	new_link->value = i->value;
564		623
565	/* Try and be clever here, too. */	624	/* Try and be clever here, too. */
566	if (!key_values)	625	if (!dst->key_values)
567	{	626	{
568	key_values = new_link;	627	dst->key_values = new_link;
569	tail = new_link;	628	tail = new_link;
570	}	629	}
571	else	630	else
572	{	631	{
573	tail->next = new_link;	632	tail->next = new_link;
574	tail = new_link;	633	tail = new_link;
575	}	634	}
576	}	635	}
577	}	636	}
578	}
579
580	/*
581	* copy_to first frees everything allocated by the dst object,
582	* and then copies the contents of itself into the second
583	* object, allocating what needs to be allocated. Basically, any
584	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
585	* if the first object is freed, the pointers in the new object
586	* will point at garbage.
587	*/
588	void
589	object::copy_to (object *dst)
590	{
591	*dst = *this;
592		637
593	if (speed < 0)	638	if (speed < 0)
594	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
595		640
596	dst->set_speed (dst->speed);	641	dst->activate ();
597	}	642	}
598		643
599	void	644	void
600	object::instantiate ()	645	object::instantiate ()
601	{	646	{
…		…
618	object *	663	object *
619	object::clone ()	664	object::clone ()
620	{	665	{
621	object *neu = create ();	666	object *neu = create ();
622	copy_to (neu);	667	copy_to (neu);
		668	neu->map = map; // not copied by copy_to
623	return neu;	669	return neu;
624	}	670	}
625		671
626	/*	672	/*
627	* If an object with the IS_TURNABLE() flag needs to be turned due	673	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
678	* UP_OBJ_FACE: only the objects face has changed.	724	* UP_OBJ_FACE: only the objects face has changed.
679	*/	725	*/
680	void	726	void
681	update_object (object *op, int action)	727	update_object (object *op, int action)
682	{	728	{
683	if (op == NULL)	729	if (!op)
684	{	730	{
685	/* this should never happen */	731	/* this should never happen */
686	LOG (llevDebug, "update_object() called for NULL object.\n");	732	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
687	return;	733	return;
688	}	734	}
689		735
690	if (op->env)	736	if (!op->is_on_map ())
691	{	737	{
692	/* Animation is currently handled by client, so nothing	738	/* Animation is currently handled by client, so nothing
693	* to do in this case.	739	* to do in this case.
694	*/	740	*/
695	return;	741	return;
696	}	742	}
697
698	/* If the map is saving, don't do anything as everything is
699	* going to get freed anyways.
700	*/
701	if (!op->map || op->map->in_memory == MAP_SAVING)
702	return;
703		743
704	/* make sure the object is within map boundaries */	744	/* make sure the object is within map boundaries */
705	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	745	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
706	{	746	{
707	LOG (llevError, "update_object() called for object out of map!\n");	747	LOG (llevError, "update_object() called for object out of map!\n");
…		…
726	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
727	|| (m.move_on | op->move_on ) != m.move_on	767	|| (m.move_on | op->move_on ) != m.move_on
728	|| (m.move_off | op->move_off ) != m.move_off	768	|| (m.move_off | op->move_off ) != m.move_off
729	|| (m.move_slow | op->move_slow) != m.move_slow	769	|| (m.move_slow | op->move_slow) != m.move_slow
730	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
731	* to have move_allow right now.	771	* have move_allow right now.
732	*/	772	*/
733	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	773	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
734	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	774	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
735	m.flags_ = 0;	775	m.flags_ = 0;
736	}	776	}
…		…
790	{	830	{
791	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
792	if (active)	832	if (active)
793	return;	833	return;
794		834
		835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
		837
795	if (has_active_speed ())	838	if (has_active_speed ())
796	actives.insert (this);	839	actives.insert (this);
797	}	840	}
798		841
799	void	842	void
…		…
850	object::destroy_inv (bool drop_to_ground)	893	object::destroy_inv (bool drop_to_ground)
851	{	894	{
852	// need to check first, because the checks below might segfault	895	// need to check first, because the checks below might segfault
853	// as we might be on an invalid mapspace and crossfire code	896	// as we might be on an invalid mapspace and crossfire code
854	// is too buggy to ensure that the inventory is empty.	897	// is too buggy to ensure that the inventory is empty.
855	// corollary: if you create arrows etc. with stuff in tis inventory,	898	// corollary: if you create arrows etc. with stuff in its inventory,
856	// cf will crash below with off-map x and y	899	// cf will crash below with off-map x and y
857	if (!inv)	900	if (!inv)
858	return;	901	return;
859		902
860	/* Only if the space blocks everything do we not process -	903	/* Only if the space blocks everything do we not process -
861	* if some form of movement is allowed, let objects	904	* if some form of movement is allowed, let objects
862	* drop on that space.	905	* drop on that space.
863	*/	906	*/
864	if (!drop_to_ground	907	if (!drop_to_ground
865	|| !map	908	|| !map
866	|| map->in_memory != MAP_IN_MEMORY	909	|| map->in_memory != MAP_ACTIVE
867	|| map->nodrop	910	|| map->no_drop
868	|| ms ().move_block == MOVE_ALL)	911	|| ms ().move_block == MOVE_ALL)
869	{	912	{
870	while (inv)	913	while (inv)
871	{
872	inv->destroy_inv (drop_to_ground);
873	inv->destroy ();	914	inv->destroy ();
874	}
875	}	915	}
876	else	916	else
877	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
878	while (inv)	918	while (inv)
879	{	919	{
…		…
897	object *op = new object;	937	object *op = new object;
898	op->link ();	938	op->link ();
899	return op;	939	return op;
900	}	940	}
901		941
		942	static struct freed_map : maptile
		943	{
		944	freed_map ()
		945	{
		946	path = "<freed objects map>";
		947	name = "/internal/freed_objects_map";
		948	width = 3;
		949	height = 3;
		950	no_drop = 1;
		951	no_reset = 1;
		952
		953	alloc ();
		954	in_memory = MAP_ACTIVE;
		955	}
		956
		957	~freed_map ()
		958	{
		959	destroy ();
		960	}
		961	} freed_map; // freed objects are moved here to avoid crashes
		962
902	void	963	void
903	object::do_destroy ()	964	object::do_destroy ()
904	{	965	{
905	attachable::do_destroy ();
906
907	if (flag [FLAG_IS_LINKED])	966	if (flag [FLAG_IS_LINKED])
908	remove_button_link (this);	967	remove_button_link (this);
909		968
910	if (flag [FLAG_FRIENDLY])	969	if (flag [FLAG_FRIENDLY])
911	remove_friendly_object (this);	970	remove_friendly_object (this);
912		971
913	if (!flag [FLAG_REMOVED])
914	remove ();	972	remove ();
915		973
916	destroy_inv (true);	974	attachable::do_destroy ();
917		975
918	deactivate ();	976	deactivate ();
919	unlink ();	977	unlink ();
920		978
921	flag [FLAG_FREED] = 1;	979	flag [FLAG_FREED] = 1;
922		980
923	// hack to ensure that freed objects still have a valid map	981	// hack to ensure that freed objects still have a valid map
924	{
925	static maptile *freed_map; // freed objects are moved here to avoid crashes
926
927	if (!freed_map)
928	{
929	freed_map = new maptile;
930
931	freed_map->path = "<freed objects map>";
932	freed_map->name = "/internal/freed_objects_map";
933	freed_map->width = 3;
934	freed_map->height = 3;
935	freed_map->nodrop = 1;
936
937	freed_map->alloc ();
938	freed_map->in_memory = MAP_IN_MEMORY;
939	}
940
941	map = freed_map;	982	map = &freed_map;
942	x = 1;	983	x = 1;
943	y = 1;	984	y = 1;
944	}
945		985
946	if (more)	986	if (more)
947	{	987	{
948	more->destroy ();	988	more->destroy ();
949	more = 0;	989	more = 0;
…		…
957	attacked_by = 0;	997	attacked_by = 0;
958	current_weapon = 0;	998	current_weapon = 0;
959	}	999	}
960		1000
961	void	1001	void
962	object::destroy (bool destroy_inventory)	1002	object::destroy ()
963	{	1003	{
964	if (destroyed ())	1004	if (destroyed ())
965	return;	1005	return;
966		1006
967	if (destroy_inventory)	1007	if (!is_head () && !head->destroyed ())
		1008	{
		1009	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1010	head->destroy ();
		1011	return;
		1012	}
		1013
968	destroy_inv (false);	1014	destroy_inv (false);
969		1015
970	if (is_head ())	1016	if (is_head ())
971	if (sound_destroy)	1017	if (sound_destroy)
972	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
973	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
974	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1020	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
975		1021
976	attachable::destroy ();	1022	attachable::destroy ();
977	}
978
979	/*
980	* sub_weight() recursively (outwards) subtracts a number from the
981	* weight of an object (and what is carried by it's environment(s)).
982	*/
983	void
984	sub_weight (object *op, signed long weight)
985	{
986	while (op != NULL)
987	{
988	if (op->type == CONTAINER)
989	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
990
991	op->carrying -= weight;
992	op = op->env;
993	}
994	}	1023	}
995		1024
996	/* op->remove ():	1025	/* op->remove ():
997	* This function removes the object op from the linked list of objects	1026	* This function removes the object op from the linked list of objects
998	* which it is currently tied to. When this function is done, the	1027	* which it is currently tied to. When this function is done, the
…		…
1004	object::do_remove ()	1033	object::do_remove ()
1005	{	1034	{
1006	object *tmp, *last = 0;	1035	object *tmp, *last = 0;
1007	object *otmp;	1036	object *otmp;
1008		1037
1009	if (QUERY_FLAG (this, FLAG_REMOVED))	1038	if (flag [FLAG_REMOVED])
1010	return;	1039	return;
1011		1040
1012	SET_FLAG (this, FLAG_REMOVED);
1013	INVOKE_OBJECT (REMOVE, this);	1041	INVOKE_OBJECT (REMOVE, this);
		1042
		1043	flag [FLAG_REMOVED] = true;
1014		1044
1015	if (more)	1045	if (more)
1016	more->remove ();	1046	more->remove ();
1017		1047
1018	/*	1048	/*
1019	* In this case, the object to be removed is in someones	1049	* In this case, the object to be removed is in someones
1020	* inventory.	1050	* inventory.
1021	*/	1051	*/
1022	if (env)	1052	if (env)
1023	{	1053	{
1024	if (nrof)	1054	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1025	sub_weight (env, weight * nrof);	1055	if (object *pl = visible_to ())
1026	else	1056	esrv_del_item (pl->contr, count);
1027	sub_weight (env, weight + carrying);	1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1058
		1059	adjust_weight (env, -total_weight ());
		1060
		1061	/* we set up values so that it could be inserted into
		1062	* the map, but we don't actually do that - it is up
		1063	* to the caller to decide what we want to do.
		1064	*/
		1065	map = env->map;
		1066	x = env->x;
		1067	y = env->y;
		1068
		1069	// make sure cmov optimisation is applicable
		1070	*(above ? &above->below : &env->inv) = below;
		1071	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1072
		1073	above = 0;
		1074	below = 0;
		1075	env = 0;
1028		1076
1029	/* NO_FIX_PLAYER is set when a great many changes are being	1077	/* NO_FIX_PLAYER is set when a great many changes are being
1030	* made to players inventory. If set, avoiding the call	1078	* made to players inventory. If set, avoiding the call
1031	* to save cpu time.	1079	* to save cpu time.
1032	*/	1080	*/
1033	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1081	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1034	otmp->update_stats ();	1082	otmp->update_stats ();
1035
1036	if (above)
1037	above->below = below;
1038	else
1039	env->inv = below;
1040
1041	if (below)
1042	below->above = above;
1043
1044	/* we set up values so that it could be inserted into
1045	* the map, but we don't actually do that - it is up
1046	* to the caller to decide what we want to do.
1047	*/
1048	x = env->x, y = env->y;
1049	map = env->map;
1050	above = 0, below = 0;
1051	env = 0;
1052	}	1083	}
1053	else if (map)	1084	else if (map)
1054	{	1085	{
1055	if (type == PLAYER)
1056	{
1057	// leaving a spot always closes any open container on the ground
1058	if (container && !container->env)
1059	// this causes spurious floorbox updates, but it ensures
1060	// that the CLOSE event is being sent.
1061	close_container ();
1062
1063	--map->players;
1064	map->touch ();
1065	}
1066
1067	map->dirty = true;	1086	map->dirty = true;
1068	mapspace &ms = this->ms ();	1087	mapspace &ms = this->ms ();
1069		1088
		1089	if (object *pl = ms.player ())
		1090	{
		1091	if (type == PLAYER) // this == pl(!)
		1092	{
		1093	// leaving a spot always closes any open container on the ground
		1094	if (container && !container->env)
		1095	// this causes spurious floorbox updates, but it ensures
		1096	// that the CLOSE event is being sent.
		1097	close_container ();
		1098
		1099	--map->players;
		1100	map->touch ();
		1101	}
		1102	else if (pl->container == this)
		1103	{
		1104	// removing a container should close it
		1105	close_container ();
		1106	}
		1107
		1108	esrv_del_item (pl->contr, count);
		1109	}
		1110
1070	/* link the object above us */	1111	/* link the object above us */
1071	if (above)	1112	// re-link, make sure compiler can easily use cmove
1072	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1073	else	1114	*(below ? &below->above : &ms.bot) = above;
1074	ms.top = below; /* we were top, set new top */
1075
1076	/* Relink the object below us, if there is one */
1077	if (below)
1078	below->above = above;
1079	else
1080	{
1081	/* Nothing below, which means we need to relink map object for this space
1082	* use translated coordinates in case some oddness with map tiling is
1083	* evident
1084	*/
1085	if (GET_MAP_OB (map, x, y) != this)
1086	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1087
1088	ms.bot = above; /* goes on above it. */
1089	}
1090		1115
1091	above = 0;	1116	above = 0;
1092	below = 0;	1117	below = 0;
		1118
		1119	ms.flags_ = 0;
1093		1120
1094	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
1095	return;	1122	return;
1096		1123
1097	int check_walk_off = !flag [FLAG_NO_APPLY];	1124	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1103	* removed (most likely destroyed), update the player view	1130	* removed (most likely destroyed), update the player view
1104	* appropriately.	1131	* appropriately.
1105	*/	1132	*/
1106	pl->close_container ();	1133	pl->close_container ();
1107		1134
		1135	//TODO: the floorbox prev/next might need updating
		1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
1108	pl->contr->ns->floorbox_update ();	1139	pl->contr->ns->floorbox_update ();
1109	}	1140	}
1110		1141
1111	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1112	{	1143	{
1113	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
…		…
1126	}	1157	}
1127		1158
1128	last = tmp;	1159	last = tmp;
1129	}	1160	}
1130		1161
1131	/* last == NULL if there are no objects on this space */	1162	if (map->darkness && (glow_radius || flag [FLAG_BLOCKSVIEW]))
1132	//TODO: this makes little sense, why only update the topmost object?
1133	if (!last)
1134	map->at (x, y).flags_ = 0;
1135	else
1136	update_object (last, UP_OBJ_REMOVE);
1137
1138	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1139	update_all_los (map, x, y);	1163	update_all_los (map, x, y);
1140	}	1164	}
1141	}	1165	}
1142		1166
1143	/*	1167	/*
…		…
1157	if (!top)	1181	if (!top)
1158	for (top = op; top && top->above; top = top->above)	1182	for (top = op; top && top->above; top = top->above)
1159	;	1183	;
1160		1184
1161	for (; top; top = top->below)	1185	for (; top; top = top->below)
1162	{
1163	if (top == op)
1164	continue;
1165
1166	if (object::can_merge (op, top))	1186	if (object::can_merge (op, top))
1167	{	1187	{
1168	top->nrof += op->nrof;	1188	top->nrof += op->nrof;
1169		1189
1170	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1190	if (object *pl = top->visible_to ())
1171	op->weight = 0; /* Don't want any adjustements now */	1191	esrv_update_item (UPD_NROF, pl, top);
		1192
		1193	op->weight = 0; // cancel the addition above
		1194	op->carrying = 0; // must be 0 already
		1195
1172	op->destroy ();	1196	op->destroy ();
		1197
1173	return top;	1198	return top;
1174	}	1199	}
1175	}
1176		1200
1177	return 0;	1201	return 0;
1178	}	1202	}
1179		1203
1180	void	1204	void
…		…
1205	* job preparing multi-part monsters.	1229	* job preparing multi-part monsters.
1206	*/	1230	*/
1207	object *	1231	object *
1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1232	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1209	{	1233	{
		1234	op->remove ();
		1235
1210	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1236	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1211	{	1237	{
1212	tmp->x = x + tmp->arch->x;	1238	tmp->x = x + tmp->arch->x;
1213	tmp->y = y + tmp->arch->y;	1239	tmp->y = y + tmp->arch->y;
1214	}	1240	}
…		…
1237	* just 'op' otherwise	1263	* just 'op' otherwise
1238	*/	1264	*/
1239	object *	1265	object *
1240	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1266	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1241	{	1267	{
1242	assert (!op->flag [FLAG_FREED]);
1243
1244	object *top, *floor = NULL;
1245
1246	op->remove ();	1268	op->remove ();
		1269
		1270	if (m == &freed_map)//D TODO: remove soon
		1271	{//D
		1272	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1273	}//D
1247		1274
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1275	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* of areas of callers (eg, anything that uses find_free_spot would now	1276	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1277	* need extra work
1251	*/	1278	*/
1252	if (!xy_normalise (m, op->x, op->y))	1279	if (!xy_normalise (m, op->x, op->y))
1253	{	1280	{
1254	op->destroy ();	1281	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1255	return 0;	1282	return 0;
1256	}	1283	}
1257		1284
1258	if (object *more = op->more)	1285	if (object *more = op->more)
1259	if (!insert_ob_in_map (more, m, originator, flag))	1286	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1268	*/	1295	*/
1269	if (op->nrof && !(flag & INS_NO_MERGE))	1296	if (op->nrof && !(flag & INS_NO_MERGE))
1270	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1297	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1271	if (object::can_merge (op, tmp))	1298	if (object::can_merge (op, tmp))
1272	{	1299	{
		1300	// TODO: we actually want to update tmp, not op,
		1301	// but some caller surely breaks when we return tmp
		1302	// from here :/
1273	op->nrof += tmp->nrof;	1303	op->nrof += tmp->nrof;
1274	tmp->destroy ();	1304	tmp->destroy ();
1275	}	1305	}
1276		1306
1277	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1286	{	1316	{
1287	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1288	abort ();	1318	abort ();
1289	}	1319	}
1290		1320
		1321	if (!originator->is_on_map ())
		1322	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1323	op->debug_desc (), originator->debug_desc ());
		1324
1291	op->above = originator;	1325	op->above = originator;
1292	op->below = originator->below;	1326	op->below = originator->below;
1293
1294	if (op->below)
1295	op->below->above = op;
1296	else
1297	ms.bot = op;
1298
1299	/* since *below* originator, no need to update top */
1300	originator->below = op;	1327	originator->below = op;
		1328
		1329	*(op->below ? &op->below->above : &ms.bot) = op;
1301	}	1330	}
1302	else	1331	else
1303	{	1332	{
1304	top = ms.bot;	1333	object *floor = 0;
		1334	object *top = ms.top;
1305		1335
1306	/* If there are other objects, then */	1336	/* If there are other objects, then */
1307	if (top)	1337	if (top)
1308	{	1338	{
1309	object *last = 0;
1310
1311	/*	1339	/*
1312	* If there are multiple objects on this space, we do some trickier handling.	1340	* If there are multiple objects on this space, we do some trickier handling.
1313	* We've already dealt with merging if appropriate.	1341	* We've already dealt with merging if appropriate.
1314	* Generally, we want to put the new object on top. But if	1342	* Generally, we want to put the new object on top. But if
1315	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1343	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1318	* once we get to them. This reduces the need to traverse over all of	1346	* once we get to them. This reduces the need to traverse over all of
1319	* them when adding another one - this saves quite a bit of cpu time	1347	* them when adding another one - this saves quite a bit of cpu time
1320	* when lots of spells are cast in one area. Currently, it is presumed	1348	* when lots of spells are cast in one area. Currently, it is presumed
1321	* that flying non pickable objects are spell objects.	1349	* that flying non pickable objects are spell objects.
1322	*/	1350	*/
1323	for (top = ms.bot; top; top = top->above)	1351	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1324	{	1352	{
1325	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1353	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1326	floor = top;	1354	floor = tmp;
1327		1355
1328	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1356	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1329	{	1357	{
1330	/* We insert above top, so we want this object below this */	1358	/* We insert above top, so we want this object below this */
1331	top = top->below;	1359	top = tmp->below;
1332	break;	1360	break;
1333	}	1361	}
1334		1362
1335	last = top;	1363	top = tmp;
1336	}	1364	}
1337
1338	/* Don't want top to be NULL, so set it to the last valid object */
1339	top = last;
1340		1365
1341	/* We let update_position deal with figuring out what the space	1366	/* We let update_position deal with figuring out what the space
1342	* looks like instead of lots of conditions here.	1367	* looks like instead of lots of conditions here.
1343	* makes things faster, and effectively the same result.	1368	* makes things faster, and effectively the same result.
1344	*/	1369	*/
…		…
1351	*/	1376	*/
1352	if (!(flag & INS_ON_TOP)	1377	if (!(flag & INS_ON_TOP)
1353	&& ms.flags () & P_BLOCKSVIEW	1378	&& ms.flags () & P_BLOCKSVIEW
1354	&& (op->face && !faces [op->face].visibility))	1379	&& (op->face && !faces [op->face].visibility))
1355	{	1380	{
		1381	object *last;
		1382
1356	for (last = top; last != floor; last = last->below)	1383	for (last = top; last != floor; last = last->below)
1357	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1384	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1358	break;	1385	break;
1359		1386
1360	/* Check to see if we found the object that blocks view,	1387	/* Check to see if we found the object that blocks view,
…		…
1368	} /* If objects on this space */	1395	} /* If objects on this space */
1369		1396
1370	if (flag & INS_ABOVE_FLOOR_ONLY)	1397	if (flag & INS_ABOVE_FLOOR_ONLY)
1371	top = floor;	1398	top = floor;
1372		1399
1373	/* Top is the object that our object (op) is going to get inserted above.	1400	// insert object above top, or bottom-most if top = 0
1374	*/
1375
1376	/* First object on this space */
1377	if (!top)	1401	if (!top)
1378	{	1402	{
		1403	op->below = 0;
1379	op->above = ms.bot;	1404	op->above = ms.bot;
1380
1381	if (op->above)
1382	op->above->below = op;
1383
1384	op->below = 0;
1385	ms.bot = op;	1405	ms.bot = op;
		1406
		1407	*(op->above ? &op->above->below : &ms.top) = op;
1386	}	1408	}
1387	else	1409	else
1388	{ /* get inserted into the stack above top */	1410	{
1389	op->above = top->above;	1411	op->above = top->above;
1390
1391	if (op->above)
1392	op->above->below = op;	1412	top->above = op;
1393		1413
1394	op->below = top;	1414	op->below = top;
1395	top->above = op;	1415	*(op->above ? &op->above->below : &ms.top) = op;
1396	}	1416	}
1397		1417	}
1398	if (!op->above)
1399	ms.top = op;
1400	} /* else not INS_BELOW_ORIGINATOR */
1401		1418
1402	if (op->type == PLAYER)	1419	if (op->type == PLAYER)
1403	{	1420	{
1404	op->contr->do_los = 1;	1421	op->contr->do_los = 1;
1405	++op->map->players;	1422	++op->map->players;
…		…
1407	}	1424	}
1408		1425
1409	op->map->dirty = true;	1426	op->map->dirty = true;
1410		1427
1411	if (object *pl = ms.player ())	1428	if (object *pl = ms.player ())
		1429	//TODO: the floorbox prev/next might need updating
		1430	//esrv_send_item (pl, op);
		1431	//TODO: update floorbox to preserve ordering
		1432	if (pl->contr->ns)
1412	pl->contr->ns->floorbox_update ();	1433	pl->contr->ns->floorbox_update ();
1413		1434
1414	/* If this object glows, it may affect lighting conditions that are	1435	/* If this object glows, it may affect lighting conditions that are
1415	* visible to others on this map. But update_all_los is really	1436	* visible to others on this map. But update_all_los is really
1416	* an inefficient way to do this, as it means los for all players	1437	* an inefficient way to do this, as it means los for all players
1417	* on the map will get recalculated. The players could very well	1438	* on the map will get recalculated. The players could very well
1418	* be far away from this change and not affected in any way -	1439	* be far away from this change and not affected in any way -
1419	* this should get redone to only look for players within range,	1440	* this should get redone to only look for players within range,
1420	* or just updating the P_UPTODATE for spaces within this area	1441	* or just updating the P_UPTODATE for spaces within this area
1421	* of effect may be sufficient.	1442	* of effect may be sufficient.
1422	*/	1443	*/
1423	if (op->map->darkness && (op->glow_radius != 0))	1444	if (op->map->darkness && (op->glow_radius || op->flag [FLAG_BLOCKSVIEW]))
1424	update_all_los (op->map, op->x, op->y);	1445	update_all_los (op->map, op->x, op->y);
1425		1446
1426	/* updates flags (blocked, alive, no magic, etc) for this map space */	1447	/* updates flags (blocked, alive, no magic, etc) for this map space */
1427	update_object (op, UP_OBJ_INSERT);	1448	update_object (op, UP_OBJ_INSERT);
1428		1449
…		…
1459	* op is the object to insert it under: supplies x and the map.	1480	* op is the object to insert it under: supplies x and the map.
1460	*/	1481	*/
1461	void	1482	void
1462	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1463	{	1484	{
1464	object *tmp, *tmp1;
1465
1466	/* first search for itself and remove any old instances */	1485	/* first search for itself and remove any old instances */
1467		1486
1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1488	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1470	tmp->destroy ();	1489	tmp->destroy ();
1471		1490
1472	tmp1 = arch_to_object (archetype::find (arch_string));	1491	object *tmp = arch_to_object (archetype::find (arch_string));
1473		1492
1474	tmp1->x = op->x;	1493	tmp->x = op->x;
1475	tmp1->y = op->y;	1494	tmp->y = op->y;
		1495
1476	insert_ob_in_map (tmp1, op->map, op, 0);	1496	insert_ob_in_map (tmp, op->map, op, 0);
1477	}	1497	}
1478		1498
1479	object *	1499	object *
1480	object::insert_at (object *where, object *originator, int flags)	1500	object::insert_at (object *where, object *originator, int flags)
1481	{	1501	{
		1502	if (where->env)
		1503	return where->env->insert (this);
		1504	else
1482	return where->map->insert (this, where->x, where->y, originator, flags);	1505	return where->map->insert (this, where->x, where->y, originator, flags);
1483	}	1506	}
1484		1507
1485	/*	1508	/*
1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1487	* is returned contains nr objects, and the remaining parts contains
1488	* the rest (or is removed and freed if that number is 0).
1489	* On failure, NULL is returned, and the reason put into the
1490	* global static errmsg array.
1491	*/
1492	object *
1493	get_split_ob (object *orig_ob, uint32 nr)
1494	{
1495	object *newob;
1496	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1497
1498	if (orig_ob->nrof < nr)
1499	{
1500	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1501	return NULL;
1502	}
1503
1504	newob = object_create_clone (orig_ob);
1505
1506	if ((orig_ob->nrof -= nr) < 1)
1507	orig_ob->destroy (1);
1508	else if (!is_removed)
1509	{
1510	if (orig_ob->env != NULL)
1511	sub_weight (orig_ob->env, orig_ob->weight * nr);
1512	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1513	{
1514	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1515	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1516	return NULL;
1517	}
1518	}
1519
1520	newob->nrof = nr;
1521
1522	return newob;
1523	}
1524
1525	/*
1526	* decrease_ob_nr(object, number) decreases a specified number from	1509	* decrease(object, number) decreases a specified number from
1527	* the amount of an object. If the amount reaches 0, the object	1510	* the amount of an object. If the amount reaches 0, the object
1528	* is subsequently removed and freed.	1511	* is subsequently removed and freed.
1529	*	1512	*
1530	* Return value: 'op' if something is left, NULL if the amount reached 0	1513	* Return value: 'op' if something is left, NULL if the amount reached 0
1531	*/	1514	*/
		1515	bool
		1516	object::decrease (sint32 nr)
		1517	{
		1518	if (!nr)
		1519	return true;
		1520
		1521	nr = min (nr, nrof);
		1522
		1523	if (nrof > nr)
		1524	{
		1525	nrof -= nr;
		1526	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1527
		1528	if (object *pl = visible_to ())
		1529	esrv_update_item (UPD_NROF, pl, this);
		1530
		1531	return true;
		1532	}
		1533	else
		1534	{
		1535	destroy ();
		1536	return false;
		1537	}
		1538	}
		1539
		1540	/*
		1541	* split(ob,nr) splits up ob into two parts. The part which
		1542	* is returned contains nr objects, and the remaining parts contains
		1543	* the rest (or is removed and returned if that number is 0).
		1544	* On failure, NULL is returned.
		1545	*/
1532	object *	1546	object *
1533	decrease_ob_nr (object *op, uint32 i)	1547	object::split (sint32 nr)
1534	{	1548	{
1535	object *tmp;	1549	int have = number_of ();
1536		1550
1537	if (i == 0) /* objects with op->nrof require this check */	1551	if (have < nr)
1538	return op;	1552	return 0;
1539		1553	else if (have == nr)
1540	if (i > op->nrof)
1541	i = op->nrof;
1542
1543	if (QUERY_FLAG (op, FLAG_REMOVED))
1544	op->nrof -= i;
1545	else if (op->env)
1546	{	1554	{
1547	/* is this object in the players inventory, or sub container
1548	* therein?
1549	*/
1550	tmp = op->in_player ();
1551	/* nope. Is this a container the player has opened?
1552	* If so, set tmp to that player.
1553	* IMO, searching through all the players will mostly
1554	* likely be quicker than following op->env to the map,
1555	* and then searching the map for a player.
1556	*/
1557	if (!tmp)
1558	for_all_players (pl)
1559	if (pl->ob->container == op->env)
1560	{
1561	tmp = pl->ob;
1562	break;
1563	}
1564
1565	if (i < op->nrof)
1566	{
1567	sub_weight (op->env, op->weight * i);
1568	op->nrof -= i;
1569	if (tmp)
1570	esrv_send_item (tmp, op);
1571	}
1572	else
1573	{
1574	op->remove ();	1555	remove ();
1575	op->nrof = 0;	1556	return this;
1576	if (tmp)
1577	esrv_del_item (tmp->contr, op->count);
1578	}
1579	}	1557	}
1580	else	1558	else
1581	{	1559	{
1582	object *above = op->above;	1560	decrease (nr);
1583		1561
1584	if (i < op->nrof)	1562	object *op = deep_clone ();
1585	op->nrof -= i;	1563	op->nrof = nr;
1586	else
1587	{
1588	op->remove ();
1589	op->nrof = 0;
1590	}
1591
1592	/* Since we just removed op, op->above is null */
1593	for (tmp = above; tmp; tmp = tmp->above)
1594	if (tmp->type == PLAYER)
1595	{
1596	if (op->nrof)
1597	esrv_send_item (tmp, op);
1598	else
1599	esrv_del_item (tmp->contr, op->count);
1600	}
1601	}
1602
1603	if (op->nrof)
1604	return op;	1564	return op;
1605	else
1606	{
1607	op->destroy ();
1608	return 0;
1609	}
1610	}
1611
1612	/*
1613	* add_weight(object, weight) adds the specified weight to an object,
1614	* and also updates how much the environment(s) is/are carrying.
1615	*/
1616	void
1617	add_weight (object *op, signed long weight)
1618	{
1619	while (op != NULL)
1620	{
1621	if (op->type == CONTAINER)
1622	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1623
1624	op->carrying += weight;
1625	op = op->env;
1626	}	1565	}
1627	}	1566	}
1628		1567
1629	object *	1568	object *
1630	insert_ob_in_ob (object *op, object *where)	1569	insert_ob_in_ob (object *op, object *where)
…		…
1655	* be != op, if items are merged. -Tero	1594	* be != op, if items are merged. -Tero
1656	*/	1595	*/
1657	object *	1596	object *
1658	object::insert (object *op)	1597	object::insert (object *op)
1659	{	1598	{
1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1661	op->remove ();
1662
1663	if (op->more)	1599	if (op->more)
1664	{	1600	{
1665	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1601	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1666	return op;	1602	return op;
1667	}	1603	}
1668		1604
1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1605	op->remove ();
1670	CLEAR_FLAG (op, FLAG_REMOVED);	1606
		1607	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1671		1608
1672	if (op->nrof)	1609	if (op->nrof)
1673	{
1674	for (object *tmp = inv; tmp; tmp = tmp->below)	1610	for (object *tmp = inv; tmp; tmp = tmp->below)
1675	if (object::can_merge (tmp, op))	1611	if (object::can_merge (tmp, op))
1676	{	1612	{
1677	/* return the original object and remove inserted object	1613	/* return the original object and remove inserted object
1678	(client needs the original object) */	1614	(client needs the original object) */
1679	tmp->nrof += op->nrof;	1615	tmp->nrof += op->nrof;
1680	/* Weight handling gets pretty funky. Since we are adding to	1616
1681	* tmp->nrof, we need to increase the weight.	1617	if (object *pl = tmp->visible_to ())
1682	*/	1618	esrv_update_item (UPD_NROF, pl, tmp);
		1619
1683	add_weight (this, op->weight * op->nrof);	1620	adjust_weight (this, op->total_weight ());
1684	SET_FLAG (op, FLAG_REMOVED);	1621
1685	op->destroy (); /* free the inserted object */	1622	op->destroy ();
1686	op = tmp;	1623	op = tmp;
1687	op->remove (); /* and fix old object's links */	1624	goto inserted;
1688	CLEAR_FLAG (op, FLAG_REMOVED);
1689	break;
1690	}	1625	}
1691		1626
1692	/* I assume combined objects have no inventory
1693	* We add the weight - this object could have just been removed
1694	* (if it was possible to merge). calling remove_ob will subtract
1695	* the weight, so we need to add it in again, since we actually do
1696	* the linking below
1697	*/
1698	add_weight (this, op->weight * op->nrof);
1699	}
1700	else
1701	add_weight (this, (op->weight + op->carrying));
1702
1703	if (object *otmp = this->in_player ())
1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1705	otmp->update_stats ();
1706
1707	op->owner = 0; // its his/hers now. period.	1627	op->owner = 0; // it's his/hers now. period.
1708	op->map = 0;	1628	op->map = 0;
		1629	op->x = 0;
		1630	op->y = 0;
		1631
		1632	op->above = 0;
		1633	op->below = inv;
1709	op->env = this;	1634	op->env = this;
1710	op->above = 0;
1711	op->below = 0;
1712	op->x = op->y = 0;
1713		1635
		1636	if (inv)
		1637	inv->above = op;
		1638
		1639	inv = op;
		1640
		1641	op->flag [FLAG_REMOVED] = 0;
		1642
		1643	if (object *pl = op->visible_to ())
		1644	esrv_send_item (pl, op);
		1645
		1646	adjust_weight (this, op->total_weight ());
		1647
		1648	inserted:
1714	/* reset the light list and los of the players on the map */	1649	/* reset the light list and los of the players on the map */
1715	if (op->glow_radius && map)	1650	if (op->glow_radius && map && map->darkness)
1716	{
1717	#ifdef DEBUG_LIGHTS
1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1719	#endif /* DEBUG_LIGHTS */
1720	if (map->darkness)
1721	update_all_los (map, x, y);	1651	update_all_los (map, x, y);
1722	}
1723		1652
1724	/* Client has no idea of ordering so lets not bother ordering it here.	1653	// if this is a player's inventory, update stats
1725	* It sure simplifies this function...	1654	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1726	*/	1655	update_stats ();
1727	if (!inv)
1728	inv = op;
1729	else
1730	{
1731	op->below = inv;
1732	op->below->above = op;
1733	inv = op;
1734	}
1735		1656
1736	INVOKE_OBJECT (INSERT, this);	1657	INVOKE_OBJECT (INSERT, this);
1737		1658
1738	return op;	1659	return op;
1739	}	1660	}
…		…
1867	LOG (llevError, "Present_arch called outside map.\n");	1788	LOG (llevError, "Present_arch called outside map.\n");
1868	return NULL;	1789	return NULL;
1869	}	1790	}
1870		1791
1871	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1792	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1872	if (tmp->arch == at)	1793	if (tmp->arch->archname == at->archname)
1873	return tmp;	1794	return tmp;
1874		1795
1875	return NULL;	1796	return NULL;
1876	}	1797	}
1877		1798
…		…
1941	* The first matching object is returned, or NULL if none.	1862	* The first matching object is returned, or NULL if none.
1942	*/	1863	*/
1943	object *	1864	object *
1944	present_arch_in_ob (const archetype *at, const object *op)	1865	present_arch_in_ob (const archetype *at, const object *op)
1945	{	1866	{
1946	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1867	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1947	if (tmp->arch == at)	1868	if (tmp->arch->archname == at->archname)
1948	return tmp;	1869	return tmp;
1949		1870
1950	return NULL;	1871	return NULL;
1951	}	1872	}
1952		1873
…		…
2040	* head of the object should correspond for the entire object.	1961	* head of the object should correspond for the entire object.
2041	*/	1962	*/
2042	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1963	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2043	continue;	1964	continue;
2044		1965
2045	if (ob->blocked (m, pos.x, pos.y))	1966	if (ob->blocked (pos.m, pos.x, pos.y))
2046	continue;	1967	continue;
2047		1968
2048	altern [index++] = i;	1969	altern [index++] = i;
2049	}	1970	}
2050		1971
…		…
2361		2282
2362	/*	2283	/*
2363	* create clone from object to another	2284	* create clone from object to another
2364	*/	2285	*/
2365	object *	2286	object *
2366	object_create_clone (object *asrc)	2287	object::deep_clone ()
2367	{	2288	{
2368	object *dst = 0, *tmp, *src, *prev, *item;	2289	assert (("deep_clone called on non-head object", is_head ()));
2369		2290
2370	if (!asrc)	2291	object *dst = clone ();
2371	return 0;
2372		2292
2373	src = asrc->head_ ();	2293	object *prev = dst;
2374
2375	prev = 0;
2376	for (object *part = src; part; part = part->more)	2294	for (object *part = this->more; part; part = part->more)
2377	{	2295	{
2378	tmp = part->clone ();	2296	object *tmp = part->clone ();
2379	tmp->x -= src->x;
2380	tmp->y -= src->y;
2381
2382	if (!part->head)
2383	{
2384	dst = tmp;
2385	tmp->head = 0;
2386	}
2387	else
2388	tmp->head = dst;	2297	tmp->head = dst;
2389
2390	tmp->more = 0;
2391
2392	if (prev)
2393	prev->more = tmp;	2298	prev->more = tmp;
2394
2395	prev = tmp;	2299	prev = tmp;
2396	}	2300	}
2397		2301
2398	for (item = src->inv; item; item = item->below)	2302	for (object *item = inv; item; item = item->below)
2399	insert_ob_in_ob (object_create_clone (item), dst);	2303	insert_ob_in_ob (item->deep_clone (), dst);
2400		2304
2401	return dst;	2305	return dst;
2402	}	2306	}
2403		2307
2404	/* This returns the first object in who's inventory that	2308	/* This returns the first object in who's inventory that
…		…
2413	return tmp;	2317	return tmp;
2414		2318
2415	return 0;	2319	return 0;
2416	}	2320	}
2417		2321
2418	/* If ob has a field named key, return the link from the list,	2322	const shstr &
2419	* otherwise return NULL.	2323	object::kv_get (const shstr &key) const
2420	*
2421	* key must be a passed in shared string - otherwise, this won't
2422	* do the desired thing.
2423	*/
2424	key_value *
2425	get_ob_key_link (const object *ob, const char *key)
2426	{	2324	{
2427	for (key_value *link = ob->key_values; link; link = link->next)	2325	for (key_value *kv = key_values; kv; kv = kv->next)
2428	if (link->key == key)	2326	if (kv->key == key)
2429	return link;
2430
2431	return 0;
2432	}
2433
2434	/*
2435	* Returns the value of op has an extra_field for key, or NULL.
2436	*
2437	* The argument doesn't need to be a shared string.
2438	*
2439	* The returned string is shared.
2440	*/
2441	const char *
2442	get_ob_key_value (const object *op, const char *const key)
2443	{
2444	key_value *link;
2445	shstr_cmp canonical_key (key);
2446
2447	if (!canonical_key)
2448	{
2449	/* 1. There being a field named key on any object
2450	* implies there'd be a shared string to find.
2451	* 2. Since there isn't, no object has this field.
2452	* 3. Therefore, *this* object doesn't have this field.
2453	*/
2454	return 0;
2455	}
2456
2457	/* This is copied from get_ob_key_link() above -
2458	* only 4 lines, and saves the function call overhead.
2459	*/
2460	for (link = op->key_values; link; link = link->next)
2461	if (link->key == canonical_key)
2462	return link->value;	2327	return kv->value;
2463		2328
2464	return 0;	2329	return shstr_null;
2465	}	2330	}
2466		2331
2467	/*	2332	void
2468	* Updates the canonical_key in op to value.	2333	object::kv_set (const shstr &key, const shstr &value)
2469	*
2470	* canonical_key is a shared string (value doesn't have to be).
2471	*
2472	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2473	* keys.
2474	*
2475	* Returns TRUE on success.
2476	*/
2477	int
2478	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2479	{	2334	{
2480	key_value *field = NULL, *last = NULL;	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2481		2336	if (kv->key == key)
2482	for (field = op->key_values; field != NULL; field = field->next)
2483	{
2484	if (field->key != canonical_key)
2485	{	2337	{
2486	last = field;	2338	kv->value = value;
2487	continue;	2339	return;
2488	}	2340	}
2489		2341
2490	if (value)	2342	key_value *kv = new key_value;
2491	field->value = value;	2343
2492	else	2344	kv->next = key_values;
		2345	kv->key = key;
		2346	kv->value = value;
		2347
		2348	key_values = kv;
		2349	}
		2350
		2351	void
		2352	object::kv_del (const shstr &key)
		2353	{
		2354	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2355	if ((*kvp)->key == key)
2493	{	2356	{
2494	/* Basically, if the archetype has this key set,	2357	key_value *kv = *kvp;
2495	* we need to store the null value so when we save	2358	*kvp = (*kvp)->next;
2496	* it, we save the empty value so that when we load,	2359	delete kv;
2497	* we get this value back again.	2360	return;
2498	*/
2499	if (get_ob_key_link (op->arch, canonical_key))
2500	field->value = 0;
2501	else
2502	{
2503	if (last)
2504	last->next = field->next;
2505	else
2506	op->key_values = field->next;
2507
2508	delete field;
2509	}
2510	}	2361	}
2511	return TRUE;
2512	}
2513	/* IF we get here, key doesn't exist */
2514
2515	/* No field, we'll have to add it. */
2516
2517	if (!add_key)
2518	return FALSE;
2519
2520	/* There isn't any good reason to store a null
2521	* value in the key/value list. If the archetype has
2522	* this key, then we should also have it, so shouldn't
2523	* be here. If user wants to store empty strings,
2524	* should pass in ""
2525	*/
2526	if (value == NULL)
2527	return TRUE;
2528
2529	field = new key_value;
2530
2531	field->key = canonical_key;
2532	field->value = value;
2533	/* Usual prepend-addition. */
2534	field->next = op->key_values;
2535	op->key_values = field;
2536
2537	return TRUE;
2538	}
2539
2540	/*
2541	* Updates the key in op to value.
2542	*
2543	* If add_key is FALSE, this will only update existing keys,
2544	* and not add new ones.
2545	* In general, should be little reason FALSE is ever passed in for add_key
2546	*
2547	* Returns TRUE on success.
2548	*/
2549	int
2550	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2551	{
2552	shstr key_ (key);
2553
2554	return set_ob_key_value_s (op, key_, value, add_key);
2555	}	2362	}
2556		2363
2557	object::depth_iterator::depth_iterator (object *container)	2364	object::depth_iterator::depth_iterator (object *container)
2558	: iterator_base (container)	2365	: iterator_base (container)
2559	{	2366	{
…		…
2609	{	2416	{
2610	char flagdesc[512];	2417	char flagdesc[512];
2611	char info2[256 * 4];	2418	char info2[256 * 4];
2612	char *p = info;	2419	char *p = info;
2613		2420
2614	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2421	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2615	count,	2422	count,
2616	uuid.c_str (),	2423	uuid.c_str (),
2617	&name,	2424	&name,
2618	title ? "\",title:\"" : "",	2425	title ? ",title:\"" : "",
2619	title ? (const char *)title : "",	2426	title ? (const char *)title : "",
		2427	title ? "\"" : "",
2620	flag_desc (flagdesc, 512), type);	2428	flag_desc (flagdesc, 512), type);
2621		2429
2622	if (!this->flag[FLAG_REMOVED] && env)	2430	if (!flag[FLAG_REMOVED] && env)
2623	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2431	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2624		2432
2625	if (map)	2433	if (map)
2626	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2434	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2627		2435
…		…
2657	object::open_container (object *new_container)	2465	object::open_container (object *new_container)
2658	{	2466	{
2659	if (container == new_container)	2467	if (container == new_container)
2660	return;	2468	return;
2661		2469
2662	if (object *old_container = container)	2470	object *old_container = container;
		2471
		2472	if (old_container)
2663	{	2473	{
2664	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2474	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2665	return;	2475	return;
2666		2476
2667	#if 0	2477	#if 0
…		…
2669	if (object *closer = old_container->inv)	2479	if (object *closer = old_container->inv)
2670	if (closer->type == CLOSE_CON)	2480	if (closer->type == CLOSE_CON)
2671	closer->destroy ();	2481	closer->destroy ();
2672	#endif	2482	#endif
2673		2483
		2484	// make sure the container is available
		2485	esrv_send_item (this, old_container);
		2486
2674	old_container->flag [FLAG_APPLIED] = 0;	2487	old_container->flag [FLAG_APPLIED] = false;
2675	container = 0;	2488	container = 0;
2676		2489
		2490	// client needs item update to make it work, client bug requires this to be separate
2677	esrv_update_item (UPD_FLAGS, this, old_container);	2491	esrv_update_item (UPD_FLAGS, this, old_container);
		2492
2678	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2493	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2679	play_sound (sound_find ("chest_close"));	2494	play_sound (sound_find ("chest_close"));
2680	}	2495	}
2681		2496
2682	if (new_container)	2497	if (new_container)
…		…
2695	}	2510	}
2696	#endif	2511	#endif
2697		2512
2698	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2513	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2699		2514
		2515	// make sure the container is available, client bug requires this to be separate
		2516	esrv_send_item (this, new_container);
		2517
2700	new_container->flag [FLAG_APPLIED] = 1;	2518	new_container->flag [FLAG_APPLIED] = true;
2701	container = new_container;	2519	container = new_container;
2702		2520
		2521	// client needs flag change
2703	esrv_update_item (UPD_FLAGS, this, new_container);	2522	esrv_update_item (UPD_FLAGS, this, new_container);
2704	esrv_send_inventory (this, new_container);	2523	esrv_send_inventory (this, new_container);
2705	play_sound (sound_find ("chest_open"));	2524	play_sound (sound_find ("chest_open"));
2706	}	2525	}
		2526	// else if (!old_container->env && contr && contr->ns)
		2527	// contr->ns->floorbox_reset ();
2707	}	2528	}
2708		2529
2709	object *	2530	object *
2710	object::force_find (const shstr name)	2531	object::force_find (const shstr name)
2711	{	2532	{
…		…
2737		2558
2738	insert (force);	2559	insert (force);
2739	}	2560	}
2740		2561
2741	void	2562	void
2742	object::play_sound (faceidx sound) const	2563	object::play_sound (faceidx sound)
2743	{	2564	{
2744	if (!sound)	2565	if (!sound)
2745	return;	2566	return;
2746		2567
2747	if (flag [FLAG_REMOVED])	2568	if (flag [FLAG_REMOVED])

Diff Legend

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