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.206 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* 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;
39	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
40	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
41		38
42	objectvec objects;	39	objectvec objects;
43	activevec actives;	40	activevec actives;
44		41
45	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
143		140
144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
145	static bool	142	static bool
146	compare_ob_value_lists_one (const object *wants, const object *has)	143	compare_ob_value_lists_one (const object *wants, const object *has)
147	{	144	{
148	key_value *wants_field;
149
150	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	145	/* 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	146	* objects with lists are rare, and lists stay short. If not, use a
152	* different structure or at least keep the lists sorted...	147	* different structure or at least keep the lists sorted...
153	*/	148	*/
154		149
155	/* For each field in wants, */	150	/* For each field in wants, */
156	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	151	for (key_value *kv = wants->key_values; kv; kv = kv->next)
157	{	152	if (has->kv_get (kv->key) != kv->value)
158	key_value *has_field;	153	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)
164	return 0; /* No field with that name. */
165
166	/* Found the matching field. */
167	if (has_field->value != wants_field->value)
168	return 0; /* Values don't match, so this half of the comparison is false. */
169
170	/* If we get here, we found a match. Now for the next field in wants. */
171	}
172		154
173	/* If we get here, every field in wants has a matching field in has. */	155	/* If we get here, every field in wants has a matching field in has. */
174	return 1;	156	return true;
175	}	157	}
176		158
177	/* Returns TRUE if ob1 has the same key_values as ob2. */	159	/* Returns TRUE if ob1 has the same key_values as ob2. */
178	static bool	160	static bool
179	compare_ob_value_lists (const object *ob1, const object *ob2)	161	compare_ob_value_lists (const object *ob1, const object *ob2)
180	{	162	{
181	/* However, there may be fields in has which aren't partnered in wants,	163	/* However, there may be fields in has which aren't partnered in wants,
182	* so we need to run the comparison *twice*. :(	164	* so we need to run the comparison *twice*. :(
183	*/	165	*/
184	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	166	return compare_ob_value_lists_one (ob1, ob2)
		167	&& compare_ob_value_lists_one (ob2, ob1);
185	}	168	}
186		169
187	/* Function examines the 2 objects given to it, and returns true if	170	/* Function examines the 2 objects given to it, and returns true if
188	* they can be merged together.	171	* they can be merged together.
189	*	172	*
…		…
204	|| ob1->speed != ob2->speed	187	|| ob1->speed != ob2->speed
205	|| ob1->value != ob2->value	188	|| ob1->value != ob2->value
206	|| ob1->name != ob2->name)	189	|| ob1->name != ob2->name)
207	return 0;	190	return 0;
208		191
209	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
210	* for unsigned overflow (2c), second part checks wether the result	193	* is always 0 .. 2**31-1 */
211	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
212	* nrof values.
213	*/
214	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
215	return 0;	195	return 0;
216		196
217	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
218	* This is to the comparison of the flags below will be OK. We	198	* This is to the comparison of the flags below will be OK. We
219	* just can't ignore the been applied or identified flags, as they	199	* just can't ignore the been applied or identified flags, as they
…		…
224	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
225		205
226	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
227	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
228		208
229	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	209	if (ob1->arch->archname != ob2->arch->archname
230	|| ob1->arch != ob2->arch
231	|| ob1->name != ob2->name	210	|| ob1->name != ob2->name
232	|| ob1->title != ob2->title	211	|| ob1->title != ob2->title
233	|| ob1->msg != ob2->msg	212	|| ob1->msg != ob2->msg
234	|| ob1->weight != ob2->weight	213	|| ob1->weight != ob2->weight
235	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
236	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
237	|| ob1->attacktype != ob2->attacktype	214	|| ob1->attacktype != ob2->attacktype
238	|| ob1->magic != ob2->magic	215	|| ob1->magic != ob2->magic
239	|| ob1->slaying != ob2->slaying	216	|| ob1->slaying != ob2->slaying
240	|| ob1->skill != ob2->skill	217	|| ob1->skill != ob2->skill
241	|| ob1->value != ob2->value	218	|| ob1->value != ob2->value
242	|| ob1->animation_id != ob2->animation_id	219	|| ob1->animation_id != ob2->animation_id
		220	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
243	|| ob1->client_type != ob2->client_type	221	|| ob1->client_type != ob2->client_type
244	|| ob1->materialname != ob2->materialname	222	|| ob1->materialname != ob2->materialname
245	|| ob1->lore != ob2->lore	223	|| ob1->lore != ob2->lore
246	|| ob1->subtype != ob2->subtype	224	|| ob1->subtype != ob2->subtype
247	|| ob1->move_type != ob2->move_type	225	|| ob1->move_type != ob2->move_type
248	|| ob1->move_block != ob2->move_block	226	|| ob1->move_block != ob2->move_block
249	|| ob1->move_allow != ob2->move_allow	227	|| ob1->move_allow != ob2->move_allow
250	|| ob1->move_on != ob2->move_on	228	|| ob1->move_on != ob2->move_on
251	|| ob1->move_off != ob2->move_off	229	|| ob1->move_off != ob2->move_off
252	|| ob1->move_slow != ob2->move_slow	230	|| ob1->move_slow != ob2->move_slow
253	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	231	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
		234	return 0;
		235
		236	if ((ob1->flag ^ ob2->flag)
		237	.reset (FLAG_INV_LOCKED)
		238	.reset (FLAG_REMOVED)
		239	.any ())
254	return 0;	240	return 0;
255		241
256	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
257	* not merge objects with real inventories, as splitting them	243	* not merge objects with real inventories, as splitting them
258	* is hard.	244	* is hard.
…		…
297		283
298	if (ob1->key_values || ob2->key_values)	284	if (ob1->key_values || ob2->key_values)
299	{	285	{
300	/* At least one of these has key_values. */	286	/* At least one of these has key_values. */
301	if ((!ob1->key_values) != (!ob2->key_values))	287	if ((!ob1->key_values) != (!ob2->key_values))
302	/* One has fields, but the other one doesn't. */	288	return 0; /* One has fields, but the other one doesn't. */
303	return 0;	289
304	else if (!compare_ob_value_lists (ob1, ob2))	290	if (!compare_ob_value_lists (ob1, ob2))
305	return 0;	291	return 0;
306	}	292	}
307		293
308	if (ob1->self || ob2->self)	294	if (ob1->self || ob2->self)
309	{	295	{
…		…
315	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	301	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
316	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	302	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
317		303
318	if (k1 != k2)	304	if (k1 != k2)
319	return 0;	305	return 0;
		306
320	else if (k1 == 0)	307	if (k1 == 0)
321	return 1;	308	return 1;
		309
322	else if (!cfperl_can_merge (ob1, ob2))	310	if (!cfperl_can_merge (ob1, ob2))
323	return 0;	311	return 0;
324	}	312	}
325	}	313	}
326		314
327	/* Everything passes, must be OK. */	315	/* Everything passes, must be OK. */
328	return 1;	316	return 1;
329	}	317	}
330		318
		319	// find player who can see this object
		320	object *
		321	object::visible_to () const
		322	{
		323	if (client_visible () && !flag [FLAG_REMOVED])
		324	{
		325	// see if we are in a container of sorts
		326	if (env)
		327	{
		328	// the player inventory itself is always visible
		329	if (env->is_player ())
		330	return env;
		331
		332	// else a player could have our env open
		333	object *envest = env->outer_env_or_self ();
		334
		335	// the player itself is always on a map, so we will find him here
		336	// even if our inv is in a player.
		337	if (envest->is_on_map ())
		338	if (object *pl = envest->ms ().player ())
		339	if (pl->container == env)
		340	return pl;
		341	}
		342	else
		343	{
		344	// maybe there is a player standing on the same mapspace
		345	// this will catch the case where "this" is a player
		346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		348	|| this == pl->container)
		349	return pl;
		350	}
		351	}
		352
		353	return 0;
		354	}
		355
		356	// adjust weight per container type ("of holding")
		357	static sint32
		358	weight_adjust_for (object *op, sint32 weight)
		359	{
		360	return op->type == CONTAINER
		361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		362	: weight;
		363	}
		364
331	/*	365	/*
		366	* adjust_weight(object, weight) adds the specified weight to an object,
		367	* and also updates how much the environment(s) is/are carrying.
		368	*/
		369	static void
		370	adjust_weight (object *op, sint32 weight)
		371	{
		372	while (op)
		373	{
		374	// adjust by actual difference to account for rounding errors
		375	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
		378
		379	if (!weight)
		380	return;
		381
		382	op->carrying += weight;
		383
		384	if (object *pl = op->visible_to ())
		385	if (pl != op) // player is handled lazily
		386	esrv_update_item (UPD_WEIGHT, pl, op);
		387
		388	op = op->env;
		389	}
		390	}
		391
		392	/*
332	* sum_weight() is a recursive function which calculates the weight	393	* this is a recursive function which calculates the weight
333	* an object is carrying. It goes through in figures out how much	394	* an object is carrying. It goes through op and figures out how much
334	* containers are carrying, and sums it up.	395	* containers are carrying, and sums it up.
335	*/	396	*/
336	long	397	void
337	sum_weight (object *op)	398	object::update_weight ()
338	{	399	{
339	long sum;	400	sint32 sum = 0;
340	object *inv;
341		401
342	for (sum = 0, inv = op->inv; inv; inv = inv->below)	402	for (object *op = inv; op; op = op->below)
343	{	403	{
344	if (inv->inv)	404	if (op->inv)
345	sum_weight (inv);	405	op->update_weight ();
346		406
347	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	407	sum += op->total_weight ();
		408	}
		409
		410	sum = weight_adjust_for (this, sum);
		411
		412	if (sum != carrying)
348	}	413	{
349
350	if (op->type == CONTAINER && op->stats.Str)
351	sum = (sum * (100 - op->stats.Str)) / 100;
352
353	if (op->carrying != sum)
354	op->carrying = sum;	414	carrying = sum;
355		415
356	return sum;	416	if (object *pl = visible_to ())
		417	if (pl != this) // player is handled lazily
		418	esrv_update_item (UPD_WEIGHT, pl, this);
		419	}
357	}	420	}
358		421
359	/**	422	/*
360	* Return the outermost environment object for a given object.	423	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
361	*/
362
363	object *
364	object_get_env_recursive (object *op)
365	{
366	while (op->env != NULL)
367	op = op->env;
368	return op;
369	}
370
371	/*
372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373	* Some error messages.
374	* The result of the dump is stored in the static global errmsg array.
375	*/	424	*/
376	char *	425	char *
377	dump_object (object *op)	426	dump_object (object *op)
378	{	427	{
379	if (!op)	428	if (!op)
…		…
382	object_freezer freezer;	431	object_freezer freezer;
383	op->write (freezer);	432	op->write (freezer);
384	return freezer.as_string ();	433	return freezer.as_string ();
385	}	434	}
386		435
		436	char *
		437	object::as_string ()
		438	{
		439	return dump_object (this);
		440	}
		441
