[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.226 by root, Sat May 3 08:50:30 2008 UTC vs.
Revision 1.289 by root, Sun Oct 11 05:31:54 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,2008 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
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
40		41
41	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
139		140
140	/* 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. */
141	static bool	142	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	143	compare_ob_value_lists_one (const object wants, const object has)
143	{	144	{
144	key_value *wants_field;
145
146	/* 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
147	* 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
148	* different structure or at least keep the lists sorted...	147	* different structure or at least keep the lists sorted...
149	*/	148	*/
150		149
151	/* For each field in wants, */	150	/* For each field in wants, */
152	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)
153	{	152	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	153	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		154
169	/* 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. */
170	return 1;	156	return true;
171	}	157	}
172		158
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	159	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	160	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	161	compare_ob_value_lists (const object ob1, const object ob2)
176	{	162	{
177	/* 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,
178	* so we need to run the comparison twice. :(	164	* so we need to run the comparison twice. :(
179	*/	165	*/
180	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);
181	}	168	}
182		169
183	/* 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
184	* they can be merged together.	171	* they can be merged together.
185	*	172	*
…		…
200	\|\| ob1->speed != ob2->speed	187	\|\| ob1->speed != ob2->speed
201	\|\| ob1->value != ob2->value	188	\|\| ob1->value != ob2->value
202	\|\| ob1->name != ob2->name)	189	\|\| ob1->name != ob2->name)
203	return 0;	190	return 0;
204		191
205	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2*31-1 /
207	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
208	* nrof values.
209	*/
210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	195	return 0;
212		196
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* 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
215	* 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
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		205
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		208
225	if (ob1->arch->name != ob2->arch->name	209	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	210	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	211	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	212	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	213	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	214	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	215	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	216	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	217	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	218	\|\| ob1->value != ob2->value
235	\|\| 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
236	\|\| ob1->client_type != ob2->client_type	221	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	222	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	223	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	224	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	225	\|\| ob1->move_type != ob2->move_type
…		…
248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	234	return 0;
250		235
251	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
255	.any ())	239	.any ())
256	return 0;	240	return 0;
257		241
258	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
340	{	324	{
341	// see if we are in a container of sorts	325	// see if we are in a container of sorts
342	if (env)	326	if (env)
343	{	327	{
344	// the player inventory itself is always visible	328	// the player inventory itself is always visible
345	if (env->type == PLAYER)	329	if (env->is_player ())
346	return env;	330	return env;
347		331
348	// else a player could have our env open	332	// else a player could have our env open
349	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
350		334
351	// the player itself is always on a map, so we will find him here	335	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	336	// even if our inv is in a player.
353	if (envest->is_on_map ())	337	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
358	else	342	else
359	{	343	{
360	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
364	return pl;	349	return pl;
365	}	350	}
366	}	351	}
367		352
368	return 0;	353	return 0;
369	}	354	}
370		355
371	// adjust weight per container type ("of holding")	356	// adjust weight per container type ("of holding")
372	static sint32	357	static sint32
373	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
374	{	359	{
375	return op->type == CONTAINER	360	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	362	: weight;
378	}	363	}
…		…
384	static void	369	static void
385	adjust_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
386	{	371	{
387	while (op)	372	while (op)
388	{	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
389	weight = weight_adjust (op, weight);	376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
390		378
391	if (!weight)	379	if (!weight)
392	return;	380	return;
393		381
394	op->carrying += weight;	382	op->carrying += weight;
…		…
417	op->update_weight ();	405	op->update_weight ();
418		406
419	sum += op->total_weight ();	407	sum += op->total_weight ();
420	}	408	}
421		409
422	sum = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
423		411
424	if (sum != carrying)	412	if (sum != carrying)
425	{	413	{
426	carrying = sum;	414	carrying = sum;
427		415
…		…
441	return strdup ("[NULLOBJ]");	429	return strdup ("[NULLOBJ]");
442		430
443	object_freezer freezer;	431	object_freezer freezer;
444	op->write (freezer);	432	op->write (freezer);
445	return freezer.as_string ();	433	return freezer.as_string ();
		434	}
		435
		436	char *
		437	object::as_string ()
		438	{
		439	return dump_object (this);
446	}	440	}
447		441
448	/*	442	/*
449	* 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
450	* multi-object 1 which is closest to the second object.	444	* multi-object 1 which is closest to the second object.
…		…
489	*/	483	*/
490	object *	484	object *
491	find_object_name (const char *str)	485	find_object_name (const char *str)
492	{	486	{
493	shstr_cmp str_ (str);	487	shstr_cmp str_ (str);
494	object *op;
495		488
		489	if (str_)
496	for_all_objects (op)	490	for_all_objects (op)
497	if (op->name == str_)	491	if (op->name == str_)
498	break;	492	return op;
499		493
500	return op;	494	return 0;
501	}	495	}
502		496
503	/*	497	/*
504	* 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
505	* skill and experience objects.	499	* skill and experience objects.
…		…
567	update_stats ();	561	update_stats ();
568		562
569	new_draw_info_format (NDI_UNIQUE, 0, this,	563	new_draw_info_format (NDI_UNIQUE, 0, this,
570	"You try to balance all your items at once, "	564	"You try to balance all your items at once, "
571	"but the %s is just too much for your body. "	565	"but the %s is just too much for your body. "
572	"[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);
573	return false;	568	return false;
574	}	569	}
575		570
576	//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);
577	}	572	}
…		…
603	}	598	}
604		599
605	op->key_values = 0;	600	op->key_values = 0;
606	}	601	}
607		602
608	object &	603	/*
609	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)
610	{	613	{
611	remove ();	614	dst->remove ();
612
613	(object_copy )this = src;	615	(object_copy )dst = *this;
614
615	flag [FLAG_REMOVED] = true;	616	dst->flag [FLAG_REMOVED] = true;
616		617
617	/* Copy over key_values, if any. */	618	/* Copy over key_values, if any. */
618	if (src.key_values)	619	if (key_values)
619	{	620	{
620	key_value *tail = 0;	621	key_value *tail = 0;
621	key_values = 0;	622	dst->key_values = 0;
622		623
623	for (key_value *i = src.key_values; i; i = i->next)	624	for (key_value *i = key_values; i; i = i->next)
624	{	625	{
625	key_value *new_link = new key_value;	626	key_value *new_link = new key_value;
626		627
627	new_link->next = 0;	628	new_link->next = 0;
628	new_link->key = i->key;	629	new_link->key = i->key;
629	new_link->value = i->value;	630	new_link->value = i->value;
630		631
631	/* Try and be clever here, too. */	632	/* Try and be clever here, too. */
632	if (!key_values)	633	if (!dst->key_values)
633	{	634	{
634	key_values = new_link;	635	dst->key_values = new_link;
635	tail = new_link;	636	tail = new_link;
636	}	637	}
637	else	638	else
638	{	639	{
639	tail->next = new_link;	640	tail->next = new_link;
640	tail = new_link;	641	tail = new_link;
641	}	642	}
642	}	643	}
643	}	644	}
644	}
645
646	/*
647	* copy_to first frees everything allocated by the dst object,
648	* and then copies the contents of itself into the second
649	* object, allocating what needs to be allocated. Basically, any
650	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
651	* if the first object is freed, the pointers in the new object
652	* will point at garbage.
653	*/
654	void
655	object::copy_to (object *dst)
656	{
657	dst = this;
658		645
659	if (speed < 0)	646	if (speed < 0)
660	dst->speed_left -= rndm ();	647	dst->speed_left -= rndm ();
661		648
662	dst->set_speed (dst->speed);	649	dst->activate ();
663	}	650	}
664		651
665	void	652	void
666	object::instantiate ()	653	object::instantiate ()
667	{	654	{
…		…
779	else if (action == UP_OBJ_INSERT)	766	else if (action == UP_OBJ_INSERT)
780	{	767	{
781	// this is likely overkill, TODO: revisit (schmorp)	768	// this is likely overkill, TODO: revisit (schmorp)
782	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	769	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
783	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	770	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
784	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	771	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
785	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	772	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
786	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	773	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	774	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	\|\| (m.move_on \| op->move_on ) != m.move_on	775	\|\| (m.move_on \| op->move_on ) != m.move_on
789	\|\| (m.move_off \| op->move_off ) != m.move_off	776	\|\| (m.move_off \| op->move_off ) != m.move_off
790	\|\| (m.move_slow \| op->move_slow) != m.move_slow	777	\|\| (m.move_slow \| op->move_slow) != m.move_slow
791	/* 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
792	* to have move_allow right now.	779	* have move_allow right now.
793	*/	780	*/
794	\|\| ((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
795	\|\| 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)
796	m.flags_ = 0;	783	m.invalidate ();
797	}	784	}
798	/* if the object is being removed, we can't make intelligent	785	/* if the object is being removed, we can't make intelligent
799	* decisions, because remove_ob can't really pass the object	786	* decisions, because remove_ob can't really pass the object
800	* that is being removed.	787	* that is being removed.
801	*/	788	*/
802	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	789	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
803	m.flags_ = 0;	790	m.invalidate ();
804	else if (action == UP_OBJ_FACE)	791	else if (action == UP_OBJ_FACE)
805	/* Nothing to do for that case */ ;	792	/* Nothing to do for that case */ ;
806	else	793	else
807	LOG (llevError, "update_object called with invalid action: %d\n", action);	794	LOG (llevError, "update_object called with invalid action: %d\n", action);
808		795
…		…
812		799
813	object::object ()	800	object::object ()
814	{	801	{
815	SET_FLAG (this, FLAG_REMOVED);	802	SET_FLAG (this, FLAG_REMOVED);
816		803
817	expmul = 1.0;	804	//expmul = 1.0; declared const for the time being
818	face = blank_face;	805	face = blank_face;
819	}	806	}
820		807
821	object::~object ()	808	object::~object ()
822	{	809	{
…		…
852	/* If already on active list, don't do anything */	839	/* If already on active list, don't do anything */
853	if (active)	840	if (active)
854	return;	841	return;
855		842
856	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
857	actives.insert (this);	848	actives.insert (this);
		849	}
858	}	850	}
859		851
860	void	852	void
861	object::activate_recursive ()	853	object::activate_recursive ()
862	{	854	{
…		…
923	* drop on that space.	915	* drop on that space.
924	*/	916	*/
925	if (!drop_to_ground	917	if (!drop_to_ground
926	\|\| !map	918	\|\| !map
927	\|\| map->in_memory != MAP_ACTIVE	919	\|\| map->in_memory != MAP_ACTIVE
928	\|\| map->nodrop	920	\|\| map->no_drop
929	\|\| ms ().move_block == MOVE_ALL)	921	\|\| ms ().move_block == MOVE_ALL)
930	{	922	{
931	while (inv)	923	while (inv)
932	{
933	inv->destroy_inv (false);
934	inv->destroy ();	924	inv->destroy ();
935	}
936	}	925	}
937	else	926	else
938	{ /* Put objects in inventory onto this space */	927	{ /* Put objects in inventory onto this space */
939	while (inv)	928	while (inv)
940	{	929	{
…		…
944	\|\| op->flag [FLAG_NO_DROP]	933	\|\| op->flag [FLAG_NO_DROP]
945	\|\| op->type == RUNE	934	\|\| op->type == RUNE
946	\|\| op->type == TRAP	935	\|\| op->type == TRAP
947	\|\| op->flag [FLAG_IS_A_TEMPLATE]	936	\|\| op->flag [FLAG_IS_A_TEMPLATE]
948	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	937	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
949	op->destroy (true);	938	op->destroy ();
950	else	939	else
951	map->insert (op, x, y);	940	map->insert (op, x, y);
952	}	941	}
953	}	942	}
954	}	943	}
…		…
962		951
963	static struct freed_map : maptile	952	static struct freed_map : maptile
964	{	953	{
965	freed_map ()	954	freed_map ()
966	{	955	{
967	path = "<freed objects map>";	956	path = "<freed objects map>";
968	name = "/internal/freed_objects_map";	957	name = "/internal/freed_objects_map";
969	width = 3;	958	width = 3;
970	height = 3;	959	height = 3;
971	nodrop = 1;	960	no_drop = 1;
		961	no_reset = 1;
972		962
973	alloc ();	963	alloc ();
974	in_memory = MAP_ACTIVE;	964	in_memory = MAP_ACTIVE;
975	}	965	}
		966
		967	~freed_map ()
		968	{
		969	destroy ();
		970	}
976	} freed_map; // freed objects are moved here to avoid crashes	971	} freed_map; // freed objects are moved here to avoid crashes
977		972
978	void	973	void
979	object::do_destroy ()	974	object::do_destroy ()
980	{	975	{
981	if (flag [FLAG_IS_LINKED])	976	if (flag [FLAG_IS_LINKED])
982	remove_button_link (this);	977	remove_link ();
983		978
984	if (flag [FLAG_FRIENDLY])	979	if (flag [FLAG_FRIENDLY])
985	remove_friendly_object (this);	980	remove_friendly_object (this);
986		981
987	remove ();	982	remove ();
…		…
1012	attacked_by = 0;	1007	attacked_by = 0;
1013	current_weapon = 0;	1008	current_weapon = 0;
1014	}	1009	}
1015		1010
1016	void	1011	void
1017	object::destroy (bool destroy_inventory)	1012	object::destroy ()
1018	{	1013	{
1019	if (destroyed ())	1014	if (destroyed ())
1020	return;	1015	return;
1021		1016
1022	if (!is_head () && !head->destroyed ())	1017	if (!is_head () && !head->destroyed ())
1023	{	1018	{
1024	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1019	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1025	head->destroy (destroy_inventory);	1020	head->destroy ();
1026	return;	1021	return;
1027	}	1022	}
1028		1023
1029	destroy_inv (!destroy_inventory);	1024	destroy_inv (false);
1030		1025
1031	if (is_head ())	1026	if (is_head ())
1032	if (sound_destroy)	1027	if (sound_destroy)
1033	play_sound (sound_destroy);	1028	play_sound (sound_destroy);
1034	else if (flag [FLAG_MONSTER])	1029	else if (flag [FLAG_MONSTER])
…		…
1071	esrv_del_item (pl->contr, count);	1066	esrv_del_item (pl->contr, count);
1072	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1067	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1073		1068
1074	adjust_weight (env, -total_weight ());	1069	adjust_weight (env, -total_weight ());
1075		1070
1076	*(above ? &above->below : &env->inv) = below;	1071	object *pl = in_player ();
1077
1078	if (below)
1079	below->above = above;
1080		1072
1081	/* we set up values so that it could be inserted into	1073	/* we set up values so that it could be inserted into
1082	* the map, but we don't actually do that - it is up	1074	* the map, but we don't actually do that - it is up
1083	* to the caller to decide what we want to do.	1075	* to the caller to decide what we want to do.
1084	*/	1076	*/
1085	map = env->map;	1077	map = env->map;
1086	x = env->x;	1078	x = env->x;
1087	y = env->y;	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
1088	above = 0;	1085	above = 0;
1089	below = 0;	1086	below = 0;
1090	env = 0;	1087	env = 0;
1091		1088
1092	/* 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
1093	* made to players inventory. If set, avoiding the call	1090	* made to players inventory. If set, avoiding the call
1094	* to save cpu time.	1091	* to save cpu time.
1095	*/	1092	*/
1096	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	{
1097	otmp->update_stats ();	1096	pl->update_stats ();
		1097
		1098	if (glow_radius && pl->is_on_map ())
		1099	update_all_los (pl->map, pl->x, pl->y);
		1100	}
1098	}	1101	}
1099	else if (map)	1102	else if (map)
1100	{	1103	{
1101	map->dirty = true;	1104	map->dirty = true;
1102	mapspace &ms = this->ms ();	1105	mapspace &ms = this->ms ();
1103		1106
1104	if (object *pl = ms.player ())	1107	if (object *pl = ms.player ())
1105	{	1108	{
1106	if (type == PLAYER) // this == pl(!)	1109	if (is_player ())
1107	{	1110	{
		1111	if (!flag [FLAG_WIZPASS])
		1112	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1113
1108	// leaving a spot always closes any open container on the ground	1114	// leaving a spot always closes any open container on the ground
1109	if (container && !container->env)	1115	if (container && !container->env)
1110	// this causes spurious floorbox updates, but it ensures	1116	// this causes spurious floorbox updates, but it ensures
1111	// that the CLOSE event is being sent.	1117	// that the CLOSE event is being sent.
1112	close_container ();	1118	close_container ();
…		…
1122		1128
1123	esrv_del_item (pl->contr, count);	1129	esrv_del_item (pl->contr, count);
1124	}	1130	}
1125		1131
1126	/* link the object above us */	1132	/* link the object above us */
1127	if (above)	1133	// re-link, make sure compiler can easily use cmove
1128	above->below = below;	1134	*(above ? &above->below : &ms.top) = below;
1129	else	1135	*(below ? &below->above : &ms.bot) = above;
1130	ms.top = below; /* we were top, set new top */
1131
1132	/* Relink the object below us, if there is one */
1133	if (below)
1134	below->above = above;
1135	else
1136	{
1137	/* Nothing below, which means we need to relink map object for this space
1138	* use translated coordinates in case some oddness with map tiling is
1139	* evident
1140	*/
1141	if (GET_MAP_OB (map, x, y) != this)
1142	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 ());
1143
1144	ms.bot = above; /* goes on above it. */
1145	}
1146		1136
1147	above = 0;	1137	above = 0;
1148	below = 0;	1138	below = 0;
		1139
		1140	ms.invalidate ();
1149		1141
1150	if (map->in_memory == MAP_SAVING)	1142	if (map->in_memory == MAP_SAVING)
1151	return;	1143	return;
1152		1144
1153	int check_walk_off = !flag [FLAG_NO_APPLY];	1145	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1186	}	1178	}
1187		1179
1188	last = tmp;	1180	last = tmp;
1189	}	1181	}
1190		1182
1191	/* last == NULL if there are no objects on this space */	1183	if (affects_los ())
1192	//TODO: this makes little sense, why only update the topmost object?
1193	if (!last)
1194	map->at (x, y).flags_ = 0;
1195	else
1196	update_object (last, UP_OBJ_REMOVE);
1197
1198	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1199	update_all_los (map, x, y);	1184	update_all_los (map, x, y);
1200	}	1185	}
1201	}	1186	}
1202		1187
1203	/*	1188	/*
…		…
1227	esrv_update_item (UPD_NROF, pl, top);	1212	esrv_update_item (UPD_NROF, pl, top);
1228		1213
1229	op->weight = 0; // cancel the addition above	1214	op->weight = 0; // cancel the addition above
1230	op->carrying = 0; // must be 0 already	1215	op->carrying = 0; // must be 0 already
1231		1216
1232	op->destroy (1);	1217	op->destroy ();
1233		1218
1234	return top;	1219	return top;
1235	}	1220	}
1236		1221
1237	return 0;	1222	return 0;
…		…
1265	* job preparing multi-part monsters.	1250	* job preparing multi-part monsters.
1266	*/	1251	*/
1267	object *	1252	object *
1268	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)
1269	{	1254	{
		1255	op->remove ();
		1256
1270	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271	{	1258	{
1272	tmp->x = x + tmp->arch->x;	1259	tmp->x = x + tmp->arch->x;
1273	tmp->y = y + tmp->arch->y;	1260	tmp->y = y + tmp->arch->y;
1274	}	1261	}
…		…
1297	* just 'op' otherwise	1284	* just 'op' otherwise
1298	*/	1285	*/
1299	object *	1286	object *
1300	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)
1301	{	1288	{
1302	assert (!op->flag [FLAG_FREED]);
1303
1304	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
1305		1295
1306	/* Ideally, the caller figures this out. However, it complicates a lot	1296	/* Ideally, the caller figures this out. However, it complicates a lot
1307	* 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
1308	* need extra work	1298	* need extra work
1309	*/	1299	*/
		1300	maptile *newmap = m;
1310	if (!xy_normalise (m, op->x, op->y))	1301	if (!xy_normalise (newmap, op->x, op->y))
1311	{	1302	{
1312	op->destroy (1);	1303	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1313	return 0;	1304	return 0;
1314	}	1305	}
1315		1306
1316	if (object *more = op->more)	1307	if (object *more = op->more)
1317	if (!insert_ob_in_map (more, m, originator, flag))	1308	if (!insert_ob_in_map (more, m, originator, flag))
1318	return 0;	1309	return 0;
1319		1310
1320	CLEAR_FLAG (op, FLAG_REMOVED);	1311	op->flag [FLAG_REMOVED] = false;
1321		1312	op->env = 0;
1322	op->map = m;	1313	op->map = newmap;
		1314
1323	mapspace &ms = op->ms ();	1315	mapspace &ms = op->ms ();
1324		1316
1325	/* this has to be done after we translate the coordinates.	1317	/* this has to be done after we translate the coordinates.
1326	*/	1318	*/
1327	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
1328	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329	if (object::can_merge (op, tmp))	1321	if (object::can_merge (op, tmp))
1330	{	1322	{
1331	// TODO: we atcually want to update tmp, not op,	1323	// TODO: we actually want to update tmp, not op,
1332	// but some caller surely breaks when we return tmp	1324	// but some caller surely breaks when we return tmp
1333	// from here :/	1325	// from here :/
1334	op->nrof += tmp->nrof;	1326	op->nrof += tmp->nrof;
1335	tmp->destroy (1);	1327	tmp->destroy ();
1336	}	1328	}
1337		1329
1338	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 */
1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1340		1332
…		…
1347	{	1339	{
1348	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");
1349	abort ();	1341	abort ();
1350	}	1342	}
1351		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
1352	op->above = originator;	1351	op->above = originator;
1353	op->below = originator->below;	1352	op->below = originator->below;
1354
1355	if (op->below)
1356	op->below->above = op;
1357	else
1358	ms.bot = op;
1359
1360	/* since below originator, no need to update top */
1361	originator->below = op;	1353	originator->below = op;
		1354
		1355	*(op->below ? &op->below->above : &ms.bot) = op;
1362	}	1356	}
1363	else	1357	else
1364	{	1358	{
1365	object top, floor = NULL;	1359	object *floor = 0;
1366		1360	object *top = ms.top;
1367	top = ms.bot;
1368		1361
1369	/* If there are other objects, then */	1362	/* If there are other objects, then */
1370	if (top)	1363	if (top)
1371	{	1364	{
1372	object *last = 0;
1373
1374	/*	1365	/*
1375	* 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.
1376	* We've already dealt with merging if appropriate.	1367	* We've already dealt with merging if appropriate.
1377	* 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
1378	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1369	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1381	* 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
1382	* 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
1383	* 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
1384	* that flying non pickable objects are spell objects.	1375	* that flying non pickable objects are spell objects.
1385	*/	1376	*/
1386	for (top = ms.bot; top; top = top->above)	1377	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1387	{	1378	{
1388	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))
1389	floor = top;	1380	floor = tmp;
1390		1381
1391	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))
1392	{	1383	{
1393	/* We insert above top, so we want this object below this */	1384	/* We insert above top, so we want this object below this */
1394	top = top->below;	1385	top = tmp->below;
1395	break;	1386	break;
1396	}	1387	}
1397		1388
1398	last = top;	1389	top = tmp;
1399	}	1390	}
1400
1401	/* Don't want top to be NULL, so set it to the last valid object */
1402	top = last;
1403		1391
1404	/* We let update_position deal with figuring out what the space	1392	/* We let update_position deal with figuring out what the space
1405	* looks like instead of lots of conditions here.	1393	* looks like instead of lots of conditions here.
1406	* makes things faster, and effectively the same result.	1394	* makes things faster, and effectively the same result.
1407	*/	1395	*/
…		…
1414	*/	1402	*/
1415	if (!(flag & INS_ON_TOP)	1403	if (!(flag & INS_ON_TOP)
1416	&& ms.flags () & P_BLOCKSVIEW	1404	&& ms.flags () & P_BLOCKSVIEW
1417	&& (op->face && !faces [op->face].visibility))	1405	&& (op->face && !faces [op->face].visibility))
1418	{	1406	{
		1407	object *last;
		1408
1419	for (last = top; last != floor; last = last->below)	1409	for (last = top; last != floor; last = last->below)
1420	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1410	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1421	break;	1411	break;
1422		1412
1423	/* Check to see if we found the object that blocks view,	1413	/* Check to see if we found the object that blocks view,
…		…
1431	} /* If objects on this space */	1421	} /* If objects on this space */
1432		1422
1433	if (flag & INS_ABOVE_FLOOR_ONLY)	1423	if (flag & INS_ABOVE_FLOOR_ONLY)
1434	top = floor;	1424	top = floor;
1435		1425
1436	/* 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
1437	*/
1438
1439	/* First object on this space */
1440	if (!top)	1427	if (!top)
1441	{	1428	{
		1429	op->below = 0;
1442	op->above = ms.bot;	1430	op->above = ms.bot;
1443
1444	if (op->above)
1445	op->above->below = op;
1446
1447	op->below = 0;
1448	ms.bot = op;	1431	ms.bot = op;
		1432
		1433	*(op->above ? &op->above->below : &ms.top) = op;
1449	}	1434	}
1450	else	1435	else
1451	{ /* get inserted into the stack above top */	1436	{
1452	op->above = top->above;	1437	op->above = top->above;
1453
1454	if (op->above)
1455	op->above->below = op;	1438	top->above = op;
1456		1439
1457	op->below = top;	1440	op->below = top;
1458	top->above = op;	1441	*(op->above ? &op->above->below : &ms.top) = op;
1459	}	1442	}
		1443	}
1460		1444
1461	if (!op->above)	1445	if (op->is_player ())
1462	ms.top = op;
1463	} /* else not INS_BELOW_ORIGINATOR */
1464
1465	if (op->type == PLAYER)
1466	{	1446	{
1467	op->contr->do_los = 1;	1447	op->contr->do_los = 1;
1468	++op->map->players;	1448	++op->map->players;
1469	op->map->touch ();	1449	op->map->touch ();
1470	}	1450	}
…		…
1485	* 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 -
1486	* this should get redone to only look for players within range,	1466	* this should get redone to only look for players within range,
1487	* or just updating the P_UPTODATE for spaces within this area	1467	* or just updating the P_UPTODATE for spaces within this area
1488	* of effect may be sufficient.	1468	* of effect may be sufficient.
1489	*/	1469	*/
1490	if (op->map->darkness && (op->glow_radius != 0))	1470	if (op->affects_los ())
		1471	{
		1472	op->ms ().invalidate ();
1491	update_all_los (op->map, op->x, op->y);	1473	update_all_los (op->map, op->x, op->y);
		1474	}
