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

Diff Legend

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