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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.224 by root, Fri May 2 20:16:24 2008 UTC vs.
Revision 1.279 by root, Thu Jan 8 03:03:23 2009 UTC

…		…
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 ();
350		334
…		…
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
…		…
489	*/	477	*/
490	object *	478	object *
491	find_object_name (const char *str)	479	find_object_name (const char *str)
492	{	480	{
493	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
494	object *op;
495		482
		483	if (str_)
496	for_all_objects (op)	484	for_all_objects (op)
497	if (op->name == str_)	485	if (op->name == str_)
498	break;	486	return op;
499		487
500	return op;	488	return 0;
501	}	489	}
502		490
503	/*	491	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	492	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	493	* skill and experience objects.
…		…
603	}	591	}
604		592
605	op->key_values = 0;	593	op->key_values = 0;
606	}	594	}
607		595
608	object &	596	/*
609	object::operator =(const object &src)	597	* copy_to first frees everything allocated by the dst object,
		598	* and then copies the contents of itself into the second
		599	* object, allocating what needs to be allocated. Basically, any
		600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		601	* if the first object is freed, the pointers in the new object
		602	* will point at garbage.
		603	*/
		604	void
		605	object::copy_to (object *dst)
610	{	606	{
611	remove ();	607	dst->remove ();
612
613	(object_copy )this = src;	608	(object_copy )dst = *this;
614
615	flag [FLAG_REMOVED] = true;	609	dst->flag [FLAG_REMOVED] = true;
616		610
617	/* Copy over key_values, if any. */	611	/* Copy over key_values, if any. */
618	if (src.key_values)	612	if (key_values)
619	{	613	{
620	key_value *tail = 0;	614	key_value *tail = 0;
621	key_values = 0;	615	dst->key_values = 0;
622		616
623	for (key_value *i = src.key_values; i; i = i->next)	617	for (key_value *i = key_values; i; i = i->next)
624	{	618	{
625	key_value *new_link = new key_value;	619	key_value *new_link = new key_value;
626		620
627	new_link->next = 0;	621	new_link->next = 0;
628	new_link->key = i->key;	622	new_link->key = i->key;
629	new_link->value = i->value;	623	new_link->value = i->value;
630		624
631	/* Try and be clever here, too. */	625	/* Try and be clever here, too. */
632	if (!key_values)	626	if (!dst->key_values)
633	{	627	{
634	key_values = new_link;	628	dst->key_values = new_link;
635	tail = new_link;	629	tail = new_link;
636	}	630	}
637	else	631	else
638	{	632	{
639	tail->next = new_link;	633	tail->next = new_link;
640	tail = new_link;	634	tail = new_link;
641	}	635	}
642	}	636	}
643	}	637	}
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		638
659	if (speed < 0)	639	if (speed < 0)
660	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
661		641
662	dst->set_speed (dst->speed);	642	dst->activate ();
663	}	643	}
664		644
665	void	645	void
666	object::instantiate ()	646	object::instantiate ()
667	{	647	{
…		…
684	object *	664	object *
685	object::clone ()	665	object::clone ()
686	{	666	{
687	object *neu = create ();	667	object *neu = create ();
688	copy_to (neu);	668	copy_to (neu);
		669	neu->map = map; // not copied by copy_to
689	return neu;	670	return neu;
690	}	671	}
691		672
692	/*	673	/*
693	* If an object with the IS_TURNABLE() flag needs to be turned due	674	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
778	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
779	{	760	{
780	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
781	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
784	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
785	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
786	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
787	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
788	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
789	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
790	/* This isn't perfect, but I don't expect a lot of objects to	771	/* This isn't perfect, but I don't expect a lot of objects to
791	* to have move_allow right now.	772	* have move_allow right now.
792	*/	773	*/
793	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	774	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
794	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
795	m.flags_ = 0;	776	m.invalidate ();
796	}	777	}
797	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
798	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
799	* that is being removed.	780	* that is being removed.
800	*/	781	*/
801	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
802	m.flags_ = 0;	783	m.invalidate ();
803	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
804	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
805	else	786	else
806	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
807		788
…		…
849	object::activate ()	830	object::activate ()
850	{	831	{
851	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
852	if (active)	833	if (active)
853	return;	834	return;
		835
		836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
854		838
855	if (has_active_speed ())	839	if (has_active_speed ())
856	actives.insert (this);	840	actives.insert (this);
857	}	841	}
858		842
…		…
922	* drop on that space.	906	* drop on that space.
923	*/	907	*/
924	if (!drop_to_ground	908	if (!drop_to_ground
925	\|\| !map	909	\|\| !map
926	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
927	\|\| map->nodrop	911	\|\| map->no_drop
928	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
929	{	913	{
930	while (inv)	914	while (inv)
931	{
932	inv->destroy_inv (false);
933	inv->destroy ();	915	inv->destroy ();
934	}
935	}	916	}
936	else	917	else
937	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
938	while (inv)	919	while (inv)
939	{	920	{
…		…
943	\|\| op->flag [FLAG_NO_DROP]	924	\|\| op->flag [FLAG_NO_DROP]
944	\|\| op->type == RUNE	925	\|\| op->type == RUNE
945	\|\| op->type == TRAP	926	\|\| op->type == TRAP
946	\|\| op->flag [FLAG_IS_A_TEMPLATE]	927	\|\| op->flag [FLAG_IS_A_TEMPLATE]
947	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
948	op->destroy (true);	929	op->destroy ();
949	else	930	else
950	map->insert (op, x, y);	931	map->insert (op, x, y);
951	}	932	}
952	}	933	}
953	}	934	}
…		…
961		942
962	static struct freed_map : maptile	943	static struct freed_map : maptile
963	{	944	{
964	freed_map ()	945	freed_map ()
965	{	946	{
966	path = "<freed objects map>";	947	path = "<freed objects map>";
967	name = "/internal/freed_objects_map";	948	name = "/internal/freed_objects_map";
968	width = 3;	949	width = 3;
969	height = 3;	950	height = 3;
970	nodrop = 1;	951	no_drop = 1;
		952	no_reset = 1;
971		953
972	alloc ();	954	alloc ();
973	in_memory = MAP_ACTIVE;	955	in_memory = MAP_ACTIVE;
974	}	956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
		961	}
975	} freed_map; // freed objects are moved here to avoid crashes	962	} freed_map; // freed objects are moved here to avoid crashes
976		963
977	void	964	void
978	object::do_destroy ()	965	object::do_destroy ()
979	{	966	{
980	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
981	remove_button_link (this);	968	remove_link ();
982		969
983	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
984	remove_friendly_object (this);	971	remove_friendly_object (this);
985		972
986	remove ();	973	remove ();
…		…
1011	attacked_by = 0;	998	attacked_by = 0;
1012	current_weapon = 0;	999	current_weapon = 0;
1013	}	1000	}
1014		1001
1015	void	1002	void
1016	object::destroy (bool destroy_inventory)	1003	object::destroy ()
1017	{	1004	{
1018	if (destroyed ())	1005	if (destroyed ())
1019	return;	1006	return;
1020		1007
1021	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1022	{	1009	{
1023	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1024	head->destroy (destroy_inventory);	1011	head->destroy ();
1025	return;	1012	return;
1026	}	1013	}
1027		1014
1028	destroy_inv (!destroy_inventory);	1015	destroy_inv (false);
1029		1016
1030	if (is_head ())	1017	if (is_head ())
1031	if (sound_destroy)	1018	if (sound_destroy)
1032	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1033	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1070	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1071	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1072		1059
1073	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1074		1061
1075	*(above ? &above->below : &env->inv) = below;	1062	object *pl = in_player ();
1076
1077	if (below)
1078	below->above = above;
1079		1063
1080	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1081	* the map, but we don't actually do that - it is up	1065	* the map, but we don't actually do that - it is up
1082	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1083	*/	1067	*/
1084	map = env->map;	1068	map = env->map;
1085	x = env->x;	1069	x = env->x;
1086	y = env->y;	1070	y = env->y;
		1071
		1072	// make sure cmov optimisation is applicable
		1073	*(above ? &above->below : &env->inv) = below;
		1074	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1075
1087	above = 0;	1076	above = 0;
1088	below = 0;	1077	below = 0;
1089	env = 0;	1078	env = 0;
1090		1079
1091	/* NO_FIX_PLAYER is set when a great many changes are being	1080	/* NO_FIX_PLAYER is set when a great many changes are being
1092	* made to players inventory. If set, avoiding the call	1081	* made to players inventory. If set, avoiding the call
1093	* to save cpu time.	1082	* to save cpu time.
1094	*/	1083	*/
1095	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1084	if (pl)
		1085	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1086	{
1096	otmp->update_stats ();	1087	pl->update_stats ();
		1088
		1089	if (glow_radius && pl->is_on_map ())
		1090	update_all_los (pl->map, pl->x, pl->y);
		1091	}
1097	}	1092	}
1098	else if (map)	1093	else if (map)
1099	{	1094	{
1100	map->dirty = true;	1095	map->dirty = true;
1101	mapspace &ms = this->ms ();	1096	mapspace &ms = this->ms ();
1102		1097
1103	if (object *pl = ms.player ())	1098	if (object *pl = ms.player ())
1104	{	1099	{
1105	if (type == PLAYER) // this == pl(!)	1100	if (is_player ())
1106	{	1101	{
		1102	if (!flag [FLAG_WIZPASS])
		1103	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1104
1107	// leaving a spot always closes any open container on the ground	1105	// leaving a spot always closes any open container on the ground
1108	if (container && !container->env)	1106	if (container && !container->env)
1109	// this causes spurious floorbox updates, but it ensures	1107	// this causes spurious floorbox updates, but it ensures
1110	// that the CLOSE event is being sent.	1108	// that the CLOSE event is being sent.
1111	close_container ();	1109	close_container ();
…		…
1121		1119
1122	esrv_del_item (pl->contr, count);	1120	esrv_del_item (pl->contr, count);
1123	}	1121	}
1124		1122
1125	/* link the object above us */	1123	/* link the object above us */
1126	if (above)	1124	// re-link, make sure compiler can easily use cmove
1127	above->below = below;	1125	*(above ? &above->below : &ms.top) = below;
1128	else	1126	*(below ? &below->above : &ms.bot) = above;
1129	ms.top = below; /* we were top, set new top */
1130
1131	/* Relink the object below us, if there is one */
1132	if (below)
1133	below->above = above;
1134	else
1135	{
1136	/* Nothing below, which means we need to relink map object for this space
1137	* use translated coordinates in case some oddness with map tiling is
1138	* evident
1139	*/
1140	if (GET_MAP_OB (map, x, y) != this)
1141	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 ());
1142
1143	ms.bot = above; /* goes on above it. */
1144	}
1145		1127
1146	above = 0;	1128	above = 0;
1147	below = 0;	1129	below = 0;
		1130
		1131	ms.invalidate ();
1148		1132
1149	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1150	return;	1134	return;
1151		1135
1152	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1159	* appropriately.	1143	* appropriately.
1160	*/	1144	*/
1161	pl->close_container ();	1145	pl->close_container ();
1162		1146
1163	//TODO: the floorbox prev/next might need updating	1147	//TODO: the floorbox prev/next might need updating
1164	esrv_del_item (pl->contr, count);	1148	//esrv_del_item (pl->contr, count);
		1149	//TODO: update floorbox to preserve ordering
		1150	if (pl->contr->ns)
		1151	pl->contr->ns->floorbox_update ();
1165	}	1152	}
1166		1153
1167	for (tmp = ms.bot; tmp; tmp = tmp->above)	1154	for (tmp = ms.bot; tmp; tmp = tmp->above)
1168	{	1155	{
1169	/* No point updating the players look faces if he is the object	1156	/* No point updating the players look faces if he is the object
…		…
1182	}	1169	}
1183		1170
1184	last = tmp;	1171	last = tmp;
1185	}	1172	}
1186		1173
1187	/* last == NULL if there are no objects on this space */	1174	if (affects_los ())
1188	//TODO: this makes little sense, why only update the topmost object?
1189	if (!last)
1190	map->at (x, y).flags_ = 0;
1191	else
1192	update_object (last, UP_OBJ_REMOVE);
1193
1194	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1195	update_all_los (map, x, y);	1175	update_all_los (map, x, y);
1196	}	1176	}
1197	}	1177	}
1198		1178
1199	/*	1179	/*
…		…
1223	esrv_update_item (UPD_NROF, pl, top);	1203	esrv_update_item (UPD_NROF, pl, top);
1224		1204
1225	op->weight = 0; // cancel the addition above	1205	op->weight = 0; // cancel the addition above
1226	op->carrying = 0; // must be 0 already	1206	op->carrying = 0; // must be 0 already
1227		1207
1228	op->destroy (1);	1208	op->destroy ();
1229		1209
1230	return top;	1210	return top;
1231	}	1211	}
1232		1212
1233	return 0;	1213	return 0;
…		…
1261	* job preparing multi-part monsters.	1241	* job preparing multi-part monsters.
1262	*/	1242	*/
1263	object *	1243	object *
1264	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1244	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1265	{	1245	{
		1246	op->remove ();
		1247
1266	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1267	{	1249	{
1268	tmp->x = x + tmp->arch->x;	1250	tmp->x = x + tmp->arch->x;
1269	tmp->y = y + tmp->arch->y;	1251	tmp->y = y + tmp->arch->y;
1270	}	1252	}
…		…
1293	* just 'op' otherwise	1275	* just 'op' otherwise
1294	*/	1276	*/
1295	object *	1277	object *
1296	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1297	{	1279	{
1298	assert (!op->flag [FLAG_FREED]);
1299
1300	op->remove ();	1280	op->remove ();
		1281
		1282	if (m == &freed_map)//D TODO: remove soon
		1283	{//D
		1284	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1285	}//D
1301		1286
1302	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1303	* of areas of callers (eg, anything that uses find_free_spot would now	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1304	* need extra work	1289	* need extra work
1305	*/	1290	*/
		1291	maptile *newmap = m;
1306	if (!xy_normalise (m, op->x, op->y))	1292	if (!xy_normalise (newmap, op->x, op->y))
1307	{	1293	{
1308	op->destroy (1);	1294	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1309	return 0;	1295	return 0;
1310	}	1296	}
1311		1297
1312	if (object *more = op->more)	1298	if (object *more = op->more)
1313	if (!insert_ob_in_map (more, m, originator, flag))	1299	if (!insert_ob_in_map (more, m, originator, flag))
1314	return 0;	1300	return 0;
1315		1301
1316	CLEAR_FLAG (op, FLAG_REMOVED);	1302	CLEAR_FLAG (op, FLAG_REMOVED);
1317		1303
1318	op->map = m;	1304	op->map = newmap;
1319	mapspace &ms = op->ms ();	1305	mapspace &ms = op->ms ();
1320		1306
1321	/* this has to be done after we translate the coordinates.	1307	/* this has to be done after we translate the coordinates.
1322	*/	1308	*/
1323	if (op->nrof && !(flag & INS_NO_MERGE))	1309	if (op->nrof && !(flag & INS_NO_MERGE))
1324	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1310	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1325	if (object::can_merge (op, tmp))	1311	if (object::can_merge (op, tmp))
1326	{	1312	{
1327	// TODO: we atcually want to update tmp, not op,	1313	// TODO: we actually want to update tmp, not op,
1328	// but some caller surely breaks when we return tmp	1314	// but some caller surely breaks when we return tmp
1329	// from here :/	1315	// from here :/
1330	op->nrof += tmp->nrof;	1316	op->nrof += tmp->nrof;
1331	tmp->destroy (1);	1317	tmp->destroy ();
1332	}	1318	}
1333		1319
1334	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1320	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1335	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1321	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1336		1322
…		…
1343	{	1329	{
1344	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1330	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1345	abort ();	1331	abort ();
1346	}	1332	}
1347		1333
		1334	if (!originator->is_on_map ())
		1335	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1336	op->debug_desc (), originator->debug_desc ());
		1337
1348	op->above = originator;	1338	op->above = originator;
1349	op->below = originator->below;	1339	op->below = originator->below;
1350
1351	if (op->below)
1352	op->below->above = op;
1353	else
1354	ms.bot = op;
1355
1356	/* since below originator, no need to update top */
1357	originator->below = op;	1340	originator->below = op;
		1341
		1342	*(op->below ? &op->below->above : &ms.bot) = op;
1358	}	1343	}
1359	else	1344	else
1360	{	1345	{
1361	object top, floor = NULL;	1346	object *floor = 0;
1362		1347	object *top = ms.top;
1363	top = ms.bot;
1364		1348
1365	/* If there are other objects, then */	1349	/* If there are other objects, then */
1366	if (top)	1350	if (top)
1367	{	1351	{
1368	object *last = 0;
1369
1370	/*	1352	/*
1371	* If there are multiple objects on this space, we do some trickier handling.	1353	* If there are multiple objects on this space, we do some trickier handling.
1372	* We've already dealt with merging if appropriate.	1354	* We've already dealt with merging if appropriate.
1373	* Generally, we want to put the new object on top. But if	1355	* Generally, we want to put the new object on top. But if
1374	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1377	* once we get to them. This reduces the need to traverse over all of	1359	* once we get to them. This reduces the need to traverse over all of
1378	* them when adding another one - this saves quite a bit of cpu time	1360	* them when adding another one - this saves quite a bit of cpu time
1379	* when lots of spells are cast in one area. Currently, it is presumed	1361	* when lots of spells are cast in one area. Currently, it is presumed
1380	* that flying non pickable objects are spell objects.	1362	* that flying non pickable objects are spell objects.
1381	*/	1363	*/
1382	for (top = ms.bot; top; top = top->above)	1364	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1383	{	1365	{
1384	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1366	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1385	floor = top;	1367	floor = tmp;
1386		1368
1387	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1369	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1388	{	1370	{
1389	/* We insert above top, so we want this object below this */	1371	/* We insert above top, so we want this object below this */
1390	top = top->below;	1372	top = tmp->below;
1391	break;	1373	break;
1392	}	1374	}
1393		1375
1394	last = top;	1376	top = tmp;
1395	}	1377	}
1396
1397	/* Don't want top to be NULL, so set it to the last valid object */
1398	top = last;
1399		1378
1400	/* We let update_position deal with figuring out what the space	1379	/* We let update_position deal with figuring out what the space
1401	* looks like instead of lots of conditions here.	1380	* looks like instead of lots of conditions here.
1402	* makes things faster, and effectively the same result.	1381	* makes things faster, and effectively the same result.
1403	*/	1382	*/
…		…
1410	*/	1389	*/
1411	if (!(flag & INS_ON_TOP)	1390	if (!(flag & INS_ON_TOP)
1412	&& ms.flags () & P_BLOCKSVIEW	1391	&& ms.flags () & P_BLOCKSVIEW
1413	&& (op->face && !faces [op->face].visibility))	1392	&& (op->face && !faces [op->face].visibility))
1414	{	1393	{
		1394	object *last;
		1395
1415	for (last = top; last != floor; last = last->below)	1396	for (last = top; last != floor; last = last->below)
1416	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1397	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1417	break;	1398	break;
1418		1399
1419	/* Check to see if we found the object that blocks view,	1400	/* Check to see if we found the object that blocks view,
…		…
1427	} /* If objects on this space */	1408	} /* If objects on this space */
1428		1409
1429	if (flag & INS_ABOVE_FLOOR_ONLY)	1410	if (flag & INS_ABOVE_FLOOR_ONLY)
1430	top = floor;	1411	top = floor;
1431		1412
1432	/* Top is the object that our object (op) is going to get inserted above.	1413	// insert object above top, or bottom-most if top = 0
1433	*/
1434
1435	/* First object on this space */
1436	if (!top)	1414	if (!top)
1437	{	1415	{
		1416	op->below = 0;
1438	op->above = ms.bot;	1417	op->above = ms.bot;
1439
1440	if (op->above)
1441	op->above->below = op;
1442
1443	op->below = 0;
1444	ms.bot = op;	1418	ms.bot = op;
		1419
		1420	*(op->above ? &op->above->below : &ms.top) = op;
1445	}	1421	}
1446	else	1422	else
1447	{ /* get inserted into the stack above top */	1423	{
1448	op->above = top->above;	1424	op->above = top->above;
1449
1450	if (op->above)
1451	op->above->below = op;	1425	top->above = op;
1452		1426
1453	op->below = top;	1427	op->below = top;
1454	top->above = op;	1428	*(op->above ? &op->above->below : &ms.top) = op;
1455	}	1429	}
		1430	}
1456		1431
1457	if (!op->above)	1432	if (op->is_player ())
1458	ms.top = op;
1459	} /* else not INS_BELOW_ORIGINATOR */
1460
1461	if (op->type == PLAYER)
1462	{	1433	{
1463	op->contr->do_los = 1;	1434	op->contr->do_los = 1;
1464	++op->map->players;	1435	++op->map->players;
1465	op->map->touch ();	1436	op->map->touch ();
1466	}	1437	}
1467		1438
1468	op->map->dirty = true;	1439	op->map->dirty = true;
1469		1440
1470	if (object *pl = ms.player ())	1441	if (object *pl = ms.player ())
1471	//TODO: the floorbox prev/next might need updating	1442	//TODO: the floorbox prev/next might need updating
1472	esrv_send_item (pl, op);	1443	//esrv_send_item (pl, op);
		1444	//TODO: update floorbox to preserve ordering
		1445	if (pl->contr->ns)
		1446	pl->contr->ns->floorbox_update ();
1473		1447
1474	/* If this object glows, it may affect lighting conditions that are	1448	/* If this object glows, it may affect lighting conditions that are
1475	* visible to others on this map. But update_all_los is really	1449	* visible to others on this map. But update_all_los is really
1476	* an inefficient way to do this, as it means los for all players	1450	* an inefficient way to do this, as it means los for all players
1477	* on the map will get recalculated. The players could very well	1451	* on the map will get recalculated. The players could very well
1478	* be far away from this change and not affected in any way -	1452	* be far away from this change and not affected in any way -
1479	* this should get redone to only look for players within range,	1453	* this should get redone to only look for players within range,
1480	* or just updating the P_UPTODATE for spaces within this area	1454	* or just updating the P_UPTODATE for spaces within this area
1481	* of effect may be sufficient.	1455	* of effect may be sufficient.
1482	*/	1456	*/
1483	if (op->map->darkness && (op->glow_radius != 0))	1457	if (op->affects_los ())
		1458	{
		1459	op->ms ().invalidate ();
1484	update_all_los (op->map, op->x, op->y);	1460	update_all_los (op->map, op->x, op->y);
		1461	}
1485		1462
1486	/* updates flags (blocked, alive, no magic, etc) for this map space */	1463	/* updates flags (blocked, alive, no magic, etc) for this map space */
1487	update_object (op, UP_OBJ_INSERT);	1464	update_object (op, UP_OBJ_INSERT);
1488		1465
1489	INVOKE_OBJECT (INSERT, op);	1466	INVOKE_OBJECT (INSERT, op);
…		…
1517	/* this function inserts an object in the map, but if it	1494	/* this function inserts an object in the map, but if it
1518	* finds an object of its own type, it'll remove that one first.	1495	* finds an object of its own type, it'll remove that one first.
1519	* op is the object to insert it under: supplies x and the map.	1496	* op is the object to insert it under: supplies x and the map.
1520	*/	1497	*/
1521	void	1498	void
1522	replace_insert_ob_in_map (const char arch_string, object op)	1499	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1523	{	1500	{
1524	/* first search for itself and remove any old instances */	1501	/* first search for itself and remove any old instances */
1525		1502
1526	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1527	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1504	if (tmp->arch->archname == archname) /* same archetype */
1528	tmp->destroy (1);	1505	tmp->destroy ();
1529		1506
1530	object *tmp = arch_to_object (archetype::find (arch_string));	1507	object *tmp = arch_to_object (archetype::find (archname));
1531		1508
1532	tmp->x = op->x;	1509	tmp->x = op->x;
1533	tmp->y = op->y;	1510	tmp->y = op->y;
1534		1511
1535	insert_ob_in_map (tmp, op->map, op, 0);	1512	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1557	if (!nr)	1534	if (!nr)
1558	return true;	1535	return true;
1559		1536
1560	nr = min (nr, nrof);	1537	nr = min (nr, nrof);
1561		1538
		1539	if (nrof > nr)
		1540	{
1562	nrof -= nr;	1541	nrof -= nr;
1563
1564	if (nrof)
1565	{
1566	adjust_weight (env, -weight * nr); // carrying == 0	1542	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1567		1543
1568	if (object *pl = visible_to ())	1544	if (object *pl = visible_to ())
1569	esrv_update_item (UPD_NROF, pl, this);	1545	esrv_update_item (UPD_NROF, pl, this);
1570		1546
1571	return true;	1547	return true;
1572	}	1548	}
1573	else	1549	else
1574	{	1550	{
1575	destroy (1);	1551	destroy ();
1576	return false;	1552	return false;
1577	}	1553	}
1578	}	1554	}
1579		1555
1580	/*	1556	/*
…		…
1597	}	1573	}
1598	else	1574	else
1599	{	1575	{
1600	decrease (nr);	1576	decrease (nr);
1601		1577
1602	object *op = object_create_clone (this);	1578	object *op = deep_clone ();
1603	op->nrof = nr;	1579	op->nrof = nr;
1604	return op;	1580	return op;
1605	}	1581	}
1606	}	1582	}
1607		1583
…		…
1657	if (object *pl = tmp->visible_to ())	1633	if (object *pl = tmp->visible_to ())
1658	esrv_update_item (UPD_NROF, pl, tmp);	1634	esrv_update_item (UPD_NROF, pl, tmp);
1659		1635
1660	adjust_weight (this, op->total_weight ());	1636	adjust_weight (this, op->total_weight ());
1661		1637
1662	op->destroy (1);	1638	op->destroy ();
1663	op = tmp;	1639	op = tmp;
1664	goto inserted;	1640	goto inserted;
1665	}	1641	}
1666		1642
1667	op->owner = 0; // it's his/hers now. period.	1643	op->owner = 0; // it's his/hers now. period.
…		…
1685		1661
1686	adjust_weight (this, op->total_weight ());	1662	adjust_weight (this, op->total_weight ());
1687		1663
1688	inserted:	1664	inserted:
1689	/* reset the light list and los of the players on the map */	1665	/* reset the light list and los of the players on the map */
1690	if (op->glow_radius && map && map->darkness)	1666	if (op->glow_radius && is_on_map ())
		1667	{
		1668	update_stats ();
1691	update_all_los (map, x, y);	1669	update_all_los (map, x, y);
1692		1670	}
		1671	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1693	// if this is a player's inventory, update stats	1672	// if this is a player's inventory, update stats
1694	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1695	update_stats ();	1673	update_stats ();
1696		1674
1697	INVOKE_OBJECT (INSERT, this);	1675	INVOKE_OBJECT (INSERT, this);
1698		1676
1699	return op;	1677	return op;
…		…
1783	{	1761	{
1784		1762
1785	float	1763	float
1786	diff = tmp->move_slow_penalty * fabs (op->speed);	1764	diff = tmp->move_slow_penalty * fabs (op->speed);
1787		1765
1788	if (op->type == PLAYER)	1766	if (op->is_player ())
1789	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1790	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1791	diff /= 4.0;	1769	diff /= 4.0;
1792		1770
1793	op->speed_left -= diff;	1771	op->speed_left -= diff;
…		…
1828	LOG (llevError, "Present_arch called outside map.\n");	1806	LOG (llevError, "Present_arch called outside map.\n");
1829	return NULL;	1807	return NULL;
1830	}	1808	}
1831		1809
1832	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1810	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1833	if (tmp->arch == at)	1811	if (tmp->arch->archname == at->archname)
1834	return tmp;	1812	return tmp;
1835		1813
1836	return NULL;	1814	return NULL;
1837	}	1815	}
1838		1816
…		…
1902	* The first matching object is returned, or NULL if none.	1880	* The first matching object is returned, or NULL if none.
1903	*/	1881	*/
1904	object *	1882	object *
1905	present_arch_in_ob (const archetype at, const object op)	1883	present_arch_in_ob (const archetype at, const object op)
1906	{	1884	{
1907	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1908	if (tmp->arch == at)	1886	if (tmp->arch->archname == at->archname)
1909	return tmp;	1887	return tmp;
1910		1888
1911	return NULL;	1889	return NULL;
1912	}	1890	}
1913		1891
…		…
2001	* head of the object should correspond for the entire object.	1979	* head of the object should correspond for the entire object.
2002	*/	1980	*/
2003	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2004	continue;	1982	continue;
2005		1983
2006	if (ob->blocked (m, pos.x, pos.y))	1984	if (ob->blocked (pos.m, pos.x, pos.y))
2007	continue;	1985	continue;
2008		1986
2009	altern [index++] = i;	1987	altern [index++] = i;
2010	}	1988	}
2011		1989
…		…
2079	* there is capable of.	2057	* there is capable of.
2080	*/	2058	*/
2081	int	2059	int
2082	find_dir (maptile m, int x, int y, object exclude)	2060	find_dir (maptile m, int x, int y, object exclude)
2083	{	2061	{
2084	int i, max = SIZEOFFREE, mflags;	2062	int max = SIZEOFFREE, mflags;
2085
2086	sint16 nx, ny;
2087	object *tmp;
2088	maptile *mp;
2089
2090	MoveType blocked, move_type;	2063	MoveType move_type;
2091		2064
2092	if (exclude && exclude->head_ () != exclude)	2065	if (exclude && exclude->head_ () != exclude)
2093	{	2066	{
2094	exclude = exclude->head;	2067	exclude = exclude->head;
2095	move_type = exclude->move_type;	2068	move_type = exclude->move_type;
…		…
2098	{	2071	{
2099	/* If we don't have anything, presume it can use all movement types. */	2072	/* If we don't have anything, presume it can use all movement types. */
2100	move_type = MOVE_ALL;	2073	move_type = MOVE_ALL;
2101	}	2074	}
2102		2075
2103	for (i = 1; i < max; i++)	2076	for (int i = 1; i < max; i++)
2104	{	2077	{
2105	mp = m;	2078	mapxy pos (m, x, y);
2106	nx = x + freearr_x[i];	2079	pos.move (i);
2107	ny = y + freearr_y[i];
2108		2080
2109	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2081	if (!pos.normalise ())
2110
2111	if (mflags & P_OUT_OF_MAP)
2112	max = maxfree[i];	2082	max = maxfree[i];
2113	else	2083	else
2114	{	2084	{
2115	mapspace &ms = mp->at (nx, ny);	2085	mapspace &ms = *pos;
2116		2086
2117	blocked = ms.move_block;
2118
2119	if ((move_type & blocked) == move_type)	2087	if ((move_type & ms.move_block) == move_type)
2120	max = maxfree[i];	2088	max = maxfree [i];
2121	else if (mflags & P_IS_ALIVE)	2089	else if (ms.flags () & P_IS_ALIVE)
2122	{	2090	{
2123	for (tmp = ms.bot; tmp; tmp = tmp->above)	2091	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2124	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2092	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2125	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2093	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2126	break;
2127
2128	if (tmp)
2129	return freedir[i];	2094	return freedir [i];
2130	}	2095	}
2131	}	2096	}
2132	}	2097	}
2133		2098
2134	return 0;	2099	return 0;
…		…
2209	* This basically means that if direction is 15, then it could either go	2174	* This basically means that if direction is 15, then it could either go
2210	* direction 4, 14, or 16 to get back to where we are.	2175	* direction 4, 14, or 16 to get back to where we are.
2211	* Moved from spell_util.c to object.c with the other related direction	2176	* Moved from spell_util.c to object.c with the other related direction
2212	* functions.	2177	* functions.
2213	*/	2178	*/
2214	int reduction_dir[SIZEOFFREE][3] = {	2179	const int reduction_dir[SIZEOFFREE][3] = {
2215	{0, 0, 0}, /* 0 */	2180	{0, 0, 0}, /* 0 */
2216	{0, 0, 0}, /* 1 */	2181	{0, 0, 0}, /* 1 */
2217	{0, 0, 0}, /* 2 */	2182	{0, 0, 0}, /* 2 */
2218	{0, 0, 0}, /* 3 */	2183	{0, 0, 0}, /* 3 */
2219	{0, 0, 0}, /* 4 */	2184	{0, 0, 0}, /* 4 */
…		…
2315	int	2280	int
2316	can_pick (const object who, const object item)	2281	can_pick (const object who, const object item)
2317	{	2282	{
2318	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2283	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2319	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2320	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2285	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2321	}	2286	}
2322		2287
2323	/*	2288	/*
2324	* create clone from object to another	2289	* create clone from object to another
2325	*/	2290	*/
2326	object *	2291	object *
2327	object_create_clone (object *asrc)	2292	object::deep_clone ()
2328	{	2293	{
		2294	assert (("deep_clone called on non-head object", is_head ()));
		2295
2329	object *dst = 0;	2296	object *dst = clone ();
2330		2297
2331	if (!asrc)
2332	return 0;
2333
2334	object *src = asrc->head_ ();
2335
2336	object *prev = 0;	2298	object *prev = dst;
2337	for (object *part = src; part; part = part->more)	2299	for (object *part = this->more; part; part = part->more)
2338	{	2300	{
2339	object *tmp = part->clone ();	2301	object *tmp = part->clone ();
2340
2341	tmp->x -= src->x;
2342	tmp->y -= src->y;
2343
2344	if (!part->head)
2345	{
2346	dst = tmp;
2347	tmp->head = 0;
2348	}
2349	else
2350	tmp->head = dst;	2302	tmp->head = dst;
2351
2352	tmp->more = 0;
2353
2354	if (prev)
2355	prev->more = tmp;	2303	prev->more = tmp;
2356
2357	prev = tmp;	2304	prev = tmp;
2358	}	2305	}
2359		2306
2360	for (object *item = src->inv; item; item = item->below)	2307	for (object *item = inv; item; item = item->below)
2361	insert_ob_in_ob (object_create_clone (item), dst);	2308	insert_ob_in_ob (item->deep_clone (), dst);
2362		2309
2363	return dst;	2310	return dst;
2364	}	2311	}
2365		2312
2366	/* This returns the first object in who's inventory that	2313	/* This returns the first object in who's inventory that
…		…
2375	return tmp;	2322	return tmp;
2376		2323
2377	return 0;	2324	return 0;
2378	}	2325	}
2379		2326
2380	/* If ob has a field named key, return the link from the list,	2327	shstr_tmp
2381	* otherwise return NULL.	2328	object::kv_get (shstr_tmp key) const
2382	*
2383	* key must be a passed in shared string - otherwise, this won't
2384	* do the desired thing.
2385	*/
2386	key_value *
2387	get_ob_key_link (const object ob, const char key)
2388	{	2329	{
2389	for (key_value *link = ob->key_values; link; link = link->next)	2330	for (key_value *kv = key_values; kv; kv = kv->next)
2390	if (link->key == key)	2331	if (kv->key == key)
2391	return link;
2392
2393	return 0;
2394	}
2395
2396	/*
2397	* Returns the value of op has an extra_field for key, or NULL.
2398	*
2399	* The argument doesn't need to be a shared string.
2400	*
2401	* The returned string is shared.
2402	*/
2403	const char *
2404	get_ob_key_value (const object op, const char const key)
2405	{
2406	key_value *link;
2407	shstr_cmp canonical_key (key);
2408
2409	if (!canonical_key)
2410	{
2411	/* 1. There being a field named key on any object
2412	* implies there'd be a shared string to find.
2413	* 2. Since there isn't, no object has this field.
2414	* 3. Therefore, this object doesn't have this field.
2415	*/
2416	return 0;
2417	}
2418
2419	/* This is copied from get_ob_key_link() above -
2420	* only 4 lines, and saves the function call overhead.
2421	*/
2422	for (link = op->key_values; link; link = link->next)
2423	if (link->key == canonical_key)
2424	return link->value;	2332	return kv->value;
2425		2333
2426	return 0;	2334	return shstr ();
2427	}	2335	}
2428		2336
2429	/*	2337	void
2430	* Updates the canonical_key in op to value.	2338	object::kv_set (shstr_tmp key, shstr_tmp value)
2431	*
2432	* canonical_key is a shared string (value doesn't have to be).
2433	*
2434	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2435	* keys.
2436	*
2437	* Returns TRUE on success.
2438	*/
2439	int
2440	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2441	{	2339	{
2442	key_value field = NULL, last = NULL;	2340	for (key_value *kv = key_values; kv; kv = kv->next)
2443		2341	if (kv->key == key)
2444	for (field = op->key_values; field != NULL; field = field->next)
2445	{
2446	if (field->key != canonical_key)
2447	{	2342	{
2448	last = field;	2343	kv->value = value;
2449	continue;	2344	return;
2450	}	2345	}
2451		2346
2452	if (value)	2347	key_value *kv = new key_value;
2453	field->value = value;	2348
2454	else	2349	kv->next = key_values;
		2350	kv->key = key;
		2351	kv->value = value;
		2352
		2353	key_values = kv;
		2354	}
		2355
		2356	void
		2357	object::kv_del (shstr_tmp key)
		2358	{
		2359	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2360	if ((*kvp)->key == key)
2455	{	2361	{
2456	/* Basically, if the archetype has this key set,	2362	key_value kv = kvp;
2457	* we need to store the null value so when we save	2363	kvp = (kvp)->next;
2458	* it, we save the empty value so that when we load,	2364	delete kv;
2459	* we get this value back again.	2365	return;
2460	*/
2461	if (get_ob_key_link (op->arch, canonical_key))
2462	field->value = 0;
2463	else
2464	{
2465	if (last)
2466	last->next = field->next;
2467	else
2468	op->key_values = field->next;
2469
2470	delete field;
2471	}
2472	}	2366	}
2473	return TRUE;
2474	}
2475	/* IF we get here, key doesn't exist */
2476
2477	/* No field, we'll have to add it. */
2478
2479	if (!add_key)
2480	return FALSE;
2481
2482	/* There isn't any good reason to store a null
2483	* value in the key/value list. If the archetype has
2484	* this key, then we should also have it, so shouldn't
2485	* be here. If user wants to store empty strings,
2486	* should pass in ""
2487	*/
2488	if (value == NULL)
2489	return TRUE;
2490
2491	field = new key_value;
2492
2493	field->key = canonical_key;
2494	field->value = value;
2495	/* Usual prepend-addition. */
2496	field->next = op->key_values;
2497	op->key_values = field;
2498
2499	return TRUE;
2500	}
2501
2502	/*
2503	* Updates the key in op to value.
2504	*
2505	* If add_key is FALSE, this will only update existing keys,
2506	* and not add new ones.
2507	* In general, should be little reason FALSE is ever passed in for add_key
2508	*
2509	* Returns TRUE on success.
2510	*/
2511	int
2512	set_ob_key_value (object op, const char key, const char *value, int add_key)
2513	{
2514	shstr key_ (key);
2515
2516	return set_ob_key_value_s (op, key_, value, add_key);
2517	}	2367	}
2518		2368
2519	object::depth_iterator::depth_iterator (object *container)	2369	object::depth_iterator::depth_iterator (object *container)
2520	: iterator_base (container)	2370	: iterator_base (container)
2521	{	2371	{
…		…
2571	{	2421	{
2572	char flagdesc[512];	2422	char flagdesc[512];
2573	char info2[256 * 4];	2423	char info2[256 * 4];
2574	char *p = info;	2424	char *p = info;
2575		2425
2576	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2426	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2577	count,	2427	count,
2578	uuid.c_str (),	2428	uuid.c_str (),
2579	&name,	2429	&name,
2580	title ? "\",title:\"" : "",	2430	title ? ",title:\"" : "",
2581	title ? (const char *)title : "",	2431	title ? (const char *)title : "",
		2432	title ? "\"" : "",
2582	flag_desc (flagdesc, 512), type);	2433	flag_desc (flagdesc, 512), type);
2583		2434
2584	if (!flag[FLAG_REMOVED] && env)	2435	if (!flag[FLAG_REMOVED] && env)
2585	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2436	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2586		2437
…		…
2680	// else if (!old_container->env && contr && contr->ns)	2531	// else if (!old_container->env && contr && contr->ns)
2681	// contr->ns->floorbox_reset ();	2532	// contr->ns->floorbox_reset ();
2682	}	2533	}
2683		2534
2684	object *	2535	object *
2685	object::force_find (const shstr name)	2536	object::force_find (shstr_tmp name)
2686	{	2537	{
2687	/* cycle through his inventory to look for the MARK we want to	2538	/* cycle through his inventory to look for the MARK we want to
2688	* place	2539	* place
2689	*/	2540	*/
2690	for (object *tmp = inv; tmp; tmp = tmp->below)	2541	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2692	return splay (tmp);	2543	return splay (tmp);
2693		2544
2694	return 0;	2545	return 0;
2695	}	2546	}
2696		2547
2697	void	2548	object *
2698	object::force_add (const shstr name, int duration)	2549	object::force_add (shstr_tmp name, int duration)
2699	{	2550	{
2700	if (object *force = force_find (name))	2551	if (object *force = force_find (name))
2701	force->destroy ();	2552	force->destroy ();
2702		2553
2703	object *force = get_archetype (FORCE_NAME);	2554	object *force = get_archetype (FORCE_NAME);
…		…
2708		2559
2709	force->set_speed (duration ? 1.f / duration : 0.f);	2560	force->set_speed (duration ? 1.f / duration : 0.f);
2710	force->flag [FLAG_IS_USED_UP] = true;	2561	force->flag [FLAG_IS_USED_UP] = true;
2711	force->flag [FLAG_APPLIED] = true;	2562	force->flag [FLAG_APPLIED] = true;
2712		2563
2713	insert (force);	2564	return insert (force);
2714	}	2565	}
2715		2566
2716	void	2567	void
2717	object::play_sound (faceidx sound)	2568	object::play_sound (faceidx sound)
2718	{	2569	{
…		…
2729	}	2580	}
2730	else	2581	else
2731	map->play_sound (sound, x, y);	2582	map->play_sound (sound, x, y);
2732	}	2583	}
2733		2584
		2585	void
		2586	object::make_noise ()
		2587	{
		2588	// we do not model noise in the map, so instead put
		2589	// a temporary light into the noise source
		2590	// could use the map instead, but that's less reliable for our
		2591	// goal, which is to make invisibility a bit harder to exploit
		2592
		2593	// currently only works sensibly for players
		2594	if (!is_player ())
		2595	return;
		2596
		2597	// find old force, or create new one
		2598	object *force = force_find (shstr_noise_force);
		2599
		2600	if (force)
		2601	force->speed_left = -1.f; // patch old speed up
		2602	else
		2603	{
		2604	force = archetype::get (shstr_noise_force);
		2605
		2606	force->slaying = shstr_noise_force;
		2607	force->stats.food = 1;
		2608	force->speed_left = -1.f;
		2609
		2610	force->set_speed (1.f / 4.f);
		2611	force->flag [FLAG_IS_USED_UP] = true;
		2612	force->flag [FLAG_APPLIED] = true;
		2613
		2614	insert (force);
		2615	}
		2616	}
		2617

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.224 by root, Fri May 2 20:16:24 2008 UTC vs. Revision 1.279 by root, Thu Jan 8 03:03:23 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.224 by root, Fri May 2 20:16:24 2008 UTC vs.
Revision 1.279 by root, Thu Jan 8 03:03:23 2009 UTC