1492		1475
1493	/* updates flags (blocked, alive, no magic, etc) for this map space */	1476	/* updates flags (blocked, alive, no magic, etc) for this map space */
1494	update_object (op, UP_OBJ_INSERT);	1477	update_object (op, UP_OBJ_INSERT);
1495		1478
1496	INVOKE_OBJECT (INSERT, op);	1479	INVOKE_OBJECT (INSERT, op);
…		…
1503	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1504	* update_object().	1487	* update_object().
1505	*/	1488	*/
1506		1489
1507	/* 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 */
1508	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1491	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1509	{	1492	{
1510	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1511	return 0;	1494	return 0;
1512		1495
1513	/* 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
…		…
1524	/* this function inserts an object in the map, but if it	1507	/* this function inserts an object in the map, but if it
1525	* 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.
1526	* 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.
1527	*/	1510	*/
1528	void	1511	void
1529	replace_insert_ob_in_map (const char arch_string, object op)	1512	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1530	{	1513	{
1531	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1532		1515
1533	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1534	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1517	if (tmp->arch->archname == archname) /* same archetype */
1535	tmp->destroy (1);	1518	tmp->destroy ();
1536		1519
1537	object *tmp = arch_to_object (archetype::find (arch_string));	1520	object *tmp = arch_to_object (archetype::find (archname));
1538		1521
1539	tmp->x = op->x;	1522	tmp->x = op->x;
1540	tmp->y = op->y;	1523	tmp->y = op->y;
1541		1524
1542	insert_ob_in_map (tmp, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1564	if (!nr)	1547	if (!nr)
1565	return true;	1548	return true;
1566		1549
1567	nr = min (nr, nrof);	1550	nr = min (nr, nrof);
1568		1551
		1552	if (nrof > nr)
		1553	{
1569	nrof -= nr;	1554	nrof -= nr;
1570
1571	if (nrof)
1572	{
1573	adjust_weight (env, -weight * nr); // carrying == 0	1555	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1574		1556
1575	if (object *pl = visible_to ())	1557	if (object *pl = visible_to ())
1576	esrv_update_item (UPD_NROF, pl, this);	1558	esrv_update_item (UPD_NROF, pl, this);
1577		1559
1578	return true;	1560	return true;
1579	}	1561	}
1580	else	1562	else
1581	{	1563	{
1582	destroy (1);	1564	destroy ();
1583	return false;	1565	return false;
1584	}	1566	}
1585	}	1567	}
1586		1568
1587	/*	1569	/*
…		…
1604	}	1586	}
1605	else	1587	else
1606	{	1588	{
1607	decrease (nr);	1589	decrease (nr);
1608		1590
1609	object *op = object_create_clone (this);	1591	object *op = deep_clone ();
1610	op->nrof = nr;	1592	op->nrof = nr;
1611	return op;	1593	return op;
1612	}	1594	}
1613	}	1595	}
1614		1596
…		…
1664	if (object *pl = tmp->visible_to ())	1646	if (object *pl = tmp->visible_to ())
1665	esrv_update_item (UPD_NROF, pl, tmp);	1647	esrv_update_item (UPD_NROF, pl, tmp);
1666		1648
1667	adjust_weight (this, op->total_weight ());	1649	adjust_weight (this, op->total_weight ());
1668		1650
1669	op->destroy (1);	1651	op->destroy ();
1670	op = tmp;	1652	op = tmp;
1671	goto inserted;	1653	goto inserted;
1672	}	1654	}
1673		1655
1674	op->owner = 0; // it's his/hers now. period.	1656	op->owner = 0; // it's his/hers now. period.
…		…
1692		1674
1693	adjust_weight (this, op->total_weight ());	1675	adjust_weight (this, op->total_weight ());
1694		1676
1695	inserted:	1677	inserted:
1696	/* 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 */
1697	if (op->glow_radius && map && map->darkness)	1679	if (op->glow_radius && is_on_map ())
		1680	{
		1681	update_stats ();
1698	update_all_los (map, x, y);	1682	update_all_los (map, x, y);
1699		1683	}
		1684	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1700	// if this is a player's inventory, update stats	1685	// if this is a player's inventory, update stats
1701	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1702	update_stats ();	1686	update_stats ();
1703		1687
1704	INVOKE_OBJECT (INSERT, this);	1688	INVOKE_OBJECT (INSERT, this);
1705		1689
1706	return op;	1690	return op;
…		…
1727	* on top.	1711	* on top.
1728	*/	1712	*/
1729	int	1713	int
1730	check_move_on (object op, object originator)	1714	check_move_on (object op, object originator)
1731	{	1715	{
		1716	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1717	return 0;
		1718
1732	object *tmp;	1719	object *tmp;
1733	maptile *m = op->map;	1720	maptile *m = op->map;
1734	int x = op->x, y = op->y;	1721	int x = op->x, y = op->y;
1735		1722
1736	MoveType move_on, move_slow, move_block;	1723	mapspace &ms = m->at (x, y);
1737		1724
1738	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1725	ms.update ();
1739	return 0;
1740		1726
1741	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1727	MoveType move_on = ms.move_on;
1742	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1728	MoveType move_slow = ms.move_slow;
1743	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1729	MoveType move_block = ms.move_block;
1744		1730
1745	/* 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,
1746	* 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
1747	* 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
1748	* as walking.	1734	* as walking.
…		…
1759	return 0;	1745	return 0;
1760		1746
1761	/* The objects have to be checked from top to bottom.	1747	/* The objects have to be checked from top to bottom.
1762	* Hence, we first go to the top:	1748	* Hence, we first go to the top:
1763	*/	1749	*/
1764		1750	for (object next, tmp = ms.top; tmp; tmp = next)
1765	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1766	{
1767	/* Trim the search when we find the first other spell effect
1768	* this helps performance so that if a space has 50 spell objects,
1769	* we don't need to check all of them.
1770	*/
1771	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1772	break;
1773	}	1751	{
		1752	next = tmp->below;
1774		1753
1775	for (; tmp; tmp = tmp->below)
1776	{
1777	if (tmp == op)	1754	if (tmp == op)
1778	continue; /* Can't apply yourself */	1755	continue; /* Can't apply yourself */
1779		1756
1780	/* 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.
1781	* Second check makes sure that the movement types not being slowed	1758	* Second check makes sure that the movement types not being slowed
…		…
1786	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1763	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1787	{	1764	{
1788	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1765	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1789	((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))
1790	{	1767	{
1791
1792	float
1793	diff = tmp->move_slow_penalty * fabs (op->speed);	1768	float diff = tmp->move_slow_penalty * fabs (op->speed);
1794		1769
1795	if (op->type == PLAYER)	1770	if (op->is_player ())
1796	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)) \|\|
1797	(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)))
1798	diff /= 4.0;	1773	diff /= 4.0;
1799		1774
1800	op->speed_left -= diff;	1775	op->speed_left -= diff;
1801	}	1776	}
1802	}	1777	}
…		…
1835	LOG (llevError, "Present_arch called outside map.\n");	1810	LOG (llevError, "Present_arch called outside map.\n");
1836	return NULL;	1811	return NULL;
1837	}	1812	}
1838		1813
1839	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)
1840	if (tmp->arch == at)	1815	if (tmp->arch->archname == at->archname)
1841	return tmp;	1816	return tmp;
1842		1817
1843	return NULL;	1818	return NULL;
1844	}	1819	}
1845		1820
…		…
1909	* The first matching object is returned, or NULL if none.	1884	* The first matching object is returned, or NULL if none.
1910	*/	1885	*/
1911	object *	1886	object *
1912	present_arch_in_ob (const archetype at, const object op)	1887	present_arch_in_ob (const archetype at, const object op)
1913	{	1888	{
1914	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1889	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1915	if (tmp->arch == at)	1890	if (tmp->arch->archname == at->archname)
1916	return tmp;	1891	return tmp;
1917		1892
1918	return NULL;	1893	return NULL;
1919	}	1894	}
1920		1895
…		…
2008	* head of the object should correspond for the entire object.	1983	* head of the object should correspond for the entire object.
2009	*/	1984	*/
2010	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1985	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2011	continue;	1986	continue;
2012		1987
2013	if (ob->blocked (m, pos.x, pos.y))	1988	if (ob->blocked (pos.m, pos.x, pos.y))
2014	continue;	1989	continue;
2015		1990
2016	altern [index++] = i;	1991	altern [index++] = i;
2017	}	1992	}
2018		1993
…		…
2086	* there is capable of.	2061	* there is capable of.
2087	*/	2062	*/
2088	int	2063	int
2089	find_dir (maptile m, int x, int y, object exclude)	2064	find_dir (maptile m, int x, int y, object exclude)
2090	{	2065	{
2091	int i, max = SIZEOFFREE, mflags;	2066	int max = SIZEOFFREE, mflags;
2092
2093	sint16 nx, ny;
2094	object *tmp;
2095	maptile *mp;
2096
2097	MoveType blocked, move_type;	2067	MoveType move_type;
2098		2068
2099	if (exclude && exclude->head_ () != exclude)	2069	if (exclude && exclude->head_ () != exclude)
2100	{	2070	{
2101	exclude = exclude->head;	2071	exclude = exclude->head;
2102	move_type = exclude->move_type;	2072	move_type = exclude->move_type;
…		…
2105	{	2075	{
2106	/* 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. */
2107	move_type = MOVE_ALL;	2077	move_type = MOVE_ALL;
2108	}	2078	}
2109		2079
2110	for (i = 1; i < max; i++)	2080	for (int i = 1; i < max; i++)
2111	{	2081	{
2112	mp = m;	2082	mapxy pos (m, x, y);
2113	nx = x + freearr_x[i];	2083	pos.move (i);
2114	ny = y + freearr_y[i];
2115		2084
2116	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2085	if (!pos.normalise ())
2117
2118	if (mflags & P_OUT_OF_MAP)
2119	max = maxfree[i];	2086	max = maxfree[i];
2120	else	2087	else
2121	{	2088	{
2122	mapspace &ms = mp->at (nx, ny);	2089	mapspace &ms = *pos;
2123		2090
2124	blocked = ms.move_block;
2125
2126	if ((move_type & blocked) == move_type)	2091	if ((move_type & ms.move_block) == move_type)
2127	max = maxfree[i];	2092	max = maxfree [i];
2128	else if (mflags & P_IS_ALIVE)	2093	else if (ms.flags () & P_IS_ALIVE)
2129	{	2094	{
2130	for (tmp = ms.bot; tmp; tmp = tmp->above)	2095	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2131	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2096	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2132	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2097	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2133	break;
2134
2135	if (tmp)
2136	return freedir[i];	2098	return freedir [i];
2137	}	2099	}
2138	}	2100	}
2139	}	2101	}
2140		2102
2141	return 0;	2103	return 0;
…		…
2216	* 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
2217	* 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.
2218	* 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
2219	* functions.	2181	* functions.
2220	*/	2182	*/
2221	int reduction_dir[SIZEOFFREE][3] = {	2183	const int reduction_dir[SIZEOFFREE][3] = {
2222	{0, 0, 0}, /* 0 */	2184	{0, 0, 0}, /* 0 */
2223	{0, 0, 0}, /* 1 */	2185	{0, 0, 0}, /* 1 */
2224	{0, 0, 0}, /* 2 */	2186	{0, 0, 0}, /* 2 */
2225	{0, 0, 0}, /* 3 */	2187	{0, 0, 0}, /* 3 */
2226	{0, 0, 0}, /* 4 */	2188	{0, 0, 0}, /* 4 */
…		…
2322	int	2284	int
2323	can_pick (const object who, const object item)	2285	can_pick (const object who, const object item)
2324	{	2286	{
2325	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2287	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2326	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2288	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2327	!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));
2328	}	2290	}
2329		2291
2330	/*	2292	/*
2331	* create clone from object to another	2293	* create clone from object to another
2332	*/	2294	*/
2333	object *	2295	object *
2334	object_create_clone (object *asrc)	2296	object::deep_clone ()
2335	{	2297	{
		2298	assert (("deep_clone called on non-head object", is_head ()));
		2299
2336	object *dst = 0;	2300	object *dst = clone ();
2337		2301
2338	if (!asrc)
2339	return 0;
2340
2341	object *src = asrc->head_ ();
2342
2343	object *prev = 0;	2302	object *prev = dst;
2344	for (object *part = src; part; part = part->more)	2303	for (object *part = this->more; part; part = part->more)
2345	{	2304	{
2346	object *tmp = part->clone ();	2305	object *tmp = part->clone ();
2347
2348	tmp->x -= src->x;
2349	tmp->y -= src->y;
2350
2351	if (!part->head)
2352	{
2353	dst = tmp;
2354	tmp->head = 0;
2355	}
2356	else
2357	tmp->head = dst;	2306	tmp->head = dst;
2358
2359	tmp->more = 0;
2360
2361	if (prev)
2362	prev->more = tmp;	2307	prev->more = tmp;
2363
2364	prev = tmp;	2308	prev = tmp;
2365	}	2309	}
2366		2310
2367	for (object *item = src->inv; item; item = item->below)	2311	for (object *item = inv; item; item = item->below)
2368	insert_ob_in_ob (object_create_clone (item), dst);	2312	insert_ob_in_ob (item->deep_clone (), dst);
2369		2313
2370	return dst;	2314	return dst;
2371	}	2315	}
2372		2316
2373	/* This returns the first object in who's inventory that	2317	/* This returns the first object in who's inventory that
…		…
2382	return tmp;	2326	return tmp;
2383		2327
2384	return 0;	2328	return 0;
2385	}	2329	}
2386		2330
2387	/* If ob has a field named key, return the link from the list,	2331	shstr_tmp
2388	* otherwise return NULL.	2332	object::kv_get (shstr_tmp key) const
2389	*
2390	* key must be a passed in shared string - otherwise, this won't
2391	* do the desired thing.
2392	*/
2393	key_value *
2394	get_ob_key_link (const object ob, const char key)
2395	{	2333	{
2396	for (key_value *link = ob->key_values; link; link = link->next)	2334	for (key_value *kv = key_values; kv; kv = kv->next)
2397	if (link->key == key)	2335	if (kv->key == key)
2398	return link;
2399
2400	return 0;
2401	}
2402
2403	/*
2404	* Returns the value of op has an extra_field for key, or NULL.
2405	*
2406	* The argument doesn't need to be a shared string.
2407	*
2408	* The returned string is shared.
2409	*/
2410	const char *
2411	get_ob_key_value (const object op, const char const key)
2412	{
2413	key_value *link;
2414	shstr_cmp canonical_key (key);
2415
2416	if (!canonical_key)
2417	{
2418	/* 1. There being a field named key on any object
2419	* implies there'd be a shared string to find.
2420	* 2. Since there isn't, no object has this field.
2421	* 3. Therefore, this object doesn't have this field.
2422	*/
2423	return 0;
2424	}
2425
2426	/* This is copied from get_ob_key_link() above -
2427	* only 4 lines, and saves the function call overhead.
2428	*/
2429	for (link = op->key_values; link; link = link->next)
2430	if (link->key == canonical_key)
2431	return link->value;	2336	return kv->value;
2432		2337
2433	return 0;	2338	return shstr ();
2434	}	2339	}
2435		2340
2436	/*	2341	void
2437	* Updates the canonical_key in op to value.	2342	object::kv_set (shstr_tmp key, shstr_tmp value)
2438	*
2439	* canonical_key is a shared string (value doesn't have to be).
2440	*
2441	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2442	* keys.
2443	*
2444	* Returns TRUE on success.
2445	*/
2446	int
2447	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2448	{	2343	{
2449	key_value field = NULL, last = NULL;	2344	for (key_value *kv = key_values; kv; kv = kv->next)
2450		2345	if (kv->key == key)
2451	for (field = op->key_values; field != NULL; field = field->next)
2452	{
2453	if (field->key != canonical_key)
2454	{	2346	{
2455	last = field;	2347	kv->value = value;
2456	continue;	2348	return;
2457	}	2349	}
2458		2350
2459	if (value)	2351	key_value *kv = new key_value;
2460	field->value = value;	2352
2461	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)
2462	{	2365	{
2463	/* Basically, if the archetype has this key set,	2366	key_value kv = kvp;
2464	* we need to store the null value so when we save	2367	kvp = (kvp)->next;
2465	* it, we save the empty value so that when we load,	2368	delete kv;
2466	* we get this value back again.	2369	return;
2467	*/
2468	if (get_ob_key_link (op->arch, canonical_key))
2469	field->value = 0;
2470	else
2471	{
2472	if (last)
2473	last->next = field->next;
2474	else
2475	op->key_values = field->next;
2476
2477	delete field;
2478	}
2479	}	2370	}
2480	return TRUE;
2481	}
2482	/* IF we get here, key doesn't exist */
2483
2484	/* No field, we'll have to add it. */
2485
2486	if (!add_key)
2487	return FALSE;
2488
2489	/* There isn't any good reason to store a null
2490	* value in the key/value list. If the archetype has
2491	* this key, then we should also have it, so shouldn't
2492	* be here. If user wants to store empty strings,
2493	* should pass in ""
2494	*/
2495	if (value == NULL)
2496	return TRUE;
2497
2498	field = new key_value;
2499
2500	field->key = canonical_key;
2501	field->value = value;
2502	/* Usual prepend-addition. */
2503	field->next = op->key_values;
2504	op->key_values = field;
2505
2506	return TRUE;
2507	}
2508
2509	/*
2510	* Updates the key in op to value.
2511	*
2512	* If add_key is FALSE, this will only update existing keys,
2513	* and not add new ones.
2514	* In general, should be little reason FALSE is ever passed in for add_key
2515	*
2516	* Returns TRUE on success.
2517	*/
2518	int
2519	set_ob_key_value (object op, const char key, const char *value, int add_key)
2520	{
2521	shstr key_ (key);
2522
2523	return set_ob_key_value_s (op, key_, value, add_key);
2524	}	2371	}
2525		2372
2526	object::depth_iterator::depth_iterator (object *container)	2373	object::depth_iterator::depth_iterator (object *container)
2527	: iterator_base (container)	2374	: iterator_base (container)
2528	{	2375	{
…		…
2578	{	2425	{
2579	char flagdesc[512];	2426	char flagdesc[512];
2580	char info2[256 * 4];	2427	char info2[256 * 4];
2581	char *p = info;	2428	char *p = info;
2582		2429
2583	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}",
2584	count,	2431	count,
2585	uuid.c_str (),	2432	uuid.c_str (),
2586	&name,	2433	&name,
2587	title ? "\",title:\"" : "",	2434	title ? ",title:\"" : "",
2588	title ? (const char *)title : "",	2435	title ? (const char *)title : "",
		2436	title ? "\"" : "",
2589	flag_desc (flagdesc, 512), type);	2437	flag_desc (flagdesc, 512), type);
2590		2438
2591	if (!flag[FLAG_REMOVED] && env)	2439	if (!flag[FLAG_REMOVED] && env)
2592	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2440	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2593		2441
…		…
2649	container = 0;	2497	container = 0;
2650		2498
2651	// client needs item update to make it work, client bug requires this to be separate	2499	// client needs item update to make it work, client bug requires this to be separate
2652	esrv_update_item (UPD_FLAGS, this, old_container);	2500	esrv_update_item (UPD_FLAGS, this, old_container);
2653		2501
2654	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 ());
2655	play_sound (sound_find ("chest_close"));	2503	play_sound (sound_find ("chest_close"));
2656	}	2504	}
2657		2505
2658	if (new_container)	2506	if (new_container)
2659	{	2507	{
…		…
2669	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2517	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2670	new_container->insert (closer);	2518	new_container->insert (closer);
2671	}	2519	}
2672	#endif	2520	#endif
2673		2521
2674	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 ());
2675		2523
2676	// make sure the container is available, client bug requires this to be separate	2524	// make sure the container is available, client bug requires this to be separate
2677	esrv_send_item (this, new_container);	2525	esrv_send_item (this, new_container);
2678		2526
2679	new_container->flag [FLAG_APPLIED] = true;	2527	new_container->flag [FLAG_APPLIED] = true;
…		…
2687	// else if (!old_container->env && contr && contr->ns)	2535	// else if (!old_container->env && contr && contr->ns)
2688	// contr->ns->floorbox_reset ();	2536	// contr->ns->floorbox_reset ();
2689	}	2537	}
2690		2538
2691	object *	2539	object *
2692	object::force_find (const shstr name)	2540	object::force_find (shstr_tmp name)
2693	{	2541	{
2694	/* 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
2695	* place	2543	* place
2696	*/	2544	*/
2697	for (object *tmp = inv; tmp; tmp = tmp->below)	2545	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2699	return splay (tmp);	2547	return splay (tmp);
2700		2548
2701	return 0;	2549	return 0;
2702	}	2550	}
2703		2551
2704	void	2552	object *
2705	object::force_add (const shstr name, int duration)	2553	object::force_add (shstr_tmp name, int duration)
2706	{	2554	{
2707	if (object *force = force_find (name))	2555	if (object *force = force_find (name))
2708	force->destroy ();	2556	force->destroy ();
2709		2557
2710	object *force = get_archetype (FORCE_NAME);	2558	object *force = get_archetype (FORCE_NAME);
…		…
2715		2563
2716	force->set_speed (duration ? 1.f / duration : 0.f);	2564	force->set_speed (duration ? 1.f / duration : 0.f);
2717	force->flag [FLAG_IS_USED_UP] = true;	2565	force->flag [FLAG_IS_USED_UP] = true;
2718	force->flag [FLAG_APPLIED] = true;	2566	force->flag [FLAG_APPLIED] = true;
2719		2567
2720	insert (force);	2568	return insert (force);
2721	}	2569	}
2722		2570
2723	void	2571	void
2724	object::play_sound (faceidx sound)	2572	object::play_sound (faceidx sound) const
2725	{	2573	{
2726	if (!sound)	2574	if (!sound)
2727	return;	2575	return;
2728		2576
2729	if (flag [FLAG_REMOVED])	2577	if (is_on_map ())
		2578	map->play_sound (sound, x, y);
		2579	else if (object *pl = in_player ())
		2580	pl->contr->play_sound (sound);
		2581	}
		2582
		2583	void
		2584	object::say_msg (const char *msg) const
		2585	{
		2586	if (is_on_map ())
		2587	map->say_msg (msg, x, y);
		2588	else if (object *pl = in_player ())
		2589	pl->contr->play_sound (sound);
		2590	}
		2591
		2592	void
		2593	object::make_noise ()
		2594	{
		2595	// we do not model noise in the map, so instead put
		2596	// a temporary light into the noise source
		2597	// could use the map instead, but that's less reliable for our
		2598	// goal, which is to make invisibility a bit harder to exploit
		2599
		2600	// currently only works sensibly for players
		2601	if (!is_player ())
2730	return;	2602	return;
2731		2603
2732	if (env)	2604	// find old force, or create new one
2733	{	2605	object *force = force_find (shstr_noise_force);
2734	if (object *pl = in_player ())	2606
2735	pl->contr->play_sound (sound);	2607	if (force)
2736	}	2608	force->speed_left = -1.f; // patch old speed up
2737	else	2609	else
2738	map->play_sound (sound, x, y);	2610	{
2739	}	2611	force = archetype::get (shstr_noise_force);
2740		2612
		2613	force->slaying = shstr_noise_force;
		2614	force->stats.food = 1;
		2615	force->speed_left = -1.f;
		2616
		2617	force->set_speed (1.f / 4.f);
		2618	force->flag [FLAG_IS_USED_UP] = true;
		2619	force->flag [FLAG_APPLIED] = true;
		2620
		2621	insert (force);
		2622	}
		2623	}
		2624

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.226 by root, Sat May 3 08:50:30 2008 UTC vs. Revision 1.289 by root, Sun Oct 11 05:31:54 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.226 by root, Sat May 3 08:50:30 2008 UTC vs.
Revision 1.289 by root, Sun Oct 11 05:31:54 2009 UTC