387	/*	442	/*
388	* get_nearest_part(multi-object, object 2) returns the part of the	443	* get_nearest_part(multi-object, object 2) returns the part of the
389	* multi-object 1 which is closest to the second object.	444	* multi-object 1 which is closest to the second object.
390	* If it's not a multi-object, it is returned.	445	* If it's not a multi-object, it is returned.
391	*/	446	*/
…		…
393	get_nearest_part (object *op, const object *pl)	448	get_nearest_part (object *op, const object *pl)
394	{	449	{
395	object *tmp, *closest;	450	object *tmp, *closest;
396	int last_dist, i;	451	int last_dist, i;
397		452
398	if (op->more == NULL)	453	if (!op->more)
399	return op;	454	return op;
		455
400	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	456	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		457	tmp;
		458	tmp = tmp->more)
401	if ((i = distance (tmp, pl)) < last_dist)	459	if ((i = distance (tmp, pl)) < last_dist)
402	closest = tmp, last_dist = i;	460	closest = tmp, last_dist = i;
		461
403	return closest;	462	return closest;
404	}	463	}
405		464
406	/*	465	/*
407	* Returns the object which has the count-variable equal to the argument.	466	* Returns the object which has the count-variable equal to the argument.
		467	* VERRRY slow.
408	*/	468	*/
409	object *	469	object *
410	find_object (tag_t i)	470	find_object (tag_t i)
411	{	471	{
412	for_all_objects (op)	472	for_all_objects (op)
…		…
423	*/	483	*/
424	object *	484	object *
425	find_object_name (const char *str)	485	find_object_name (const char *str)
426	{	486	{
427	shstr_cmp str_ (str);	487	shstr_cmp str_ (str);
428	object *op;
429		488
		489	if (str_)
430	for_all_objects (op)	490	for_all_objects (op)
431	if (op->name == str_)	491	if (op->name == str_)
432	break;	492	return op;
433		493
434	return op;	494	return 0;
435	}	495	}
436		496
437	/*	497	/*
438	* Sets the owner and sets the skill and exp pointers to owner's current	498	* Sets the owner and sets the skill and exp pointers to owner's current
439	* skill and experience objects.	499	* skill and experience objects.
…		…
501	update_stats ();	561	update_stats ();
502		562
503	new_draw_info_format (NDI_UNIQUE, 0, this,	563	new_draw_info_format (NDI_UNIQUE, 0, this,
504	"You try to balance all your items at once, "	564	"You try to balance all your items at once, "
505	"but the %s is just too much for your body. "	565	"but the %s is just too much for your body. "
506	"[You need to unapply some items first.]", &ob->name);	566	"[You need to unapply some items first - use the 'body' command to see "
		567	"how many items you cna wera on a specific body part.]", &ob->name);
507	return false;	568	return false;
508	}	569	}
509		570
510	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	571	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
511	}	572	}
…		…
537	}	598	}
538		599
539	op->key_values = 0;	600	op->key_values = 0;
540	}	601	}
541		602
542	object &	603	/*
543	object::operator =(const object &src)	604	* copy_to first frees everything allocated by the dst object,
		605	* and then copies the contents of itself into the second
		606	* object, allocating what needs to be allocated. Basically, any
		607	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		608	* if the first object is freed, the pointers in the new object
		609	* will point at garbage.
		610	*/
		611	void
		612	object::copy_to (object *dst)
544	{	613	{
545	bool is_freed = flag [FLAG_FREED];	614	dst->remove ();
546	bool is_removed = flag [FLAG_REMOVED];
547
548	*(object_copy *)this = src;	615	*(object_copy *)dst = *this;
549
550	flag [FLAG_FREED] = is_freed;
551	flag [FLAG_REMOVED] = is_removed;	616	dst->flag [FLAG_REMOVED] = true;
552		617
553	/* Copy over key_values, if any. */	618	/* Copy over key_values, if any. */
554	if (src.key_values)	619	if (key_values)
555	{	620	{
556	key_value *tail = 0;	621	key_value *tail = 0;
557	key_values = 0;	622	dst->key_values = 0;
558		623
559	for (key_value *i = src.key_values; i; i = i->next)	624	for (key_value *i = key_values; i; i = i->next)
560	{	625	{
561	key_value *new_link = new key_value;	626	key_value *new_link = new key_value;
562		627
563	new_link->next = 0;	628	new_link->next = 0;
564	new_link->key = i->key;	629	new_link->key = i->key;
565	new_link->value = i->value;	630	new_link->value = i->value;
566		631
567	/* Try and be clever here, too. */	632	/* Try and be clever here, too. */
568	if (!key_values)	633	if (!dst->key_values)
569	{	634	{
570	key_values = new_link;	635	dst->key_values = new_link;
571	tail = new_link;	636	tail = new_link;
572	}	637	}
573	else	638	else
574	{	639	{
575	tail->next = new_link;	640	tail->next = new_link;
576	tail = new_link;	641	tail = new_link;
577	}	642	}
578	}	643	}
579	}	644	}
580	}
581
582	/*
583	* copy_to first frees everything allocated by the dst object,
584	* and then copies the contents of itself into the second
585	* object, allocating what needs to be allocated. Basically, any
586	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
587	* if the first object is freed, the pointers in the new object
588	* will point at garbage.
589	*/
590	void
591	object::copy_to (object *dst)
592	{
593	*dst = *this;
594		645
595	if (speed < 0)	646	if (speed < 0)
596	dst->speed_left -= rndm ();	647	dst->speed_left -= rndm ();
597		648
598	dst->set_speed (dst->speed);	649	dst->activate ();
599	}	650	}
600		651
601	void	652	void
602	object::instantiate ()	653	object::instantiate ()
603	{	654	{
…		…
620	object *	671	object *
621	object::clone ()	672	object::clone ()
622	{	673	{
623	object *neu = create ();	674	object *neu = create ();
624	copy_to (neu);	675	copy_to (neu);
		676	neu->map = map; // not copied by copy_to
625	return neu;	677	return neu;
626	}	678	}
627		679
628	/*	680	/*
629	* If an object with the IS_TURNABLE() flag needs to be turned due	681	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
680	* UP_OBJ_FACE: only the objects face has changed.	732	* UP_OBJ_FACE: only the objects face has changed.
681	*/	733	*/
682	void	734	void
683	update_object (object *op, int action)	735	update_object (object *op, int action)
684	{	736	{
685	if (op == NULL)	737	if (!op)
686	{	738	{
687	/* this should never happen */	739	/* this should never happen */
688	LOG (llevDebug, "update_object() called for NULL object.\n");	740	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
689	return;	741	return;
690	}	742	}
691		743
692	if (op->env)	744	if (!op->is_on_map ())
693	{	745	{
694	/* Animation is currently handled by client, so nothing	746	/* Animation is currently handled by client, so nothing
695	* to do in this case.	747	* to do in this case.
696	*/	748	*/
697	return;	749	return;
698	}	750	}
699
700	/* If the map is saving, don't do anything as everything is
701	* going to get freed anyways.
702	*/
703	if (!op->map || op->map->in_memory == MAP_SAVING)
704	return;
705		751
706	/* make sure the object is within map boundaries */	752	/* make sure the object is within map boundaries */
707	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	753	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
708	{	754	{
709	LOG (llevError, "update_object() called for object out of map!\n");	755	LOG (llevError, "update_object() called for object out of map!\n");
…		…
720	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
721	{	767	{
722	// this is likely overkill, TODO: revisit (schmorp)	768	// this is likely overkill, TODO: revisit (schmorp)
723	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	769	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
724	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	770	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
725	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	771	|| (op->is_player () && !(m.flags_ & P_PLAYER))
726	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	772	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
727	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	773	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
728	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	774	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
729	|| (m.move_on | op->move_on ) != m.move_on	775	|| (m.move_on | op->move_on ) != m.move_on
730	|| (m.move_off | op->move_off ) != m.move_off	776	|| (m.move_off | op->move_off ) != m.move_off
731	|| (m.move_slow | op->move_slow) != m.move_slow	777	|| (m.move_slow | op->move_slow) != m.move_slow
732	/* This isn't perfect, but I don't expect a lot of objects to	778	/* This isn't perfect, but I don't expect a lot of objects to
733	* to have move_allow right now.	779	* have move_allow right now.
734	*/	780	*/
735	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	781	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
736	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	782	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
737	m.flags_ = 0;	783	m.invalidate ();
738	}	784	}
739	/* if the object is being removed, we can't make intelligent	785	/* if the object is being removed, we can't make intelligent
740	* decisions, because remove_ob can't really pass the object	786	* decisions, because remove_ob can't really pass the object
741	* that is being removed.	787	* that is being removed.
742	*/	788	*/
743	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	789	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
744	m.flags_ = 0;	790	m.invalidate ();
745	else if (action == UP_OBJ_FACE)	791	else if (action == UP_OBJ_FACE)
746	/* Nothing to do for that case */ ;	792	/* Nothing to do for that case */ ;
747	else	793	else
748	LOG (llevError, "update_object called with invalid action: %d\n", action);	794	LOG (llevError, "update_object called with invalid action: %d\n", action);
749		795
…		…
753		799
754	object::object ()	800	object::object ()
755	{	801	{
756	SET_FLAG (this, FLAG_REMOVED);	802	SET_FLAG (this, FLAG_REMOVED);
757		803
758	expmul = 1.0;	804	//expmul = 1.0; declared const for the time being
759	face = blank_face;	805	face = blank_face;
760	}	806	}
761		807
762	object::~object ()	808	object::~object ()
763	{	809	{
…		…
793	/* If already on active list, don't do anything */	839	/* If already on active list, don't do anything */
794	if (active)	840	if (active)
795	return;	841	return;
796		842
797	if (has_active_speed ())	843	if (has_active_speed ())
		844	{
		845	if (flag [FLAG_FREED])
		846	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		847
798	actives.insert (this);	848	actives.insert (this);
		849	}
799	}	850	}
800		851
801	void	852	void
802	object::activate_recursive ()	853	object::activate_recursive ()
803	{	854	{
…		…
852	object::destroy_inv (bool drop_to_ground)	903	object::destroy_inv (bool drop_to_ground)
853	{	904	{
854	// need to check first, because the checks below might segfault	905	// need to check first, because the checks below might segfault
855	// as we might be on an invalid mapspace and crossfire code	906	// as we might be on an invalid mapspace and crossfire code
856	// is too buggy to ensure that the inventory is empty.	907	// is too buggy to ensure that the inventory is empty.
857	// corollary: if you create arrows etc. with stuff in tis inventory,	908	// corollary: if you create arrows etc. with stuff in its inventory,
858	// cf will crash below with off-map x and y	909	// cf will crash below with off-map x and y
859	if (!inv)	910	if (!inv)
860	return;	911	return;
861		912
862	/* Only if the space blocks everything do we not process -	913	/* Only if the space blocks everything do we not process -
…		…
864	* drop on that space.	915	* drop on that space.
865	*/	916	*/
866	if (!drop_to_ground	917	if (!drop_to_ground
867	|| !map	918	|| !map
868	|| map->in_memory != MAP_ACTIVE	919	|| map->in_memory != MAP_ACTIVE
869	|| map->nodrop	920	|| map->no_drop
870	|| ms ().move_block == MOVE_ALL)	921	|| ms ().move_block == MOVE_ALL)
871	{	922	{
872	while (inv)	923	while (inv)
873	{
874	inv->destroy_inv (drop_to_ground);
875	inv->destroy ();	924	inv->destroy ();
876	}
877	}	925	}
878	else	926	else
879	{ /* Put objects in inventory onto this space */	927	{ /* Put objects in inventory onto this space */
880	while (inv)	928	while (inv)
881	{	929	{
…		…
899	object *op = new object;	947	object *op = new object;
900	op->link ();	948	op->link ();
901	return op;	949	return op;
902	}	950	}
903		951
		952	static struct freed_map : maptile
		953	{
		954	freed_map ()
		955	{
		956	path = "<freed objects map>";
		957	name = "/internal/freed_objects_map";
		958	width = 3;
		959	height = 3;
		960	no_drop = 1;
		961	no_reset = 1;
		962
		963	alloc ();
		964	in_memory = MAP_ACTIVE;
		965	}
		966
		967	~freed_map ()
		968	{
		969	destroy ();
		970	}
		971	} freed_map; // freed objects are moved here to avoid crashes
		972
904	void	973	void
905	object::do_destroy ()	974	object::do_destroy ()
906	{	975	{
907	attachable::do_destroy ();
908
909	if (flag [FLAG_IS_LINKED])	976	if (flag [FLAG_IS_LINKED])
910	remove_button_link (this);	977	remove_link ();
911		978
912	if (flag [FLAG_FRIENDLY])	979	if (flag [FLAG_FRIENDLY])
913	remove_friendly_object (this);	980	remove_friendly_object (this);
914		981
915	if (!flag [FLAG_REMOVED])
916	remove ();	982	remove ();
917		983
918	destroy_inv (true);	984	attachable::do_destroy ();
919		985
920	deactivate ();	986	deactivate ();
921	unlink ();	987	unlink ();
922		988
923	flag [FLAG_FREED] = 1;	989	flag [FLAG_FREED] = 1;
924		990
925	// hack to ensure that freed objects still have a valid map	991	// hack to ensure that freed objects still have a valid map
926	{
927	static maptile *freed_map; // freed objects are moved here to avoid crashes
928
929	if (!freed_map)
930	{
931	freed_map = new maptile;
932
933	freed_map->path = "<freed objects map>";
934	freed_map->name = "/internal/freed_objects_map";
935	freed_map->width = 3;
936	freed_map->height = 3;
937	freed_map->nodrop = 1;
938
939	freed_map->alloc ();
940	freed_map->in_memory = MAP_ACTIVE;
941	}
942
943	map = freed_map;	992	map = &freed_map;
944	x = 1;	993	x = 1;
945	y = 1;	994	y = 1;
946	}
947		995
948	if (more)	996	if (more)
949	{	997	{
950	more->destroy ();	998	more->destroy ();
951	more = 0;	999	more = 0;
…		…
959	attacked_by = 0;	1007	attacked_by = 0;
960	current_weapon = 0;	1008	current_weapon = 0;
961	}	1009	}
962		1010
963	void	1011	void
964	object::destroy (bool destroy_inventory)	1012	object::destroy ()
965	{	1013	{
966	if (destroyed ())	1014	if (destroyed ())
967	return;	1015	return;
968		1016
969	if (destroy_inventory)	1017	if (!is_head () && !head->destroyed ())
		1018	{
		1019	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1020	head->destroy ();
		1021	return;
		1022	}
		1023
970	destroy_inv (false);	1024	destroy_inv (false);
971		1025
972	if (is_head ())	1026	if (is_head ())
973	if (sound_destroy)	1027	if (sound_destroy)
974	play_sound (sound_destroy);	1028	play_sound (sound_destroy);
975	else if (flag [FLAG_MONSTER])	1029	else if (flag [FLAG_MONSTER])
976	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1030	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
977		1031
978	attachable::destroy ();	1032	attachable::destroy ();
979	}
980
981	/*
982	* sub_weight() recursively (outwards) subtracts a number from the
983	* weight of an object (and what is carried by it's environment(s)).
984	*/
985	void
986	sub_weight (object *op, signed long weight)
987	{
988	while (op != NULL)
989	{
990	if (op->type == CONTAINER)
991	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
992
993	op->carrying -= weight;
994	op = op->env;
995	}
996	}	1033	}
997		1034
998	/* op->remove ():	1035	/* op->remove ():
999	* This function removes the object op from the linked list of objects	1036	* This function removes the object op from the linked list of objects
1000	* which it is currently tied to. When this function is done, the	1037	* which it is currently tied to. When this function is done, the
…		…
1006	object::do_remove ()	1043	object::do_remove ()
1007	{	1044	{
1008	object *tmp, *last = 0;	1045	object *tmp, *last = 0;
1009	object *otmp;	1046	object *otmp;
1010		1047
1011	if (QUERY_FLAG (this, FLAG_REMOVED))	1048	if (flag [FLAG_REMOVED])
1012	return;	1049	return;
1013		1050
1014	SET_FLAG (this, FLAG_REMOVED);
1015	INVOKE_OBJECT (REMOVE, this);	1051	INVOKE_OBJECT (REMOVE, this);
		1052
		1053	flag [FLAG_REMOVED] = true;
1016		1054
1017	if (more)	1055	if (more)
1018	more->remove ();	1056	more->remove ();
1019		1057
1020	/*	1058	/*
1021	* In this case, the object to be removed is in someones	1059	* In this case, the object to be removed is in someones
1022	* inventory.	1060	* inventory.
1023	*/	1061	*/
1024	if (env)	1062	if (env)
1025	{	1063	{
1026	if (nrof)	1064	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1027	sub_weight (env, weight * nrof);	1065	if (object *pl = visible_to ())
1028	else	1066	esrv_del_item (pl->contr, count);
1029	sub_weight (env, weight + carrying);	1067	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1068
		1069	adjust_weight (env, -total_weight ());
		1070
		1071	object *pl = in_player ();
		1072
		1073	/* we set up values so that it could be inserted into
		1074	* the map, but we don't actually do that - it is up
		1075	* to the caller to decide what we want to do.
		1076	*/
		1077	map = env->map;
		1078	x = env->x;
		1079	y = env->y;
		1080
		1081	// make sure cmov optimisation is applicable
		1082	*(above ? &above->below : &env->inv) = below;
		1083	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1084
		1085	above = 0;
		1086	below = 0;
		1087	env = 0;
1030		1088
1031	/* NO_FIX_PLAYER is set when a great many changes are being	1089	/* NO_FIX_PLAYER is set when a great many changes are being
1032	* made to players inventory. If set, avoiding the call	1090	* made to players inventory. If set, avoiding the call
1033	* to save cpu time.	1091	* to save cpu time.
1034	*/	1092	*/
1035	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1093	if (pl)
		1094	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1095	{
1036	otmp->update_stats ();	1096	pl->update_stats ();
1037		1097
1038	if (above)	1098	if (glow_radius && pl->is_on_map ())
1039	above->below = below;	1099	update_all_los (pl->map, pl->x, pl->y);
1040	else	1100	}
1041	env->inv = below;
1042
1043	if (below)
1044	below->above = above;
1045
1046	/* we set up values so that it could be inserted into
1047	* the map, but we don't actually do that - it is up
1048	* to the caller to decide what we want to do.
1049	*/
1050	x = env->x, y = env->y;
1051	map = env->map;
1052	above = 0, below = 0;
1053	env = 0;
1054	}	1101	}
1055	else if (map)	1102	else if (map)
1056	{	1103	{
1057	if (type == PLAYER)
1058	{
1059	// leaving a spot always closes any open container on the ground
1060	if (container && !container->env)
1061	// this causes spurious floorbox updates, but it ensures
1062	// that the CLOSE event is being sent.
1063	close_container ();
1064
1065	--map->players;
1066	map->touch ();
1067	}
1068
1069	map->dirty = true;	1104	map->dirty = true;
1070	mapspace &ms = this->ms ();	1105	mapspace &ms = this->ms ();
1071		1106
		1107	if (object *pl = ms.player ())
		1108	{
		1109	if (is_player ())
		1110	{
		1111	if (!flag [FLAG_WIZPASS])
		1112	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1113
		1114	// leaving a spot always closes any open container on the ground
		1115	if (container && !container->env)
		1116	// this causes spurious floorbox updates, but it ensures
		1117	// that the CLOSE event is being sent.
		1118	close_container ();
		1119
		1120	--map->players;
		1121	map->touch ();
		1122	}
		1123	else if (pl->container == this)
		1124	{
		1125	// removing a container should close it
		1126	close_container ();
		1127	}
		1128
		1129	esrv_del_item (pl->contr, count);
		1130	}
		1131
1072	/* link the object above us */	1132	/* link the object above us */
1073	if (above)	1133	// re-link, make sure compiler can easily use cmove
1074	above->below = below;	1134	*(above ? &above->below : &ms.top) = below;
1075	else	1135	*(below ? &below->above : &ms.bot) = above;
1076	ms.top = below; /* we were top, set new top */
1077
1078	/* Relink the object below us, if there is one */
1079	if (below)
1080	below->above = above;
1081	else
1082	{
1083	/* Nothing below, which means we need to relink map object for this space
1084	* use translated coordinates in case some oddness with map tiling is
1085	* evident
1086	*/
1087	if (GET_MAP_OB (map, x, y) != this)
1088	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 ());
1089
1090	ms.bot = above; /* goes on above it. */
1091	}
1092		1136
1093	above = 0;	1137	above = 0;
1094	below = 0;	1138	below = 0;
		1139
		1140	ms.invalidate ();
1095		1141
1096	if (map->in_memory == MAP_SAVING)	1142	if (map->in_memory == MAP_SAVING)
1097	return;	1143	return;
1098		1144
1099	int check_walk_off = !flag [FLAG_NO_APPLY];	1145	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1105	* removed (most likely destroyed), update the player view	1151	* removed (most likely destroyed), update the player view
1106	* appropriately.	1152	* appropriately.
1107	*/	1153	*/
1108	pl->close_container ();	1154	pl->close_container ();
1109		1155
		1156	//TODO: the floorbox prev/next might need updating
		1157	//esrv_del_item (pl->contr, count);
		1158	//TODO: update floorbox to preserve ordering
		1159	if (pl->contr->ns)
1110	pl->contr->ns->floorbox_update ();	1160	pl->contr->ns->floorbox_update ();
1111	}	1161	}
1112		1162
1113	for (tmp = ms.bot; tmp; tmp = tmp->above)	1163	for (tmp = ms.bot; tmp; tmp = tmp->above)
1114	{	1164	{
1115	/* No point updating the players look faces if he is the object	1165	/* No point updating the players look faces if he is the object
…		…
1128	}	1178	}
1129		1179
1130	last = tmp;	1180	last = tmp;
1131	}	1181	}
1132		1182
1133	/* last == NULL if there are no objects on this space */	1183	if (affects_los ())
1134	//TODO: this makes little sense, why only update the topmost object?
1135	if (!last)
1136	map->at (x, y).flags_ = 0;
1137	else
1138	update_object (last, UP_OBJ_REMOVE);
1139
1140	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1141	update_all_los (map, x, y);	1184	update_all_los (map, x, y);
1142	}	1185	}
1143	}	1186	}
1144		1187
1145	/*	1188	/*
…		…
1159	if (!top)	1202	if (!top)
1160	for (top = op; top && top->above; top = top->above)	1203	for (top = op; top && top->above; top = top->above)
1161	;	1204	;
1162		1205
1163	for (; top; top = top->below)	1206	for (; top; top = top->below)
1164	{
1165	if (top == op)
1166	continue;
1167
1168	if (object::can_merge (op, top))	1207	if (object::can_merge (op, top))
1169	{	1208	{
1170	top->nrof += op->nrof;	1209	top->nrof += op->nrof;
1171		1210
1172	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1211	if (object *pl = top->visible_to ())
1173	op->weight = 0; /* Don't want any adjustements now */	1212	esrv_update_item (UPD_NROF, pl, top);
		1213
		1214	op->weight = 0; // cancel the addition above
		1215	op->carrying = 0; // must be 0 already
		1216
1174	op->destroy ();	1217	op->destroy ();
		1218
1175	return top;	1219	return top;
1176	}	1220	}
1177	}
1178		1221
1179	return 0;	1222	return 0;
1180	}	1223	}
1181		1224
1182	void	1225	void
…		…
1207	* job preparing multi-part monsters.	1250	* job preparing multi-part monsters.
1208	*/	1251	*/
1209	object *	1252	object *
1210	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1253	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1211	{	1254	{
		1255	op->remove ();
		1256
1212	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1213	{	1258	{
1214	tmp->x = x + tmp->arch->x;	1259	tmp->x = x + tmp->arch->x;
1215	tmp->y = y + tmp->arch->y;	1260	tmp->y = y + tmp->arch->y;
1216	}	1261	}
…		…
1239	* just 'op' otherwise	1284	* just 'op' otherwise
1240	*/	1285	*/
1241	object *	1286	object *
1242	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1287	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1243	{	1288	{
1244	assert (!op->flag [FLAG_FREED]);
1245
1246	object *top, *floor = NULL;
1247
1248	op->remove ();	1289	op->remove ();
		1290
		1291	if (m == &freed_map)//D TODO: remove soon
		1292	{//D
		1293	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1294	}//D
1249		1295
1250	/* Ideally, the caller figures this out. However, it complicates a lot	1296	/* Ideally, the caller figures this out. However, it complicates a lot
1251	* of areas of callers (eg, anything that uses find_free_spot would now	1297	* of areas of callers (eg, anything that uses find_free_spot would now
1252	* need extra work	1298	* need extra work
1253	*/	1299	*/
		1300	maptile *newmap = m;
1254	if (!xy_normalise (m, op->x, op->y))	1301	if (!xy_normalise (newmap, op->x, op->y))
1255	{	1302	{
1256	op->destroy ();	1303	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1257	return 0;	1304	return 0;
1258	}	1305	}
1259		1306
1260	if (object *more = op->more)	1307	if (object *more = op->more)
1261	if (!insert_ob_in_map (more, m, originator, flag))	1308	if (!insert_ob_in_map (more, m, originator, flag))
1262	return 0;	1309	return 0;
1263		1310
1264	CLEAR_FLAG (op, FLAG_REMOVED);	1311	op->flag [FLAG_REMOVED] = false;
1265		1312	op->env = 0;
1266	op->map = m;	1313	op->map = newmap;
		1314
1267	mapspace &ms = op->ms ();	1315	mapspace &ms = op->ms ();
1268		1316
1269	/* this has to be done after we translate the coordinates.	1317	/* this has to be done after we translate the coordinates.
1270	*/	1318	*/
1271	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1273	if (object::can_merge (op, tmp))	1321	if (object::can_merge (op, tmp))
1274	{	1322	{
		1323	// TODO: we actually want to update tmp, not op,
		1324	// but some caller surely breaks when we return tmp
		1325	// from here :/
1275	op->nrof += tmp->nrof;	1326	op->nrof += tmp->nrof;
1276	tmp->destroy ();	1327	tmp->destroy ();
1277	}	1328	}
1278		1329
1279	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1288	{	1339	{
1289	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1290	abort ();	1341	abort ();
1291	}	1342	}
1292		1343
		1344	if (!originator->is_on_map ())
		1345	{
		1346	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1347	op->debug_desc (), originator->debug_desc ());
		1348	abort ();
		1349	}
		1350
1293	op->above = originator;	1351	op->above = originator;
1294	op->below = originator->below;	1352	op->below = originator->below;
1295
1296	if (op->below)
1297	op->below->above = op;
1298	else
1299	ms.bot = op;
1300
1301	/* since *below* originator, no need to update top */
1302	originator->below = op;	1353	originator->below = op;
		1354
		1355	*(op->below ? &op->below->above : &ms.bot) = op;
1303	}	1356	}
1304	else	1357	else
1305	{	1358	{
1306	top = ms.bot;	1359	object *floor = 0;
		1360	object *top = ms.top;
1307		1361
1308	/* If there are other objects, then */	1362	/* If there are other objects, then */
1309	if (top)	1363	if (top)
1310	{	1364	{
1311	object *last = 0;
1312
1313	/*	1365	/*
1314	* If there are multiple objects on this space, we do some trickier handling.	1366	* If there are multiple objects on this space, we do some trickier handling.
1315	* We've already dealt with merging if appropriate.	1367	* We've already dealt with merging if appropriate.
1316	* Generally, we want to put the new object on top. But if	1368	* Generally, we want to put the new object on top. But if
1317	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1369	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1320	* once we get to them. This reduces the need to traverse over all of	1372	* once we get to them. This reduces the need to traverse over all of
1321	* them when adding another one - this saves quite a bit of cpu time	1373	* them when adding another one - this saves quite a bit of cpu time
1322	* when lots of spells are cast in one area. Currently, it is presumed	1374	* when lots of spells are cast in one area. Currently, it is presumed
1323	* that flying non pickable objects are spell objects.	1375	* that flying non pickable objects are spell objects.
1324	*/	1376	*/
1325	for (top = ms.bot; top; top = top->above)	1377	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1326	{	1378	{
1327	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1379	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1328	floor = top;	1380	floor = tmp;
1329		1381
1330	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1382	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1331	{	1383	{
1332	/* We insert above top, so we want this object below this */	1384	/* We insert above top, so we want this object below this */
1333	top = top->below;	1385	top = tmp->below;
1334	break;	1386	break;
1335	}	1387	}
1336		1388
1337	last = top;	1389	top = tmp;
1338	}	1390	}
1339
1340	/* Don't want top to be NULL, so set it to the last valid object */
1341	top = last;
1342		1391
1343	/* We let update_position deal with figuring out what the space	1392	/* We let update_position deal with figuring out what the space
1344	* looks like instead of lots of conditions here.	1393	* looks like instead of lots of conditions here.
1345	* makes things faster, and effectively the same result.	1394	* makes things faster, and effectively the same result.
1346	*/	1395	*/
…		…
1353	*/	1402	*/
1354	if (!(flag & INS_ON_TOP)	1403	if (!(flag & INS_ON_TOP)
1355	&& ms.flags () & P_BLOCKSVIEW	1404	&& ms.flags () & P_BLOCKSVIEW
1356	&& (op->face && !faces [op->face].visibility))	1405	&& (op->face && !faces [op->face].visibility))
1357	{	1406	{
		1407	object *last;
		1408
1358	for (last = top; last != floor; last = last->below)	1409	for (last = top; last != floor; last = last->below)
1359	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1410	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1360	break;	1411	break;
1361		1412
1362	/* Check to see if we found the object that blocks view,	1413	/* Check to see if we found the object that blocks view,
…		…
1370	} /* If objects on this space */	1421	} /* If objects on this space */
1371		1422
1372	if (flag & INS_ABOVE_FLOOR_ONLY)	1423	if (flag & INS_ABOVE_FLOOR_ONLY)
1373	top = floor;	1424	top = floor;
1374		1425
1375	/* Top is the object that our object (op) is going to get inserted above.	1426	// insert object above top, or bottom-most if top = 0
1376	*/
1377
1378	/* First object on this space */
1379	if (!top)	1427	if (!top)
1380	{	1428	{
		1429	op->below = 0;
1381	op->above = ms.bot;	1430	op->above = ms.bot;
1382
1383	if (op->above)
1384	op->above->below = op;
1385
1386	op->below = 0;
1387	ms.bot = op;	1431	ms.bot = op;
		1432
		1433	*(op->above ? &op->above->below : &ms.top) = op;
1388	}	1434	}
1389	else	1435	else
1390	{ /* get inserted into the stack above top */	1436	{
1391	op->above = top->above;	1437	op->above = top->above;
1392
1393	if (op->above)
1394	op->above->below = op;	1438	top->above = op;
1395		1439
1396	op->below = top;	1440	op->below = top;
1397	top->above = op;	1441	*(op->above ? &op->above->below : &ms.top) = op;
1398	}	1442	}
		1443	}
1399		1444
1400	if (!op->above)	1445	if (op->is_player ())
1401	ms.top = op;
1402	} /* else not INS_BELOW_ORIGINATOR */
1403
1404	if (op->type == PLAYER)
1405	{	1446	{
1406	op->contr->do_los = 1;	1447	op->contr->do_los = 1;
1407	++op->map->players;	1448	++op->map->players;
1408	op->map->touch ();	1449	op->map->touch ();
1409	}	1450	}
1410		1451
1411	op->map->dirty = true;	1452	op->map->dirty = true;
1412		1453
1413	if (object *pl = ms.player ())	1454	if (object *pl = ms.player ())
		1455	//TODO: the floorbox prev/next might need updating
		1456	//esrv_send_item (pl, op);
		1457	//TODO: update floorbox to preserve ordering
		1458	if (pl->contr->ns)
1414	pl->contr->ns->floorbox_update ();	1459	pl->contr->ns->floorbox_update ();
1415		1460
1416	/* If this object glows, it may affect lighting conditions that are	1461	/* If this object glows, it may affect lighting conditions that are
1417	* visible to others on this map. But update_all_los is really	1462	* visible to others on this map. But update_all_los is really
1418	* an inefficient way to do this, as it means los for all players	1463	* an inefficient way to do this, as it means los for all players
1419	* on the map will get recalculated. The players could very well	1464	* on the map will get recalculated. The players could very well
1420	* be far away from this change and not affected in any way -	1465	* be far away from this change and not affected in any way -
1421	* this should get redone to only look for players within range,	1466	* this should get redone to only look for players within range,
1422	* or just updating the P_UPTODATE for spaces within this area	1467	* or just updating the P_UPTODATE for spaces within this area
1423	* of effect may be sufficient.	1468	* of effect may be sufficient.
1424	*/	1469	*/
1425	if (op->map->darkness && (op->glow_radius != 0))	1470	if (op->affects_los ())
		1471	{
		1472	op->ms ().invalidate ();
1426	update_all_los (op->map, op->x, op->y);	1473	update_all_los (op->map, op->x, op->y);
		1474	}
1427		1475
1428	/* updates flags (blocked, alive, no magic, etc) for this map space */	1476	/* updates flags (blocked, alive, no magic, etc) for this map space */
1429	update_object (op, UP_OBJ_INSERT);	1477	update_object (op, UP_OBJ_INSERT);
1430		1478
1431	INVOKE_OBJECT (INSERT, op);	1479	INVOKE_OBJECT (INSERT, op);
…		…
1438	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1439	* update_object().	1487	* update_object().
1440	*/	1488	*/
1441		1489
1442	/* if this is not the head or flag has been passed, don't check walk on status */	1490	/* if this is not the head or flag has been passed, don't check walk on status */
1443	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1491	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1444	{	1492	{
1445	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1446	return 0;	1494	return 0;
1447		1495
1448	/* If we are a multi part object, lets work our way through the check	1496	/* If we are a multi part object, lets work our way through the check
…		…
1459	/* this function inserts an object in the map, but if it	1507	/* this function inserts an object in the map, but if it
1460	* finds an object of its own type, it'll remove that one first.	1508	* finds an object of its own type, it'll remove that one first.
1461	* op is the object to insert it under: supplies x and the map.	1509	* op is the object to insert it under: supplies x and the map.
1462	*/	1510	*/
1463	void	1511	void
1464	replace_insert_ob_in_map (const char *arch_string, object *op)	1512	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1465	{	1513	{
1466	object *tmp, *tmp1;
1467
1468	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1469		1515
1470	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1517	if (tmp->arch->archname == archname) /* same archetype */
1472	tmp->destroy ();	1518	tmp->destroy ();
1473		1519
1474	tmp1 = arch_to_object (archetype::find (arch_string));	1520	object *tmp = arch_to_object (archetype::find (archname));
1475		1521
1476	tmp1->x = op->x;	1522	tmp->x = op->x;
1477	tmp1->y = op->y;	1523	tmp->y = op->y;
		1524
1478	insert_ob_in_map (tmp1, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
1479	}	1526	}
1480		1527
1481	object *	1528	object *
1482	object::insert_at (object *where, object *originator, int flags)	1529	object::insert_at (object *where, object *originator, int flags)
1483	{	1530	{
…		…
1486	else	1533	else
1487	return where->map->insert (this, where->x, where->y, originator, flags);	1534	return where->map->insert (this, where->x, where->y, originator, flags);
1488	}	1535	}
1489		1536
1490	/*	1537	/*
1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1492	* is returned contains nr objects, and the remaining parts contains
1493	* the rest (or is removed and freed if that number is 0).
1494	* On failure, NULL is returned, and the reason put into the
1495	* global static errmsg array.
1496	*/
1497	object *
1498	get_split_ob (object *orig_ob, uint32 nr)
1499	{
1500	object *newob;
1501	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1502
1503	if (orig_ob->nrof < nr)
1504	{
1505	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1506	return NULL;
1507	}
1508
1509	newob = object_create_clone (orig_ob);
1510
1511	if ((orig_ob->nrof -= nr) < 1)
1512	orig_ob->destroy (1);
1513	else if (!is_removed)
1514	{
1515	if (orig_ob->env != NULL)
1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1517	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1518	{
1519	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1520	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1521	return NULL;
1522	}
1523	}
1524
1525	newob->nrof = nr;
1526
1527	return newob;
1528	}
1529
1530	/*
1531	* decrease_ob_nr(object, number) decreases a specified number from	1538	* decrease(object, number) decreases a specified number from
1532	* the amount of an object. If the amount reaches 0, the object	1539	* the amount of an object. If the amount reaches 0, the object
1533	* is subsequently removed and freed.	1540	* is subsequently removed and freed.
1534	*	1541	*
1535	* Return value: 'op' if something is left, NULL if the amount reached 0	1542	* Return value: 'op' if something is left, NULL if the amount reached 0
1536	*/	1543	*/
		1544	bool
		1545	object::decrease (sint32 nr)
		1546	{
		1547	if (!nr)
		1548	return true;
		1549
		1550	nr = min (nr, nrof);
		1551
		1552	if (nrof > nr)
		1553	{
		1554	nrof -= nr;
		1555	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1556
		1557	if (object *pl = visible_to ())
		1558	esrv_update_item (UPD_NROF, pl, this);
		1559
		1560	return true;
		1561	}
		1562	else
		1563	{
		1564	destroy ();
		1565	return false;
		1566	}
		1567	}
		1568
		1569	/*
		1570	* split(ob,nr) splits up ob into two parts. The part which
		1571	* is returned contains nr objects, and the remaining parts contains
		1572	* the rest (or is removed and returned if that number is 0).
		1573	* On failure, NULL is returned.
		1574	*/
1537	object *	1575	object *
1538	decrease_ob_nr (object *op, uint32 i)	1576	object::split (sint32 nr)
1539	{	1577	{
1540	object *tmp;	1578	int have = number_of ();
1541		1579
1542	if (i == 0) /* objects with op->nrof require this check */	1580	if (have < nr)
1543	return op;	1581	return 0;
1544		1582	else if (have == nr)
1545	if (i > op->nrof)
1546	i = op->nrof;
1547
1548	if (QUERY_FLAG (op, FLAG_REMOVED))
1549	op->nrof -= i;
1550	else if (op->env)
1551	{	1583	{
1552	/* is this object in the players inventory, or sub container
1553	* therein?
1554	*/
1555	tmp = op->in_player ();
1556	/* nope. Is this a container the player has opened?
1557	* If so, set tmp to that player.
1558	* IMO, searching through all the players will mostly
1559	* likely be quicker than following op->env to the map,
1560	* and then searching the map for a player.
1561	*/
1562	if (!tmp)
1563	for_all_players (pl)
1564	if (pl->ob->container == op->env)
1565	{
1566	tmp = pl->ob;
1567	break;
1568	}
1569
1570	if (i < op->nrof)
1571	{
1572	sub_weight (op->env, op->weight * i);
1573	op->nrof -= i;
1574	if (tmp)
1575	esrv_send_item (tmp, op);
1576	}
1577	else
1578	{
1579	op->remove ();	1584	remove ();
1580	op->nrof = 0;	1585	return this;
1581	if (tmp)
1582	esrv_del_item (tmp->contr, op->count);
1583	}
1584	}	1586	}
1585	else	1587	else
1586	{	1588	{
1587	object *above = op->above;	1589	decrease (nr);
1588		1590
1589	if (i < op->nrof)	1591	object *op = deep_clone ();
1590	op->nrof -= i;	1592	op->nrof = nr;
1591	else
1592	{
1593	op->remove ();
1594	op->nrof = 0;
1595	}
1596
1597	/* Since we just removed op, op->above is null */
1598	for (tmp = above; tmp; tmp = tmp->above)
1599	if (tmp->type == PLAYER)
1600	{
1601	if (op->nrof)
1602	esrv_send_item (tmp, op);
1603	else
1604	esrv_del_item (tmp->contr, op->count);
1605	}
1606	}
1607
1608	if (op->nrof)
1609	return op;	1593	return op;
1610	else
1611	{
1612	op->destroy ();
1613	return 0;
1614	}
1615	}
1616
1617	/*
1618	* add_weight(object, weight) adds the specified weight to an object,
1619	* and also updates how much the environment(s) is/are carrying.
1620	*/
1621	void
1622	add_weight (object *op, signed long weight)
1623	{
1624	while (op != NULL)
1625	{
1626	if (op->type == CONTAINER)
1627	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1628
1629	op->carrying += weight;
1630	op = op->env;
1631	}	1594	}
1632	}	1595	}
1633		1596
1634	object *	1597	object *
1635	insert_ob_in_ob (object *op, object *where)	1598	insert_ob_in_ob (object *op, object *where)
…		…
1660	* be != op, if items are merged. -Tero	1623	* be != op, if items are merged. -Tero
1661	*/	1624	*/
1662	object *	1625	object *
1663	object::insert (object *op)	1626	object::insert (object *op)
1664	{	1627	{
1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1666	op->remove ();
1667
1668	if (op->more)	1628	if (op->more)
1669	{	1629	{
1670	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1630	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1671	return op;	1631	return op;
1672	}	1632	}
1673		1633
1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1634	op->remove ();
1675	CLEAR_FLAG (op, FLAG_REMOVED);	1635
		1636	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676		1637
1677	if (op->nrof)	1638	if (op->nrof)
1678	{
1679	for (object *tmp = inv; tmp; tmp = tmp->below)	1639	for (object *tmp = inv; tmp; tmp = tmp->below)
1680	if (object::can_merge (tmp, op))	1640	if (object::can_merge (tmp, op))
1681	{	1641	{
1682	/* return the original object and remove inserted object	1642	/* return the original object and remove inserted object
1683	(client needs the original object) */	1643	(client needs the original object) */
1684	tmp->nrof += op->nrof;	1644	tmp->nrof += op->nrof;
1685	/* Weight handling gets pretty funky. Since we are adding to	1645
1686	* tmp->nrof, we need to increase the weight.	1646	if (object *pl = tmp->visible_to ())
1687	*/	1647	esrv_update_item (UPD_NROF, pl, tmp);
		1648
1688	add_weight (this, op->weight * op->nrof);	1649	adjust_weight (this, op->total_weight ());
1689	SET_FLAG (op, FLAG_REMOVED);	1650
1690	op->destroy (); /* free the inserted object */	1651	op->destroy ();
1691	op = tmp;	1652	op = tmp;
1692	op->remove (); /* and fix old object's links */	1653	goto inserted;
1693	CLEAR_FLAG (op, FLAG_REMOVED);
1694	break;
1695	}	1654	}
1696		1655
1697	/* I assume combined objects have no inventory
1698	* We add the weight - this object could have just been removed
1699	* (if it was possible to merge). calling remove_ob will subtract
1700	* the weight, so we need to add it in again, since we actually do
1701	* the linking below
1702	*/
1703	add_weight (this, op->weight * op->nrof);
1704	}
1705	else
1706	add_weight (this, (op->weight + op->carrying));
1707
1708	if (object *otmp = this->in_player ())
1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710	otmp->update_stats ();
1711
1712	op->owner = 0; // its his/hers now. period.	1656	op->owner = 0; // it's his/hers now. period.
1713	op->map = 0;	1657	op->map = 0;
		1658	op->x = 0;
		1659	op->y = 0;
		1660
		1661	op->above = 0;
		1662	op->below = inv;
1714	op->env = this;	1663	op->env = this;
1715	op->above = 0;
1716	op->below = 0;
1717	op->x = op->y = 0;
1718		1664
		1665	if (inv)
		1666	inv->above = op;
		1667
		1668	inv = op;
		1669
		1670	op->flag [FLAG_REMOVED] = 0;
		1671
		1672	if (object *pl = op->visible_to ())
		1673	esrv_send_item (pl, op);
		1674
		1675	adjust_weight (this, op->total_weight ());
		1676
		1677	inserted:
1719	/* reset the light list and los of the players on the map */	1678	/* reset the light list and los of the players on the map */
1720	if (op->glow_radius && map)	1679	if (op->glow_radius && is_on_map ())
1721	{	1680	{
1722	#ifdef DEBUG_LIGHTS	1681	update_stats ();
1723	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1724	#endif /* DEBUG_LIGHTS */
1725	if (map->darkness)
1726	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1727	}
1728
1729	/* Client has no idea of ordering so lets not bother ordering it here.
1730	* It sure simplifies this function...
1731	*/
1732	if (!inv)
1733	inv = op;
1734	else
1735	{	1683	}
1736	op->below = inv;	1684	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1737	op->below->above = op;	1685	// if this is a player's inventory, update stats
1738	inv = op;	1686	update_stats ();
1739	}
1740		1687
1741	INVOKE_OBJECT (INSERT, this);	1688	INVOKE_OBJECT (INSERT, this);
1742		1689
1743	return op;	1690	return op;
1744	}	1691	}
…		…
1764	* on top.	1711	* on top.
1765	*/	1712	*/
1766	int	1713	int
1767	check_move_on (object *op, object *originator)	1714	check_move_on (object *op, object *originator)
1768	{	1715	{
		1716	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1717	return 0;
		1718
1769	object *tmp;	1719	object *tmp;
1770	maptile *m = op->map;	1720	maptile *m = op->map;
1771	int x = op->x, y = op->y;	1721	int x = op->x, y = op->y;
1772		1722
1773	MoveType move_on, move_slow, move_block;	1723	mapspace &ms = m->at (x, y);
1774		1724
1775	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1725	ms.update ();
1776	return 0;
1777		1726
1778	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1727	MoveType move_on = ms.move_on;
1779	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1728	MoveType move_slow = ms.move_slow;
1780	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1729	MoveType move_block = ms.move_block;
1781		1730
1782	/* if nothing on this space will slow op down or be applied,	1731	/* if nothing on this space will slow op down or be applied,
1783	* no need to do checking below. have to make sure move_type	1732	* no need to do checking below. have to make sure move_type
1784	* is set, as lots of objects don't have it set - we treat that	1733	* is set, as lots of objects don't have it set - we treat that
1785	* as walking.	1734	* as walking.
…		…
1796	return 0;	1745	return 0;
1797		1746
1798	/* The objects have to be checked from top to bottom.	1747	/* The objects have to be checked from top to bottom.
1799	* Hence, we first go to the top:	1748	* Hence, we first go to the top:
1800	*/	1749	*/
1801		1750	for (object *next, *tmp = ms.top; tmp; tmp = next)
1802	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1803	{
1804	/* Trim the search when we find the first other spell effect
1805	* this helps performance so that if a space has 50 spell objects,
1806	* we don't need to check all of them.
1807	*/
1808	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1809	break;
1810	}	1751	{
		1752	next = tmp->below;
1811		1753
1812	for (; tmp; tmp = tmp->below)
1813	{
1814	if (tmp == op)	1754	if (tmp == op)
1815	continue; /* Can't apply yourself */	1755	continue; /* Can't apply yourself */
1816		1756
1817	/* Check to see if one of the movement types should be slowed down.	1757	/* Check to see if one of the movement types should be slowed down.
1818	* Second check makes sure that the movement types not being slowed	1758	* Second check makes sure that the movement types not being slowed
…		…
1823	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1763	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1824	{	1764	{
1825	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1765	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1826	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1766	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1827	{	1767	{
1828
1829	float
1830	diff = tmp->move_slow_penalty * fabs (op->speed);	1768	float diff = tmp->move_slow_penalty * fabs (op->speed);
1831		1769
1832	if (op->type == PLAYER)	1770	if (op->is_player ())
1833	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1771	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1834	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1772	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1835	diff /= 4.0;	1773	diff /= 4.0;
1836		1774
1837	op->speed_left -= diff;	1775	op->speed_left -= diff;
1838	}	1776	}
1839	}	1777	}
…		…
1872	LOG (llevError, "Present_arch called outside map.\n");	1810	LOG (llevError, "Present_arch called outside map.\n");
1873	return NULL;	1811	return NULL;
1874	}	1812	}
1875		1813
1876	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1814	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->arch == at)	1815	if (tmp->arch->archname == at->archname)
1878	return tmp;	1816	return tmp;
1879		1817
1880	return NULL;	1818	return NULL;
1881	}	1819	}
1882		1820
…		…
1946	* The first matching object is returned, or NULL if none.	1884	* The first matching object is returned, or NULL if none.
1947	*/	1885	*/
1948	object *	1886	object *
1949	present_arch_in_ob (const archetype *at, const object *op)	1887	present_arch_in_ob (const archetype *at, const object *op)
1950	{	1888	{
1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1889	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1952	if (tmp->arch == at)	1890	if (tmp->arch->archname == at->archname)
1953	return tmp;	1891	return tmp;
1954		1892
1955	return NULL;	1893	return NULL;
1956	}	1894	}
1957		1895
…		…
2045	* head of the object should correspond for the entire object.	1983	* head of the object should correspond for the entire object.
2046	*/	1984	*/
2047	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1985	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2048	continue;	1986	continue;
2049		1987
2050	if (ob->blocked (m, pos.x, pos.y))	1988	if (ob->blocked (pos.m, pos.x, pos.y))
2051	continue;	1989	continue;
2052		1990
2053	altern [index++] = i;	1991	altern [index++] = i;
2054	}	1992	}
2055		1993
…		…
2123	* there is capable of.	2061	* there is capable of.
2124	*/	2062	*/
2125	int	2063	int
2126	find_dir (maptile *m, int x, int y, object *exclude)	2064	find_dir (maptile *m, int x, int y, object *exclude)
2127	{	2065	{
2128	int i, max = SIZEOFFREE, mflags;	2066	int max = SIZEOFFREE, mflags;
2129
2130	sint16 nx, ny;
2131	object *tmp;
2132	maptile *mp;
2133
2134	MoveType blocked, move_type;	2067	MoveType move_type;
2135		2068
2136	if (exclude && exclude->head_ () != exclude)	2069	if (exclude && exclude->head_ () != exclude)
2137	{	2070	{
2138	exclude = exclude->head;	2071	exclude = exclude->head;
2139	move_type = exclude->move_type;	2072	move_type = exclude->move_type;
…		…
2142	{	2075	{
2143	/* If we don't have anything, presume it can use all movement types. */	2076	/* If we don't have anything, presume it can use all movement types. */
2144	move_type = MOVE_ALL;	2077	move_type = MOVE_ALL;
2145	}	2078	}
2146		2079
2147	for (i = 1; i < max; i++)	2080	for (int i = 1; i < max; i++)
2148	{	2081	{
2149	mp = m;	2082	mapxy pos (m, x, y);
2150	nx = x + freearr_x[i];	2083	pos.move (i);
2151	ny = y + freearr_y[i];
2152		2084
2153	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2085	if (!pos.normalise ())
2154
2155	if (mflags & P_OUT_OF_MAP)
2156	max = maxfree[i];	2086	max = maxfree[i];
2157	else	2087	else
2158	{	2088	{
2159	mapspace &ms = mp->at (nx, ny);	2089	mapspace &ms = *pos;
2160		2090
2161	blocked = ms.move_block;
2162
2163	if ((move_type & blocked) == move_type)	2091	if ((move_type & ms.move_block) == move_type)
2164	max = maxfree[i];	2092	max = maxfree [i];
2165	else if (mflags & P_IS_ALIVE)	2093	else if (ms.flags () & P_IS_ALIVE)
2166	{	2094	{
2167	for (tmp = ms.bot; tmp; tmp = tmp->above)	2095	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2168	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2096	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2169	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2097	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2170	break;
2171
2172	if (tmp)
2173	return freedir[i];	2098	return freedir [i];
2174	}	2099	}
2175	}	2100	}
2176	}	2101	}
2177		2102
2178	return 0;	2103	return 0;
…		…
2253	* This basically means that if direction is 15, then it could either go	2178	* This basically means that if direction is 15, then it could either go
2254	* direction 4, 14, or 16 to get back to where we are.	2179	* direction 4, 14, or 16 to get back to where we are.
2255	* Moved from spell_util.c to object.c with the other related direction	2180	* Moved from spell_util.c to object.c with the other related direction
2256	* functions.	2181	* functions.
2257	*/	2182	*/
2258	int reduction_dir[SIZEOFFREE][3] = {	2183	const int reduction_dir[SIZEOFFREE][3] = {
2259	{0, 0, 0}, /* 0 */	2184	{0, 0, 0}, /* 0 */
2260	{0, 0, 0}, /* 1 */	2185	{0, 0, 0}, /* 1 */
2261	{0, 0, 0}, /* 2 */	2186	{0, 0, 0}, /* 2 */
2262	{0, 0, 0}, /* 3 */	2187	{0, 0, 0}, /* 3 */
2263	{0, 0, 0}, /* 4 */	2188	{0, 0, 0}, /* 4 */
…		…
2359	int	2284	int
2360	can_pick (const object *who, const object *item)	2285	can_pick (const object *who, const object *item)
2361	{	2286	{
2362	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2287	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2288	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2364	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2289	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2365	}	2290	}
2366		2291
2367	/*	2292	/*
2368	* create clone from object to another	2293	* create clone from object to another
2369	*/	2294	*/
2370	object *	2295	object *
2371	object_create_clone (object *asrc)	2296	object::deep_clone ()
2372	{	2297	{
2373	object *dst = 0, *tmp, *src, *prev, *item;	2298	assert (("deep_clone called on non-head object", is_head ()));
2374		2299
2375	if (!asrc)	2300	object *dst = clone ();
2376	return 0;
2377		2301
2378	src = asrc->head_ ();	2302	object *prev = dst;
2379
2380	prev = 0;
2381	for (object *part = src; part; part = part->more)	2303	for (object *part = this->more; part; part = part->more)
2382	{	2304	{
2383	tmp = part->clone ();	2305	object *tmp = part->clone ();
2384	tmp->x -= src->x;
2385	tmp->y -= src->y;
2386
2387	if (!part->head)
2388	{
2389	dst = tmp;
2390	tmp->head = 0;
2391	}
2392	else
2393	tmp->head = dst;	2306	tmp->head = dst;
2394
2395	tmp->more = 0;
2396
2397	if (prev)
2398	prev->more = tmp;	2307	prev->more = tmp;
2399
2400	prev = tmp;	2308	prev = tmp;
2401	}	2309	}
2402		2310
2403	for (item = src->inv; item; item = item->below)	2311	for (object *item = inv; item; item = item->below)
2404	insert_ob_in_ob (object_create_clone (item), dst);	2312	insert_ob_in_ob (item->deep_clone (), dst);
2405		2313
2406	return dst;	2314	return dst;
2407	}	2315	}
2408		2316
2409	/* This returns the first object in who's inventory that	2317	/* This returns the first object in who's inventory that
…		…
2418	return tmp;	2326	return tmp;
2419		2327
2420	return 0;	2328	return 0;
2421	}	2329	}
2422		2330
2423	/* If ob has a field named key, return the link from the list,	2331	shstr_tmp
2424	* otherwise return NULL.	2332	object::kv_get (shstr_tmp key) const
2425	*
2426	* key must be a passed in shared string - otherwise, this won't
2427	* do the desired thing.
2428	*/
2429	key_value *
2430	get_ob_key_link (const object *ob, const char *key)
2431	{	2333	{
2432	for (key_value *link = ob->key_values; link; link = link->next)	2334	for (key_value *kv = key_values; kv; kv = kv->next)
2433	if (link->key == key)	2335	if (kv->key == key)
2434	return link;
2435
2436	return 0;
2437	}
2438
2439	/*
2440	* Returns the value of op has an extra_field for key, or NULL.
2441	*
2442	* The argument doesn't need to be a shared string.
2443	*
2444	* The returned string is shared.
2445	*/
2446	const char *
2447	get_ob_key_value (const object *op, const char *const key)
2448	{
2449	key_value *link;
2450	shstr_cmp canonical_key (key);
2451
2452	if (!canonical_key)
2453	{
2454	/* 1. There being a field named key on any object
2455	* implies there'd be a shared string to find.
2456	* 2. Since there isn't, no object has this field.
2457	* 3. Therefore, *this* object doesn't have this field.
2458	*/
2459	return 0;
2460	}
2461
2462	/* This is copied from get_ob_key_link() above -
2463	* only 4 lines, and saves the function call overhead.
2464	*/
2465	for (link = op->key_values; link; link = link->next)
2466	if (link->key == canonical_key)
2467	return link->value;	2336	return kv->value;
2468		2337
2469	return 0;	2338	return shstr ();
2470	}	2339	}
2471		2340
2472	/*	2341	void
2473	* Updates the canonical_key in op to value.	2342	object::kv_set (shstr_tmp key, shstr_tmp value)
2474	*
2475	* canonical_key is a shared string (value doesn't have to be).
2476	*
2477	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2478	* keys.
2479	*
2480	* Returns TRUE on success.
2481	*/
2482	int
2483	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2484	{	2343	{
2485	key_value *field = NULL, *last = NULL;	2344	for (key_value *kv = key_values; kv; kv = kv->next)
2486		2345	if (kv->key == key)
2487	for (field = op->key_values; field != NULL; field = field->next)
2488	{
2489	if (field->key != canonical_key)
2490	{	2346	{
2491	last = field;	2347	kv->value = value;
2492	continue;	2348	return;
2493	}	2349	}
2494		2350
2495	if (value)	2351	key_value *kv = new key_value;
2496	field->value = value;	2352
2497	else	2353	kv->next = key_values;
		2354	kv->key = key;
		2355	kv->value = value;
		2356
		2357	key_values = kv;
		2358	}
		2359
		2360	void
		2361	object::kv_del (shstr_tmp key)
		2362	{
		2363	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2364	if ((*kvp)->key == key)
2498	{	2365	{
2499	/* Basically, if the archetype has this key set,	2366	key_value *kv = *kvp;
2500	* we need to store the null value so when we save	2367	*kvp = (*kvp)->next;
2501	* it, we save the empty value so that when we load,	2368	delete kv;
2502	* we get this value back again.	2369	return;
2503	*/
2504	if (get_ob_key_link (op->arch, canonical_key))
2505	field->value = 0;
2506	else
2507	{
2508	if (last)
2509	last->next = field->next;
2510	else
2511	op->key_values = field->next;
2512
2513	delete field;
2514	}
2515	}	2370	}
2516	return TRUE;
2517	}
2518	/* IF we get here, key doesn't exist */
2519
2520	/* No field, we'll have to add it. */
2521
2522	if (!add_key)
2523	return FALSE;
2524
2525	/* There isn't any good reason to store a null
2526	* value in the key/value list. If the archetype has
2527	* this key, then we should also have it, so shouldn't
2528	* be here. If user wants to store empty strings,
2529	* should pass in ""
2530	*/
2531	if (value == NULL)
2532	return TRUE;
2533
2534	field = new key_value;
2535
2536	field->key = canonical_key;
2537	field->value = value;
2538	/* Usual prepend-addition. */
2539	field->next = op->key_values;
2540	op->key_values = field;
2541
2542	return TRUE;
2543	}
2544
2545	/*
2546	* Updates the key in op to value.
2547	*
2548	* If add_key is FALSE, this will only update existing keys,
2549	* and not add new ones.
2550	* In general, should be little reason FALSE is ever passed in for add_key
2551	*
2552	* Returns TRUE on success.
2553	*/
2554	int
2555	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2556	{
2557	shstr key_ (key);
2558
2559	return set_ob_key_value_s (op, key_, value, add_key);
2560	}	2371	}
2561		2372
2562	object::depth_iterator::depth_iterator (object *container)	2373	object::depth_iterator::depth_iterator (object *container)
2563	: iterator_base (container)	2374	: iterator_base (container)
2564	{	2375	{
…		…
2614	{	2425	{
2615	char flagdesc[512];	2426	char flagdesc[512];
2616	char info2[256 * 4];	2427	char info2[256 * 4];
2617	char *p = info;	2428	char *p = info;
2618		2429
2619	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2430	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2620	count,	2431	count,
2621	uuid.c_str (),	2432	uuid.c_str (),
2622	&name,	2433	&name,
2623	title ? "\",title:\"" : "",	2434	title ? ",title:\"" : "",
2624	title ? (const char *)title : "",	2435	title ? (const char *)title : "",
		2436	title ? "\"" : "",
2625	flag_desc (flagdesc, 512), type);	2437	flag_desc (flagdesc, 512), type);
2626		2438
2627	if (!this->flag[FLAG_REMOVED] && env)	2439	if (!flag[FLAG_REMOVED] && env)
2628	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2440	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2629		2441
2630	if (map)	2442	if (map)
2631	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2443	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2632		2444
…		…
2662	object::open_container (object *new_container)	2474	object::open_container (object *new_container)
2663	{	2475	{
2664	if (container == new_container)	2476	if (container == new_container)
2665	return;	2477	return;
2666		2478
2667	if (object *old_container = container)	2479	object *old_container = container;
		2480
		2481	if (old_container)
2668	{	2482	{
2669	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2483	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2670	return;	2484	return;
2671		2485
2672	#if 0	2486	#if 0
…		…
2674	if (object *closer = old_container->inv)	2488	if (object *closer = old_container->inv)
2675	if (closer->type == CLOSE_CON)	2489	if (closer->type == CLOSE_CON)
2676	closer->destroy ();	2490	closer->destroy ();
2677	#endif	2491	#endif
2678		2492
		2493	// make sure the container is available
		2494	esrv_send_item (this, old_container);
		2495
2679	old_container->flag [FLAG_APPLIED] = 0;	2496	old_container->flag [FLAG_APPLIED] = false;
2680	container = 0;	2497	container = 0;
2681		2498
		2499	// client needs item update to make it work, client bug requires this to be separate
2682	esrv_update_item (UPD_FLAGS, this, old_container);	2500	esrv_update_item (UPD_FLAGS, this, old_container);
		2501
2683	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2684	play_sound (sound_find ("chest_close"));	2503	play_sound (sound_find ("chest_close"));
2685	}	2504	}
2686		2505
2687	if (new_container)	2506	if (new_container)
2688	{	2507	{
…		…
2698	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2517	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2699	new_container->insert (closer);	2518	new_container->insert (closer);
2700	}	2519	}
2701	#endif	2520	#endif
2702		2521
2703	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2704		2523
		2524	// make sure the container is available, client bug requires this to be separate
		2525	esrv_send_item (this, new_container);
		2526
2705	new_container->flag [FLAG_APPLIED] = 1;	2527	new_container->flag [FLAG_APPLIED] = true;
2706	container = new_container;	2528	container = new_container;
2707		2529
		2530	// client needs flag change
2708	esrv_update_item (UPD_FLAGS, this, new_container);	2531	esrv_update_item (UPD_FLAGS, this, new_container);
2709	esrv_send_inventory (this, new_container);	2532	esrv_send_inventory (this, new_container);
2710	play_sound (sound_find ("chest_open"));	2533	play_sound (sound_find ("chest_open"));
2711	}	2534	}
		2535	// else if (!old_container->env && contr && contr->ns)
		2536	// contr->ns->floorbox_reset ();
2712	}	2537	}
2713		2538
2714	object *	2539	object *
2715	object::force_find (const shstr name)	2540	object::force_find (shstr_tmp name)
2716	{	2541	{
2717	/* cycle through his inventory to look for the MARK we want to	2542	/* cycle through his inventory to look for the MARK we want to
2718	* place	2543	* place
2719	*/	2544	*/
2720	for (object *tmp = inv; tmp; tmp = tmp->below)	2545	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2723		2548
2724	return 0;	2549	return 0;
2725	}	2550	}
2726		2551
2727	void	2552	void
		2553	object::force_set_timer (int duration)
		2554	{
		2555	this->duration = 1;
		2556	this->speed_left = -1.f;
		2557
		2558	this->set_speed (duration ? 1.f / duration : 0.f);
		2559	}
		2560
		2561	object *
2728	object::force_add (const shstr name, int duration)	2562	object::force_add (shstr_tmp name, int duration)
2729	{	2563	{
2730	if (object *force = force_find (name))	2564	if (object *force = force_find (name))
2731	force->destroy ();	2565	force->destroy ();
2732		2566
2733	object *force = get_archetype (FORCE_NAME);	2567	object *force = get_archetype (FORCE_NAME);
2734		2568
2735	force->slaying = name;	2569	force->slaying = name;
2736	force->stats.food = 1;
2737	force->speed_left = -1.f;
2738		2570
2739	force->set_speed (duration ? 1.f / duration : 0.f);	2571	force->force_set_timer (duration);
2740	force->flag [FLAG_IS_USED_UP] = true;	2572
2741	force->flag [FLAG_APPLIED] = true;	2573	force->flag [FLAG_APPLIED] = true;
2742		2574
2743	insert (force);	2575	return insert (force);
2744	}	2576	}
2745		2577
2746	void	2578	void
2747	object::play_sound (faceidx sound) const	2579	object::play_sound (faceidx sound) const
2748	{	2580	{
2749	if (!sound)	2581	if (!sound)
2750	return;	2582	return;
2751		2583
2752	if (flag [FLAG_REMOVED])	2584	if (is_on_map ())
		2585	map->play_sound (sound, x, y);
		2586	else if (object *pl = in_player ())
		2587	pl->contr->play_sound (sound);
		2588	}
		2589
		2590	void
		2591	object::say_msg (const char *msg) const
		2592	{
		2593	if (is_on_map ())
		2594	map->say_msg (msg, x, y);
		2595	else if (object *pl = in_player ())
		2596	pl->contr->play_sound (sound);
		2597	}
		2598
		2599	void
		2600	object::make_noise ()
		2601	{
		2602	// we do not model noise in the map, so instead put
		2603	// a temporary light into the noise source
		2604	// could use the map instead, but that's less reliable for our
		2605	// goal, which is to make invisibility a bit harder to exploit
		2606
		2607	// currently only works sensibly for players
		2608	if (!is_player ())
2753	return;	2609	return;
2754		2610
2755	if (env)	2611	// find old force, or create new one
2756	{	2612	object *force = force_find (shstr_noise_force);
2757	if (object *pl = in_player ())	2613
2758	pl->contr->play_sound (sound);	2614	if (force)
2759	}	2615	force->speed_left = -1.f; // patch old speed up
2760	else	2616	else
2761	map->play_sound (sound, x, y);	2617	{
2762	}	2618	force = archetype::get (shstr_noise_force);
2763		2619
		2620	force->slaying = shstr_noise_force;
		2621	force->stats.food = 1;
		2622	force->speed_left = -1.f;
		2623
		2624	force->set_speed (1.f / 4.f);
		2625	force->flag [FLAG_IS_USED_UP] = true;
		2626	force->flag [FLAG_APPLIED] = true;
		2627
		2628	insert (force);
		2629	}
		2630	}
		2631

Diff Legend

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