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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC vs.
Revision 1.287 by root, Sat Oct 3 20:11:12 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
40		41
41	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
139		140
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	142	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	143	compare_ob_value_lists_one (const object wants, const object has)
143	{	144	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	145	/* n-squared behaviour (see kv_get), but I'm hoping both
147	* objects with lists are rare, and lists stay short. If not, use a	146	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	147	* different structure or at least keep the lists sorted...
149	*/	148	*/
150		149
151	/* For each field in wants, */	150	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	151	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	152	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	153	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		154
169	/* If we get here, every field in wants has a matching field in has. */	155	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	156	return true;
171	}	157	}
172		158
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	159	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	160	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	161	compare_ob_value_lists (const object ob1, const object ob2)
176	{	162	{
177	/* However, there may be fields in has which aren't partnered in wants,	163	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison twice. :(	164	* so we need to run the comparison twice. :(
179	*/	165	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	166	return compare_ob_value_lists_one (ob1, ob2)
		167	&& compare_ob_value_lists_one (ob2, ob1);
181	}	168	}
182		169
183	/* Function examines the 2 objects given to it, and returns true if	170	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	171	* they can be merged together.
185	*	172	*
…		…
200	\|\| ob1->speed != ob2->speed	187	\|\| ob1->speed != ob2->speed
201	\|\| ob1->value != ob2->value	188	\|\| ob1->value != ob2->value
202	\|\| ob1->name != ob2->name)	189	\|\| ob1->name != ob2->name)
203	return 0;	190	return 0;
204		191
205	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2*31-1 /
207	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
208	* nrof values.
209	*/
210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	195	return 0;
212		196
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* This is to the comparison of the flags below will be OK. We	198	* This is to the comparison of the flags below will be OK. We
215	* just can't ignore the been applied or identified flags, as they	199	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		205
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		208
225	if (ob1->arch->name != ob2->arch->name	209	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	210	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	211	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	212	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	213	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	214	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	215	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	216	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	217	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	218	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	219	\|\| ob1->animation_id != ob2->animation_id
		220	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	221	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	222	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	223	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	224	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	225	\|\| ob1->move_type != ob2->move_type
…		…
248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	234	return 0;
250		235
251	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
255	.any ())	239	.any ())
256	return 0;	240	return 0;
257		241
258	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
340	{	324	{
341	// see if we are in a container of sorts	325	// see if we are in a container of sorts
342	if (env)	326	if (env)
343	{	327	{
344	// the player inventory itself is always visible	328	// the player inventory itself is always visible
345	if (env->type == PLAYER)	329	if (env->is_player ())
346	return env;	330	return env;
347		331
348	// else a player could have our env open	332	// else a player could have our env open
349	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
350		334
351	// the player itself is always on a map, so we will find him here	335	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	336	// even if our inv is in a player.
353	if (envest->is_on_map ())	337	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
358	else	342	else
359	{	343	{
360	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
364	return pl;	349	return pl;
365	}	350	}
366	}	351	}
367		352
368	return 0;	353	return 0;
369	}	354	}
370		355
371	// adjust weight per container type ("of holding")	356	// adjust weight per container type ("of holding")
372	static sint32	357	static sint32
373	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
374	{	359	{
375	return op->type == CONTAINER	360	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	362	: weight;
378	}	363	}
…		…
384	static void	369	static void
385	adjust_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
386	{	371	{
387	while (op)	372	while (op)
388	{	373	{
		374	// adjust by actual difference to account for rounding errors
		375	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
390		378
391	if (!weight)	379	if (!weight)
392	return;	380	return;
393		381
394	op->carrying += weight;	382	op->carrying += weight;
…		…
417	op->update_weight ();	405	op->update_weight ();
418		406
419	sum += op->total_weight ();	407	sum += op->total_weight ();
420	}	408	}
421		409
422	sum = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
423		411
424	if (sum != carrying)	412	if (sum != carrying)
425	{	413	{
426	carrying = sum;	414	carrying = sum;
427		415
…		…
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.
…		…
649	}	637	}
650		638
651	if (speed < 0)	639	if (speed < 0)
652	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
653		641
654	dst->set_speed (dst->speed);	642	dst->activate ();
655	}	643	}
656		644
657	void	645	void
658	object::instantiate ()	646	object::instantiate ()
659	{	647	{
…		…
771	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
772	{	760	{
773	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
774	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
775	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
776	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
777	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
778	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
779	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
780	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
781	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
782	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
783	/* 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
784	* to have move_allow right now.	772	* have move_allow right now.
785	*/	773	*/
786	\|\| ((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
787	\|\| 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)
788	m.flags_ = 0;	776	m.invalidate ();
789	}	777	}
790	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
791	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
792	* that is being removed.	780	* that is being removed.
793	*/	781	*/
794	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
795	m.flags_ = 0;	783	m.invalidate ();
796	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
797	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
798	else	786	else
799	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
800		788
…		…
804		792
805	object::object ()	793	object::object ()
806	{	794	{
807	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
808		796
809	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
810	face = blank_face;	798	face = blank_face;
811	}	799	}
812		800
813	object::~object ()	801	object::~object ()
814	{	802	{
…		…
844	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
845	if (active)	833	if (active)
846	return;	834	return;
847		835
848	if (has_active_speed ())	836	if (has_active_speed ())
		837	{
		838	if (flag [FLAG_FREED])
		839	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		840
849	actives.insert (this);	841	actives.insert (this);
		842	}
850	}	843	}
851		844
852	void	845	void
853	object::activate_recursive ()	846	object::activate_recursive ()
854	{	847	{
…		…
915	* drop on that space.	908	* drop on that space.
916	*/	909	*/
917	if (!drop_to_ground	910	if (!drop_to_ground
918	\|\| !map	911	\|\| !map
919	\|\| map->in_memory != MAP_ACTIVE	912	\|\| map->in_memory != MAP_ACTIVE
920	\|\| map->nodrop	913	\|\| map->no_drop
921	\|\| ms ().move_block == MOVE_ALL)	914	\|\| ms ().move_block == MOVE_ALL)
922	{	915	{
923	while (inv)	916	while (inv)
924	{
925	inv->destroy_inv (false);
926	inv->destroy ();	917	inv->destroy ();
927	}
928	}	918	}
929	else	919	else
930	{ /* Put objects in inventory onto this space */	920	{ /* Put objects in inventory onto this space */
931	while (inv)	921	while (inv)
932	{	922	{
…		…
936	\|\| op->flag [FLAG_NO_DROP]	926	\|\| op->flag [FLAG_NO_DROP]
937	\|\| op->type == RUNE	927	\|\| op->type == RUNE
938	\|\| op->type == TRAP	928	\|\| op->type == TRAP
939	\|\| op->flag [FLAG_IS_A_TEMPLATE]	929	\|\| op->flag [FLAG_IS_A_TEMPLATE]
940	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	930	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
941	op->destroy (true);	931	op->destroy ();
942	else	932	else
943	map->insert (op, x, y);	933	map->insert (op, x, y);
944	}	934	}
945	}	935	}
946	}	936	}
…		…
954		944
955	static struct freed_map : maptile	945	static struct freed_map : maptile
956	{	946	{
957	freed_map ()	947	freed_map ()
958	{	948	{
959	path = "<freed objects map>";	949	path = "<freed objects map>";
960	name = "/internal/freed_objects_map";	950	name = "/internal/freed_objects_map";
961	width = 3;	951	width = 3;
962	height = 3;	952	height = 3;
963	nodrop = 1;	953	no_drop = 1;
		954	no_reset = 1;
964		955
965	alloc ();	956	alloc ();
966	in_memory = MAP_ACTIVE;	957	in_memory = MAP_ACTIVE;
967	}	958	}
		959
		960	~freed_map ()
		961	{
		962	destroy ();
		963	}
968	} freed_map; // freed objects are moved here to avoid crashes	964	} freed_map; // freed objects are moved here to avoid crashes
969		965
970	void	966	void
971	object::do_destroy ()	967	object::do_destroy ()
972	{	968	{
973	if (flag [FLAG_IS_LINKED])	969	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	970	remove_link ();
975		971
976	if (flag [FLAG_FRIENDLY])	972	if (flag [FLAG_FRIENDLY])
977	remove_friendly_object (this);	973	remove_friendly_object (this);
978		974
979	remove ();	975	remove ();
…		…
1004	attacked_by = 0;	1000	attacked_by = 0;
1005	current_weapon = 0;	1001	current_weapon = 0;
1006	}	1002	}
1007		1003
1008	void	1004	void
1009	object::destroy (bool destroy_inventory)	1005	object::destroy ()
1010	{	1006	{
1011	if (destroyed ())	1007	if (destroyed ())
1012	return;	1008	return;
1013		1009
1014	if (!is_head () && !head->destroyed ())	1010	if (!is_head () && !head->destroyed ())
1015	{	1011	{
1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1012	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1017	head->destroy (destroy_inventory);	1013	head->destroy ();
1018	return;	1014	return;
1019	}	1015	}
1020		1016
1021	destroy_inv (!destroy_inventory);	1017	destroy_inv (false);
1022		1018
1023	if (is_head ())	1019	if (is_head ())
1024	if (sound_destroy)	1020	if (sound_destroy)
1025	play_sound (sound_destroy);	1021	play_sound (sound_destroy);
1026	else if (flag [FLAG_MONSTER])	1022	else if (flag [FLAG_MONSTER])
…		…
1063	esrv_del_item (pl->contr, count);	1059	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1061
1066	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
1067		1063
1068	*(above ? &above->below : &env->inv) = below;	1064	object *pl = in_player ();
1069
1070	if (below)
1071	below->above = above;
1072		1065
1073	/* we set up values so that it could be inserted into	1066	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up	1067	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.	1068	* to the caller to decide what we want to do.
1076	*/	1069	*/
1077	map = env->map;	1070	map = env->map;
1078	x = env->x;	1071	x = env->x;
1079	y = env->y;	1072	y = env->y;
		1073
		1074	// make sure cmov optimisation is applicable
		1075	*(above ? &above->below : &env->inv) = below;
		1076	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1077
1080	above = 0;	1078	above = 0;
1081	below = 0;	1079	below = 0;
1082	env = 0;	1080	env = 0;
1083		1081
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1082	/* NO_FIX_PLAYER is set when a great many changes are being
1085	* made to players inventory. If set, avoiding the call	1083	* made to players inventory. If set, avoiding the call
1086	* to save cpu time.	1084	* to save cpu time.
1087	*/	1085	*/
1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1086	if (pl)
		1087	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1088	{
1089	otmp->update_stats ();	1089	pl->update_stats ();
		1090
		1091	if (glow_radius && pl->is_on_map ())
		1092	update_all_los (pl->map, pl->x, pl->y);
		1093	}
1090	}	1094	}
1091	else if (map)	1095	else if (map)
1092	{	1096	{
1093	map->dirty = true;	1097	map->dirty = true;
1094	mapspace &ms = this->ms ();	1098	mapspace &ms = this->ms ();
1095		1099
1096	if (object *pl = ms.player ())	1100	if (object *pl = ms.player ())
1097	{	1101	{
1098	if (type == PLAYER) // this == pl(!)	1102	if (is_player ())
1099	{	1103	{
		1104	if (!flag [FLAG_WIZPASS])
		1105	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1106
1100	// leaving a spot always closes any open container on the ground	1107	// leaving a spot always closes any open container on the ground
1101	if (container && !container->env)	1108	if (container && !container->env)
1102	// this causes spurious floorbox updates, but it ensures	1109	// this causes spurious floorbox updates, but it ensures
1103	// that the CLOSE event is being sent.	1110	// that the CLOSE event is being sent.
1104	close_container ();	1111	close_container ();
…		…
1114		1121
1115	esrv_del_item (pl->contr, count);	1122	esrv_del_item (pl->contr, count);
1116	}	1123	}
1117		1124
1118	/* link the object above us */	1125	/* link the object above us */
1119	if (above)	1126	// re-link, make sure compiler can easily use cmove
1120	above->below = below;	1127	*(above ? &above->below : &ms.top) = below;
1121	else	1128	*(below ? &below->above : &ms.bot) = above;
1122	ms.top = below; /* we were top, set new top */
1123
1124	/* Relink the object below us, if there is one */
1125	if (below)
1126	below->above = above;
1127	else
1128	{
1129	/* Nothing below, which means we need to relink map object for this space
1130	* use translated coordinates in case some oddness with map tiling is
1131	* evident
1132	*/
1133	if (GET_MAP_OB (map, x, y) != this)
1134	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 ());
1135
1136	ms.bot = above; /* goes on above it. */
1137	}
1138		1129
1139	above = 0;	1130	above = 0;
1140	below = 0;	1131	below = 0;
		1132
		1133	ms.invalidate ();
1141		1134
1142	if (map->in_memory == MAP_SAVING)	1135	if (map->in_memory == MAP_SAVING)
1143	return;	1136	return;
1144		1137
1145	int check_walk_off = !flag [FLAG_NO_APPLY];	1138	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1178	}	1171	}
1179		1172
1180	last = tmp;	1173	last = tmp;
1181	}	1174	}
1182		1175
1183	/* last == NULL if there are no objects on this space */	1176	if (affects_los ())
1184	//TODO: this makes little sense, why only update the topmost object?
1185	if (!last)
1186	map->at (x, y).flags_ = 0;
1187	else
1188	update_object (last, UP_OBJ_REMOVE);
1189
1190	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1191	update_all_los (map, x, y);	1177	update_all_los (map, x, y);
1192	}	1178	}
1193	}	1179	}
1194		1180
1195	/*	1181	/*
…		…
1219	esrv_update_item (UPD_NROF, pl, top);	1205	esrv_update_item (UPD_NROF, pl, top);
1220		1206
1221	op->weight = 0; // cancel the addition above	1207	op->weight = 0; // cancel the addition above
1222	op->carrying = 0; // must be 0 already	1208	op->carrying = 0; // must be 0 already
1223		1209
1224	op->destroy (1);	1210	op->destroy ();
1225		1211
1226	return top;	1212	return top;
1227	}	1213	}
1228		1214
1229	return 0;	1215	return 0;
…		…
1257	* job preparing multi-part monsters.	1243	* job preparing multi-part monsters.
1258	*/	1244	*/
1259	object *	1245	object *
1260	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1246	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1261	{	1247	{
		1248	op->remove ();
		1249
1262	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1250	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1263	{	1251	{
1264	tmp->x = x + tmp->arch->x;	1252	tmp->x = x + tmp->arch->x;
1265	tmp->y = y + tmp->arch->y;	1253	tmp->y = y + tmp->arch->y;
1266	}	1254	}
…		…
1289	* just 'op' otherwise	1277	* just 'op' otherwise
1290	*/	1278	*/
1291	object *	1279	object *
1292	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1280	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1293	{	1281	{
1294	assert (!op->flag [FLAG_FREED]);
1295
1296	op->remove ();	1282	op->remove ();
		1283
		1284	if (m == &freed_map)//D TODO: remove soon
		1285	{//D
		1286	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1287	}//D
1297		1288
1298	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1299	* of areas of callers (eg, anything that uses find_free_spot would now	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1300	* need extra work	1291	* need extra work
1301	*/	1292	*/
		1293	maptile *newmap = m;
1302	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1303	{	1295	{
1304	op->destroy (1);	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1305	return 0;	1297	return 0;
1306	}	1298	}
1307		1299
1308	if (object *more = op->more)	1300	if (object *more = op->more)
1309	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1310	return 0;	1302	return 0;
1311		1303
1312	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1313		1305	op->env = 0;
1314	op->map = m;	1306	op->map = newmap;
		1307
1315	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1316		1309
1317	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1318	*/	1311	*/
1319	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1313	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1321	if (object::can_merge (op, tmp))	1314	if (object::can_merge (op, tmp))
1322	{	1315	{
1323	// TODO: we atcually want to update tmp, not op,	1316	// TODO: we actually want to update tmp, not op,
1324	// but some caller surely breaks when we return tmp	1317	// but some caller surely breaks when we return tmp
1325	// from here :/	1318	// from here :/
1326	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1327	tmp->destroy (1);	1320	tmp->destroy ();
1328	}	1321	}
1329		1322
1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1323	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1332		1325
…		…
1339	{	1332	{
1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1333	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1341	abort ();	1334	abort ();
1342	}	1335	}
1343		1336
		1337	if (!originator->is_on_map ())
		1338	{
		1339	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1340	op->debug_desc (), originator->debug_desc ());
		1341	abort ();
		1342	}
		1343
1344	op->above = originator;	1344	op->above = originator;
1345	op->below = originator->below;	1345	op->below = originator->below;
1346
1347	if (op->below)
1348	op->below->above = op;
1349	else
1350	ms.bot = op;
1351
1352	/* since below originator, no need to update top */
1353	originator->below = op;	1346	originator->below = op;
		1347
		1348	*(op->below ? &op->below->above : &ms.bot) = op;
1354	}	1349	}
1355	else	1350	else
1356	{	1351	{
1357	object top, floor = NULL;	1352	object *floor = 0;
1358		1353	object *top = ms.top;
1359	top = ms.bot;
1360		1354
1361	/* If there are other objects, then */	1355	/* If there are other objects, then */
1362	if (top)	1356	if (top)
1363	{	1357	{
1364	object *last = 0;
1365
1366	/*	1358	/*
1367	* If there are multiple objects on this space, we do some trickier handling.	1359	* If there are multiple objects on this space, we do some trickier handling.
1368	* We've already dealt with merging if appropriate.	1360	* We've already dealt with merging if appropriate.
1369	* Generally, we want to put the new object on top. But if	1361	* Generally, we want to put the new object on top. But if
1370	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1373	* once we get to them. This reduces the need to traverse over all of	1365	* once we get to them. This reduces the need to traverse over all of
1374	* them when adding another one - this saves quite a bit of cpu time	1366	* them when adding another one - this saves quite a bit of cpu time
1375	* when lots of spells are cast in one area. Currently, it is presumed	1367	* when lots of spells are cast in one area. Currently, it is presumed
1376	* that flying non pickable objects are spell objects.	1368	* that flying non pickable objects are spell objects.
1377	*/	1369	*/
1378	for (top = ms.bot; top; top = top->above)	1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1379	{	1371	{
1380	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1372	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1381	floor = top;	1373	floor = tmp;
1382		1374
1383	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1375	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1384	{	1376	{
1385	/* We insert above top, so we want this object below this */	1377	/* We insert above top, so we want this object below this */
1386	top = top->below;	1378	top = tmp->below;
1387	break;	1379	break;
1388	}	1380	}
1389		1381
1390	last = top;	1382	top = tmp;
1391	}	1383	}
1392
1393	/* Don't want top to be NULL, so set it to the last valid object */
1394	top = last;
1395		1384
1396	/* We let update_position deal with figuring out what the space	1385	/* We let update_position deal with figuring out what the space
1397	* looks like instead of lots of conditions here.	1386	* looks like instead of lots of conditions here.
1398	* makes things faster, and effectively the same result.	1387	* makes things faster, and effectively the same result.
1399	*/	1388	*/
…		…
1406	*/	1395	*/
1407	if (!(flag & INS_ON_TOP)	1396	if (!(flag & INS_ON_TOP)
1408	&& ms.flags () & P_BLOCKSVIEW	1397	&& ms.flags () & P_BLOCKSVIEW
1409	&& (op->face && !faces [op->face].visibility))	1398	&& (op->face && !faces [op->face].visibility))
1410	{	1399	{
		1400	object *last;
		1401
1411	for (last = top; last != floor; last = last->below)	1402	for (last = top; last != floor; last = last->below)
1412	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1413	break;	1404	break;
1414		1405
1415	/* Check to see if we found the object that blocks view,	1406	/* Check to see if we found the object that blocks view,
…		…
1423	} /* If objects on this space */	1414	} /* If objects on this space */
1424		1415
1425	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1426	top = floor;	1417	top = floor;
1427		1418
1428	/* Top is the object that our object (op) is going to get inserted above.	1419	// insert object above top, or bottom-most if top = 0
1429	*/
1430
1431	/* First object on this space */
1432	if (!top)	1420	if (!top)
1433	{	1421	{
		1422	op->below = 0;
1434	op->above = ms.bot;	1423	op->above = ms.bot;
1435
1436	if (op->above)
1437	op->above->below = op;
1438
1439	op->below = 0;
1440	ms.bot = op;	1424	ms.bot = op;
		1425
		1426	*(op->above ? &op->above->below : &ms.top) = op;
1441	}	1427	}
1442	else	1428	else
1443	{ /* get inserted into the stack above top */	1429	{
1444	op->above = top->above;	1430	op->above = top->above;
1445
1446	if (op->above)
1447	op->above->below = op;	1431	top->above = op;
1448		1432
1449	op->below = top;	1433	op->below = top;
1450	top->above = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1451	}	1435	}
		1436	}
1452		1437
1453	if (!op->above)	1438	if (op->is_player ())
1454	ms.top = op;
1455	} /* else not INS_BELOW_ORIGINATOR */
1456
1457	if (op->type == PLAYER)
1458	{	1439	{
1459	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1460	++op->map->players;	1441	++op->map->players;
1461	op->map->touch ();	1442	op->map->touch ();
1462	}	1443	}
…		…
1477	* be far away from this change and not affected in any way -	1458	* be far away from this change and not affected in any way -
1478	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1479	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1480	* of effect may be sufficient.	1461	* of effect may be sufficient.
1481	*/	1462	*/
1482	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1483	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1484		1468
1485	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1486	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1487		1471
1488	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1495	* blocked() and wall() work properly), and these flags are updated by	1479	* blocked() and wall() work properly), and these flags are updated by
1496	* update_object().	1480	* update_object().
1497	*/	1481	*/
1498		1482
1499	/* if this is not the head or flag has been passed, don't check walk on status */	1483	/* if this is not the head or flag has been passed, don't check walk on status */
1500	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1484	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1501	{	1485	{
1502	if (check_move_on (op, originator))	1486	if (check_move_on (op, originator))
1503	return 0;	1487	return 0;
1504		1488
1505	/* If we are a multi part object, lets work our way through the check	1489	/* If we are a multi part object, lets work our way through the check
…		…
1516	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1517	* finds an object of its own type, it'll remove that one first.	1501	* finds an object of its own type, it'll remove that one first.
1518	* op is the object to insert it under: supplies x and the map.	1502	* op is the object to insert it under: supplies x and the map.
1519	*/	1503	*/
1520	void	1504	void
1521	replace_insert_ob_in_map (const char arch_string, object op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1522	{	1506	{
1523	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1524		1508
1525	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1526	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1527	tmp->destroy (1);	1511	tmp->destroy ();
1528		1512
1529	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1530		1514
1531	tmp->x = op->x;	1515	tmp->x = op->x;
1532	tmp->y = op->y;	1516	tmp->y = op->y;
1533		1517
1534	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1556	if (!nr)	1540	if (!nr)
1557	return true;	1541	return true;
1558		1542
1559	nr = min (nr, nrof);	1543	nr = min (nr, nrof);
1560		1544
		1545	if (nrof > nr)
		1546	{
1561	nrof -= nr;	1547	nrof -= nr;
1562
1563	if (nrof)
1564	{
1565	adjust_weight (env, -weight * nr); // carrying == 0	1548	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1566		1549
1567	if (object *pl = visible_to ())	1550	if (object *pl = visible_to ())
1568	esrv_update_item (UPD_NROF, pl, this);	1551	esrv_update_item (UPD_NROF, pl, this);
1569		1552
1570	return true;	1553	return true;
1571	}	1554	}
1572	else	1555	else
1573	{	1556	{
1574	destroy (1);	1557	destroy ();
1575	return false;	1558	return false;
1576	}	1559	}
1577	}	1560	}
1578		1561
1579	/*	1562	/*
…		…
1596	}	1579	}
1597	else	1580	else
1598	{	1581	{
1599	decrease (nr);	1582	decrease (nr);
1600		1583
1601	object *op = object_create_clone (this);	1584	object *op = deep_clone ();
1602	op->nrof = nr;	1585	op->nrof = nr;
1603	return op;	1586	return op;
1604	}	1587	}
1605	}	1588	}
1606		1589
…		…
1656	if (object *pl = tmp->visible_to ())	1639	if (object *pl = tmp->visible_to ())
1657	esrv_update_item (UPD_NROF, pl, tmp);	1640	esrv_update_item (UPD_NROF, pl, tmp);
1658		1641
1659	adjust_weight (this, op->total_weight ());	1642	adjust_weight (this, op->total_weight ());
1660		1643
1661	op->destroy (1);	1644	op->destroy ();
1662	op = tmp;	1645	op = tmp;
1663	goto inserted;	1646	goto inserted;
1664	}	1647	}
1665		1648
1666	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1684		1667
1685	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1686		1669
1687	inserted:	1670	inserted:
1688	/* reset the light list and los of the players on the map */	1671	/* reset the light list and los of the players on the map */
1689	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1690	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1691		1676	}
		1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1692	// if this is a player's inventory, update stats	1678	// if this is a player's inventory, update stats
1693	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1694	update_stats ();	1679	update_stats ();
1695		1680
1696	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1697		1682
1698	return op;	1683	return op;
…		…
1719	* on top.	1704	* on top.
1720	*/	1705	*/
1721	int	1706	int
1722	check_move_on (object op, object originator)	1707	check_move_on (object op, object originator)
1723	{	1708	{
		1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1710	return 0;
		1711
1724	object *tmp;	1712	object *tmp;
1725	maptile *m = op->map;	1713	maptile *m = op->map;
1726	int x = op->x, y = op->y;	1714	int x = op->x, y = op->y;
1727		1715
1728	MoveType move_on, move_slow, move_block;	1716	mapspace &ms = m->at (x, y);
1729		1717
1730	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1718	ms.update ();
1731	return 0;
1732		1719
1733	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1720	MoveType move_on = ms.move_on;
1734	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1721	MoveType move_slow = ms.move_slow;
1735	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1722	MoveType move_block = ms.move_block;
1736		1723
1737	/* if nothing on this space will slow op down or be applied,	1724	/* if nothing on this space will slow op down or be applied,
1738	* no need to do checking below. have to make sure move_type	1725	* no need to do checking below. have to make sure move_type
1739	* is set, as lots of objects don't have it set - we treat that	1726	* is set, as lots of objects don't have it set - we treat that
1740	* as walking.	1727	* as walking.
…		…
1751	return 0;	1738	return 0;
1752		1739
1753	/* The objects have to be checked from top to bottom.	1740	/* The objects have to be checked from top to bottom.
1754	* Hence, we first go to the top:	1741	* Hence, we first go to the top:
1755	*/	1742	*/
1756		1743	for (object next, tmp = ms.top; tmp; tmp = next)
1757	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1758	{
1759	/* Trim the search when we find the first other spell effect
1760	* this helps performance so that if a space has 50 spell objects,
1761	* we don't need to check all of them.
1762	*/
1763	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1764	break;
1765	}	1744	{
		1745	next = tmp->below;
1766		1746
1767	for (; tmp; tmp = tmp->below)
1768	{
1769	if (tmp == op)	1747	if (tmp == op)
1770	continue; /* Can't apply yourself */	1748	continue; /* Can't apply yourself */
1771		1749
1772	/* Check to see if one of the movement types should be slowed down.	1750	/* Check to see if one of the movement types should be slowed down.
1773	* Second check makes sure that the movement types not being slowed	1751	* Second check makes sure that the movement types not being slowed
…		…
1778	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1779	{	1757	{
1780	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1781	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1782	{	1760	{
1783
1784	float
1785	diff = tmp->move_slow_penalty * fabs (op->speed);	1761	float diff = tmp->move_slow_penalty * fabs (op->speed);
1786		1762
1787	if (op->type == PLAYER)	1763	if (op->is_player ())
1788	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1764	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1789	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1765	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1790	diff /= 4.0;	1766	diff /= 4.0;
1791		1767
1792	op->speed_left -= diff;	1768	op->speed_left -= diff;
1793	}	1769	}
1794	}	1770	}
…		…
1827	LOG (llevError, "Present_arch called outside map.\n");	1803	LOG (llevError, "Present_arch called outside map.\n");
1828	return NULL;	1804	return NULL;
1829	}	1805	}
1830		1806
1831	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1807	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1832	if (tmp->arch == at)	1808	if (tmp->arch->archname == at->archname)
1833	return tmp;	1809	return tmp;
1834		1810
1835	return NULL;	1811	return NULL;
1836	}	1812	}
1837		1813
…		…
1901	* The first matching object is returned, or NULL if none.	1877	* The first matching object is returned, or NULL if none.
1902	*/	1878	*/
1903	object *	1879	object *
1904	present_arch_in_ob (const archetype at, const object op)	1880	present_arch_in_ob (const archetype at, const object op)
1905	{	1881	{
1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1882	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1907	if (tmp->arch == at)	1883	if (tmp->arch->archname == at->archname)
1908	return tmp;	1884	return tmp;
1909		1885
1910	return NULL;	1886	return NULL;
1911	}	1887	}
1912		1888
…		…
2000	* head of the object should correspond for the entire object.	1976	* head of the object should correspond for the entire object.
2001	*/	1977	*/
2002	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1978	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2003	continue;	1979	continue;
2004		1980
2005	if (ob->blocked (m, pos.x, pos.y))	1981	if (ob->blocked (pos.m, pos.x, pos.y))
2006	continue;	1982	continue;
2007		1983
2008	altern [index++] = i;	1984	altern [index++] = i;
2009	}	1985	}
2010		1986
…		…
2078	* there is capable of.	2054	* there is capable of.
2079	*/	2055	*/
2080	int	2056	int
2081	find_dir (maptile m, int x, int y, object exclude)	2057	find_dir (maptile m, int x, int y, object exclude)
2082	{	2058	{
2083	int i, max = SIZEOFFREE, mflags;	2059	int max = SIZEOFFREE, mflags;
2084
2085	sint16 nx, ny;
2086	object *tmp;
2087	maptile *mp;
2088
2089	MoveType blocked, move_type;	2060	MoveType move_type;
2090		2061
2091	if (exclude && exclude->head_ () != exclude)	2062	if (exclude && exclude->head_ () != exclude)
2092	{	2063	{
2093	exclude = exclude->head;	2064	exclude = exclude->head;
2094	move_type = exclude->move_type;	2065	move_type = exclude->move_type;
…		…
2097	{	2068	{
2098	/* If we don't have anything, presume it can use all movement types. */	2069	/* If we don't have anything, presume it can use all movement types. */
2099	move_type = MOVE_ALL;	2070	move_type = MOVE_ALL;
2100	}	2071	}
2101		2072
2102	for (i = 1; i < max; i++)	2073	for (int i = 1; i < max; i++)
2103	{	2074	{
2104	mp = m;	2075	mapxy pos (m, x, y);
2105	nx = x + freearr_x[i];	2076	pos.move (i);
2106	ny = y + freearr_y[i];
2107		2077
2108	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2078	if (!pos.normalise ())
2109
2110	if (mflags & P_OUT_OF_MAP)
2111	max = maxfree[i];	2079	max = maxfree[i];
2112	else	2080	else
2113	{	2081	{
2114	mapspace &ms = mp->at (nx, ny);	2082	mapspace &ms = *pos;
2115		2083
2116	blocked = ms.move_block;
2117
2118	if ((move_type & blocked) == move_type)	2084	if ((move_type & ms.move_block) == move_type)
2119	max = maxfree[i];	2085	max = maxfree [i];
2120	else if (mflags & P_IS_ALIVE)	2086	else if (ms.flags () & P_IS_ALIVE)
2121	{	2087	{
2122	for (tmp = ms.bot; tmp; tmp = tmp->above)	2088	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2123	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2089	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2124	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2090	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2125	break;
2126
2127	if (tmp)
2128	return freedir[i];	2091	return freedir [i];
2129	}	2092	}
2130	}	2093	}
2131	}	2094	}
2132		2095
2133	return 0;	2096	return 0;
…		…
2208	* This basically means that if direction is 15, then it could either go	2171	* This basically means that if direction is 15, then it could either go
2209	* direction 4, 14, or 16 to get back to where we are.	2172	* direction 4, 14, or 16 to get back to where we are.
2210	* Moved from spell_util.c to object.c with the other related direction	2173	* Moved from spell_util.c to object.c with the other related direction
2211	* functions.	2174	* functions.
2212	*/	2175	*/
2213	int reduction_dir[SIZEOFFREE][3] = {	2176	const int reduction_dir[SIZEOFFREE][3] = {
2214	{0, 0, 0}, /* 0 */	2177	{0, 0, 0}, /* 0 */
2215	{0, 0, 0}, /* 1 */	2178	{0, 0, 0}, /* 1 */
2216	{0, 0, 0}, /* 2 */	2179	{0, 0, 0}, /* 2 */
2217	{0, 0, 0}, /* 3 */	2180	{0, 0, 0}, /* 3 */
2218	{0, 0, 0}, /* 4 */	2181	{0, 0, 0}, /* 4 */
…		…
2314	int	2277	int
2315	can_pick (const object who, const object item)	2278	can_pick (const object who, const object item)
2316	{	2279	{
2317	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2280	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2318	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2281	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2319	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2282	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2320	}	2283	}
2321		2284
2322	/*	2285	/*
2323	* create clone from object to another	2286	* create clone from object to another
2324	*/	2287	*/
2325	object *	2288	object *
2326	object_create_clone (object *asrc)	2289	object::deep_clone ()
2327	{	2290	{
		2291	assert (("deep_clone called on non-head object", is_head ()));
		2292
2328	object *dst = 0;	2293	object *dst = clone ();
2329		2294
2330	if (!asrc)
2331	return 0;
2332
2333	object *src = asrc->head_ ();
2334
2335	object *prev = 0;	2295	object *prev = dst;
2336	for (object *part = src; part; part = part->more)	2296	for (object *part = this->more; part; part = part->more)
2337	{	2297	{
2338	object *tmp = part->clone ();	2298	object *tmp = part->clone ();
2339
2340	tmp->x -= src->x;
2341	tmp->y -= src->y;
2342
2343	if (!part->head)
2344	{
2345	dst = tmp;
2346	tmp->head = 0;
2347	}
2348	else
2349	tmp->head = dst;	2299	tmp->head = dst;
2350
2351	tmp->more = 0;
2352
2353	if (prev)
2354	prev->more = tmp;	2300	prev->more = tmp;
2355
2356	prev = tmp;	2301	prev = tmp;
2357	}	2302	}
2358		2303
2359	for (object *item = src->inv; item; item = item->below)	2304	for (object *item = inv; item; item = item->below)
2360	insert_ob_in_ob (object_create_clone (item), dst);	2305	insert_ob_in_ob (item->deep_clone (), dst);
2361		2306
2362	return dst;	2307	return dst;
2363	}	2308	}
2364		2309
2365	/* This returns the first object in who's inventory that	2310	/* This returns the first object in who's inventory that
…		…
2374	return tmp;	2319	return tmp;
2375		2320
2376	return 0;	2321	return 0;
2377	}	2322	}
2378		2323
2379	/* If ob has a field named key, return the link from the list,	2324	shstr_tmp
2380	* otherwise return NULL.	2325	object::kv_get (shstr_tmp key) const
2381	*
2382	* key must be a passed in shared string - otherwise, this won't
2383	* do the desired thing.
2384	*/
2385	key_value *
2386	get_ob_key_link (const object ob, const char key)
2387	{	2326	{
2388	for (key_value *link = ob->key_values; link; link = link->next)	2327	for (key_value *kv = key_values; kv; kv = kv->next)
2389	if (link->key == key)	2328	if (kv->key == key)
2390	return link;
2391
2392	return 0;
2393	}
2394
2395	/*
2396	* Returns the value of op has an extra_field for key, or NULL.
2397	*
2398	* The argument doesn't need to be a shared string.
2399	*
2400	* The returned string is shared.
2401	*/
2402	const char *
2403	get_ob_key_value (const object op, const char const key)
2404	{
2405	key_value *link;
2406	shstr_cmp canonical_key (key);
2407
2408	if (!canonical_key)
2409	{
2410	/* 1. There being a field named key on any object
2411	* implies there'd be a shared string to find.
2412	* 2. Since there isn't, no object has this field.
2413	* 3. Therefore, this object doesn't have this field.
2414	*/
2415	return 0;
2416	}
2417
2418	/* This is copied from get_ob_key_link() above -
2419	* only 4 lines, and saves the function call overhead.
2420	*/
2421	for (link = op->key_values; link; link = link->next)
2422	if (link->key == canonical_key)
2423	return link->value;	2329	return kv->value;
2424		2330
2425	return 0;	2331	return shstr ();
2426	}	2332	}
2427		2333
2428	/*	2334	void
2429	* Updates the canonical_key in op to value.	2335	object::kv_set (shstr_tmp key, shstr_tmp value)
2430	*
2431	* canonical_key is a shared string (value doesn't have to be).
2432	*
2433	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2434	* keys.
2435	*
2436	* Returns TRUE on success.
2437	*/
2438	int
2439	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2440	{	2336	{
2441	key_value field = NULL, last = NULL;	2337	for (key_value *kv = key_values; kv; kv = kv->next)
2442		2338	if (kv->key == key)
2443	for (field = op->key_values; field != NULL; field = field->next)
2444	{
2445	if (field->key != canonical_key)
2446	{	2339	{
2447	last = field;	2340	kv->value = value;
2448	continue;	2341	return;
2449	}	2342	}
2450		2343
2451	if (value)	2344	key_value *kv = new key_value;
2452	field->value = value;	2345
2453	else	2346	kv->next = key_values;
		2347	kv->key = key;
		2348	kv->value = value;
		2349
		2350	key_values = kv;
		2351	}
		2352
		2353	void
		2354	object::kv_del (shstr_tmp key)
		2355	{
		2356	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2357	if ((*kvp)->key == key)
2454	{	2358	{
2455	/* Basically, if the archetype has this key set,	2359	key_value kv = kvp;
2456	* we need to store the null value so when we save	2360	kvp = (kvp)->next;
2457	* it, we save the empty value so that when we load,	2361	delete kv;
2458	* we get this value back again.	2362	return;
2459	*/
2460	if (get_ob_key_link (op->arch, canonical_key))
2461	field->value = 0;
2462	else
2463	{
2464	if (last)
2465	last->next = field->next;
2466	else
2467	op->key_values = field->next;
2468
2469	delete field;
2470	}
2471	}	2363	}
2472	return TRUE;
2473	}
2474	/* IF we get here, key doesn't exist */
2475
2476	/* No field, we'll have to add it. */
2477
2478	if (!add_key)
2479	return FALSE;
2480
2481	/* There isn't any good reason to store a null
2482	* value in the key/value list. If the archetype has
2483	* this key, then we should also have it, so shouldn't
2484	* be here. If user wants to store empty strings,
2485	* should pass in ""
2486	*/
2487	if (value == NULL)
2488	return TRUE;
2489
2490	field = new key_value;
2491
2492	field->key = canonical_key;
2493	field->value = value;
2494	/* Usual prepend-addition. */
2495	field->next = op->key_values;
2496	op->key_values = field;
2497
2498	return TRUE;
2499	}
2500
2501	/*
2502	* Updates the key in op to value.
2503	*
2504	* If add_key is FALSE, this will only update existing keys,
2505	* and not add new ones.
2506	* In general, should be little reason FALSE is ever passed in for add_key
2507	*
2508	* Returns TRUE on success.
2509	*/
2510	int
2511	set_ob_key_value (object op, const char key, const char *value, int add_key)
2512	{
2513	shstr key_ (key);
2514
2515	return set_ob_key_value_s (op, key_, value, add_key);
2516	}	2364	}
2517		2365
2518	object::depth_iterator::depth_iterator (object *container)	2366	object::depth_iterator::depth_iterator (object *container)
2519	: iterator_base (container)	2367	: iterator_base (container)
2520	{	2368	{
…		…
2570	{	2418	{
2571	char flagdesc[512];	2419	char flagdesc[512];
2572	char info2[256 * 4];	2420	char info2[256 * 4];
2573	char *p = info;	2421	char *p = info;
2574		2422
2575	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2423	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2576	count,	2424	count,
2577	uuid.c_str (),	2425	uuid.c_str (),
2578	&name,	2426	&name,
2579	title ? "\",title:\"" : "",	2427	title ? ",title:\"" : "",
2580	title ? (const char *)title : "",	2428	title ? (const char *)title : "",
		2429	title ? "\"" : "",
2581	flag_desc (flagdesc, 512), type);	2430	flag_desc (flagdesc, 512), type);
2582		2431
2583	if (!flag[FLAG_REMOVED] && env)	2432	if (!flag[FLAG_REMOVED] && env)
2584	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2433	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2585		2434
…		…
2641	container = 0;	2490	container = 0;
2642		2491
2643	// client needs item update to make it work, client bug requires this to be separate	2492	// client needs item update to make it work, client bug requires this to be separate
2644	esrv_update_item (UPD_FLAGS, this, old_container);	2493	esrv_update_item (UPD_FLAGS, this, old_container);
2645		2494
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2495	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2647	play_sound (sound_find ("chest_close"));	2496	play_sound (sound_find ("chest_close"));
2648	}	2497	}
2649		2498
2650	if (new_container)	2499	if (new_container)
2651	{	2500	{
…		…
2661	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2510	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2662	new_container->insert (closer);	2511	new_container->insert (closer);
2663	}	2512	}
2664	#endif	2513	#endif
2665		2514
2666	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2515	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2667		2516
2668	// make sure the container is available, client bug requires this to be separate	2517	// make sure the container is available, client bug requires this to be separate
2669	esrv_send_item (this, new_container);	2518	esrv_send_item (this, new_container);
2670		2519
2671	new_container->flag [FLAG_APPLIED] = true;	2520	new_container->flag [FLAG_APPLIED] = true;
…		…
2679	// else if (!old_container->env && contr && contr->ns)	2528	// else if (!old_container->env && contr && contr->ns)
2680	// contr->ns->floorbox_reset ();	2529	// contr->ns->floorbox_reset ();
2681	}	2530	}
2682		2531
2683	object *	2532	object *
2684	object::force_find (const shstr name)	2533	object::force_find (shstr_tmp name)
2685	{	2534	{
2686	/* cycle through his inventory to look for the MARK we want to	2535	/* cycle through his inventory to look for the MARK we want to
2687	* place	2536	* place
2688	*/	2537	*/
2689	for (object *tmp = inv; tmp; tmp = tmp->below)	2538	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2691	return splay (tmp);	2540	return splay (tmp);
2692		2541
2693	return 0;	2542	return 0;
2694	}	2543	}
2695		2544
2696	void	2545	object *
2697	object::force_add (const shstr name, int duration)	2546	object::force_add (shstr_tmp name, int duration)
2698	{	2547	{
2699	if (object *force = force_find (name))	2548	if (object *force = force_find (name))
2700	force->destroy ();	2549	force->destroy ();
2701		2550
2702	object *force = get_archetype (FORCE_NAME);	2551	object *force = get_archetype (FORCE_NAME);
…		…
2707		2556
2708	force->set_speed (duration ? 1.f / duration : 0.f);	2557	force->set_speed (duration ? 1.f / duration : 0.f);
2709	force->flag [FLAG_IS_USED_UP] = true;	2558	force->flag [FLAG_IS_USED_UP] = true;
2710	force->flag [FLAG_APPLIED] = true;	2559	force->flag [FLAG_APPLIED] = true;
2711		2560
2712	insert (force);	2561	return insert (force);
2713	}	2562	}
2714		2563
2715	void	2564	void
2716	object::play_sound (faceidx sound)	2565	object::play_sound (faceidx sound) const
2717	{	2566	{
2718	if (!sound)	2567	if (!sound)
2719	return;	2568	return;
2720		2569
2721	if (flag [FLAG_REMOVED])	2570	if (is_on_map ())
		2571	map->play_sound (sound, x, y);
		2572	else if (object *pl = in_player ())
		2573	pl->contr->play_sound (sound);
		2574	}
		2575
		2576	void
		2577	object::say_msg (const char *msg) const
		2578	{
		2579	if (is_on_map ())
		2580	map->say_msg (msg, x, y);
		2581	else if (object *pl = in_player ())
		2582	pl->contr->play_sound (sound);
		2583	}
		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 ())
2722	return;	2595	return;
2723		2596
2724	if (env)	2597	// find old force, or create new one
2725	{	2598	object *force = force_find (shstr_noise_force);
2726	if (object *pl = in_player ())	2599
2727	pl->contr->play_sound (sound);	2600	if (force)
2728	}	2601	force->speed_left = -1.f; // patch old speed up
2729	else	2602	else
2730	map->play_sound (sound, x, y);	2603	{
2731	}	2604	force = archetype::get (shstr_noise_force);
2732		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.227 by root, Sat May 3 09:04:17 2008 UTC vs. Revision 1.287 by root, Sat Oct 3 20:11:12 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC vs.
Revision 1.287 by root, Sat Oct 3 20:11:12 2009 UTC