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

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

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.223 by root, Wed Apr 30 08:29:31 2008 UTC vs. Revision 1.282 by root, Tue Feb 17 03:53:31 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.223 by root, Wed Apr 30 08:29:31 2008 UTC vs.
Revision 1.282 by root, Tue Feb 17 03:53:31 2009 UTC