[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.292 by root, Mon Oct 19 21:48:49 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 it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
40		42
41	short freearr_x[SIZEOFFREE] = {	43	short freearr_x[SIZEOFFREE] = {
…		…
139		141
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	142	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	143	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	144	compare_ob_value_lists_one (const object wants, const object has)
143	{	145	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* 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	147	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	148	* different structure or at least keep the lists sorted...
149	*/	149	*/
150		150
151	/* For each field in wants, */	151	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	152	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	153	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	154	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		155
169	/* If we get here, every field in wants has a matching field in has. */	156	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	157	return true;
171	}	158	}
172		159
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	160	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	161	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	162	compare_ob_value_lists (const object ob1, const object ob2)
176	{	163	{
177	/* However, there may be fields in has which aren't partnered in wants,	164	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison twice. :(	165	* so we need to run the comparison twice. :(
179	*/	166	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	167	return compare_ob_value_lists_one (ob1, ob2)
		168	&& compare_ob_value_lists_one (ob2, ob1);
181	}	169	}
182		170
183	/* Function examines the 2 objects given to it, and returns true if	171	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	172	* they can be merged together.
185	*	173	*
…		…
200	\|\| ob1->speed != ob2->speed	188	\|\| ob1->speed != ob2->speed
201	\|\| ob1->value != ob2->value	189	\|\| ob1->value != ob2->value
202	\|\| ob1->name != ob2->name)	190	\|\| ob1->name != ob2->name)
203	return 0;	191	return 0;
204		192
205	/* Do not merge objects if nrof would overflow. First part checks	193	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	194	* is always 0 .. 2*31-1 /
207	* would fit into a 32 bit signed int, which is often used to hold	195	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;	196	return 0;
212		197
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	198	/* 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	199	* 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	200	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	205	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		206
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	207	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	208	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		209
225	if (ob1->arch->name != ob2->arch->name	210	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	211	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	212	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	213	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	214	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	215	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	216	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	217	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	218	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	219	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	220	\|\| ob1->animation_id != ob2->animation_id
		221	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	222	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	223	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	224	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	225	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	226	\|\| ob1->move_type != ob2->move_type
…		…
248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	235	return 0;
250		236
251	if ((ob1->flag ^ ob2->flag)	237	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	238	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	239	.reset (FLAG_REMOVED)
255	.any ())	240	.any ())
256	return 0;	241	return 0;
257		242
258	/* This is really a spellbook check - we should in general	243	/* This is really a spellbook check - we should in general
…		…
340	{	325	{
341	// see if we are in a container of sorts	326	// see if we are in a container of sorts
342	if (env)	327	if (env)
343	{	328	{
344	// the player inventory itself is always visible	329	// the player inventory itself is always visible
345	if (env->type == PLAYER)	330	if (env->is_player ())
346	return env;	331	return env;
347		332
348	// else a player could have our env open	333	// else a player could have our env open
349	object *envest = env->outer_env ();	334	object *envest = env->outer_env_or_self ();
350		335
351	// the player itself is always on a map, so we will find him here	336	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	337	// even if our inv is in a player.
353	if (envest->is_on_map ())	338	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	339	if (object *pl = envest->ms ().player ())
355	if (pl->container == env)	340	if (pl->container_ () == env)
356	return pl;	341	return pl;
357	}	342	}
358	else	343	else
359	{	344	{
360	// maybe there is a player standing on the same mapspace	345	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	346	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	347	if (object *pl = ms ().player ())
363	if (!pl->container \|\| this == pl->container)	348	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		349	\|\| pl->container_ () == this)
364	return pl;	350	return pl;
365	}	351	}
366	}	352	}
367		353
368	return 0;	354	return 0;
369	}	355	}
370		356
371	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
372	static sint32	358	static sint32
373	weight_adjust (object *op, sint32 weight)	359	weight_adjust_for (object *op, sint32 weight)
374	{	360	{
375	return op->type == CONTAINER	361	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	363	: weight;
378	}	364	}
…		…
384	static void	370	static void
385	adjust_weight (object *op, sint32 weight)	371	adjust_weight (object *op, sint32 weight)
386	{	372	{
387	while (op)	373	while (op)
388	{	374	{
		375	// adjust by actual difference to account for rounding errors
		376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
390		379
391	if (!weight)	380	if (!weight)
392	return;	381	return;
393		382
394	op->carrying += weight;	383	op->carrying += weight;
…		…
417	op->update_weight ();	406	op->update_weight ();
418		407
419	sum += op->total_weight ();	408	sum += op->total_weight ();
420	}	409	}
421		410
422	sum = weight_adjust (this, sum);	411	sum = weight_adjust_for (this, sum);
423		412
424	if (sum != carrying)	413	if (sum != carrying)
425	{	414	{
426	carrying = sum;	415	carrying = sum;
427		416
…		…
441	return strdup ("[NULLOBJ]");	430	return strdup ("[NULLOBJ]");
442		431
443	object_freezer freezer;	432	object_freezer freezer;
444	op->write (freezer);	433	op->write (freezer);
445	return freezer.as_string ();	434	return freezer.as_string ();
		435	}
		436
		437	char *
		438	object::as_string ()
		439	{
		440	return dump_object (this);
446	}	441	}
447		442
448	/*	443	/*
449	* get_nearest_part(multi-object, object 2) returns the part of the	444	* get_nearest_part(multi-object, object 2) returns the part of the
450	* multi-object 1 which is closest to the second object.	445	* multi-object 1 which is closest to the second object.
…		…
489	*/	484	*/
490	object *	485	object *
491	find_object_name (const char *str)	486	find_object_name (const char *str)
492	{	487	{
493	shstr_cmp str_ (str);	488	shstr_cmp str_ (str);
494	object *op;
495		489
		490	if (str_)
496	for_all_objects (op)	491	for_all_objects (op)
497	if (op->name == str_)	492	if (op->name == str_)
498	break;	493	return op;
499		494
500	return op;	495	return 0;
501	}	496	}
502		497
503	/*	498	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	499	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	500	* skill and experience objects.
…		…
567	update_stats ();	562	update_stats ();
568		563
569	new_draw_info_format (NDI_UNIQUE, 0, this,	564	new_draw_info_format (NDI_UNIQUE, 0, this,
570	"You try to balance all your items at once, "	565	"You try to balance all your items at once, "
571	"but the %s is just too much for your body. "	566	"but the %s is just too much for your body. "
572	"[You need to unapply some items first.]", &ob->name);	567	"[You need to unapply some items first - use the 'body' command to see "
		568	"how many items you cna wera on a specific body part.]", &ob->name);
573	return false;	569	return false;
574	}	570	}
575		571
576	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	572	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
577	}	573	}
…		…
649	}	645	}
650		646
651	if (speed < 0)	647	if (speed < 0)
652	dst->speed_left -= rndm ();	648	dst->speed_left -= rndm ();
653		649
654	dst->set_speed (dst->speed);	650	dst->activate ();
655	}	651	}
656		652
657	void	653	void
658	object::instantiate ()	654	object::instantiate ()
659	{	655	{
…		…
771	else if (action == UP_OBJ_INSERT)	767	else if (action == UP_OBJ_INSERT)
772	{	768	{
773	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
774	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
775	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
776	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
777	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
778	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
779	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
780	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
781	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
782	\|\| (m.move_slow \| op->move_slow) != m.move_slow	778	\|\| (m.move_slow \| op->move_slow) != m.move_slow
783	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
784	* to have move_allow right now.	780	* have move_allow right now.
785	*/	781	*/
786	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	782	\|\| ((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)	783	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
788	m.flags_ = 0;	784	m.invalidate ();
789	}	785	}
790	/* if the object is being removed, we can't make intelligent	786	/* if the object is being removed, we can't make intelligent
791	* decisions, because remove_ob can't really pass the object	787	* decisions, because remove_ob can't really pass the object
792	* that is being removed.	788	* that is being removed.
793	*/	789	*/
794	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	790	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
795	m.flags_ = 0;	791	m.invalidate ();
796	else if (action == UP_OBJ_FACE)	792	else if (action == UP_OBJ_FACE)
797	/* Nothing to do for that case */ ;	793	/* Nothing to do for that case */ ;
798	else	794	else
799	LOG (llevError, "update_object called with invalid action: %d\n", action);	795	LOG (llevError, "update_object called with invalid action: %d\n", action);
800		796
…		…
804		800
805	object::object ()	801	object::object ()
806	{	802	{
807	SET_FLAG (this, FLAG_REMOVED);	803	SET_FLAG (this, FLAG_REMOVED);
808		804
809	expmul = 1.0;	805	//expmul = 1.0; declared const for the time being
810	face = blank_face;	806	face = blank_face;
811	}	807	}
812		808
813	object::~object ()	809	object::~object ()
814	{	810	{
…		…
844	/* If already on active list, don't do anything */	840	/* If already on active list, don't do anything */
845	if (active)	841	if (active)
846	return;	842	return;
847		843
848	if (has_active_speed ())	844	if (has_active_speed ())
		845	{
		846	if (flag [FLAG_FREED])
		847	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		848
849	actives.insert (this);	849	actives.insert (this);
		850	}
850	}	851	}
851		852
852	void	853	void
853	object::activate_recursive ()	854	object::activate_recursive ()
854	{	855	{
…		…
915	* drop on that space.	916	* drop on that space.
916	*/	917	*/
917	if (!drop_to_ground	918	if (!drop_to_ground
918	\|\| !map	919	\|\| !map
919	\|\| map->in_memory != MAP_ACTIVE	920	\|\| map->in_memory != MAP_ACTIVE
920	\|\| map->nodrop	921	\|\| map->no_drop
921	\|\| ms ().move_block == MOVE_ALL)	922	\|\| ms ().move_block == MOVE_ALL)
922	{	923	{
923	while (inv)	924	while (inv)
924	{
925	inv->destroy_inv (false);
926	inv->destroy ();	925	inv->destroy ();
927	}
928	}	926	}
929	else	927	else
930	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
931	while (inv)	929	while (inv)
932	{	930	{
…		…
936	\|\| op->flag [FLAG_NO_DROP]	934	\|\| op->flag [FLAG_NO_DROP]
937	\|\| op->type == RUNE	935	\|\| op->type == RUNE
938	\|\| op->type == TRAP	936	\|\| op->type == TRAP
939	\|\| op->flag [FLAG_IS_A_TEMPLATE]	937	\|\| op->flag [FLAG_IS_A_TEMPLATE]
940	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	938	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
941	op->destroy (true);	939	op->destroy ();
942	else	940	else
943	map->insert (op, x, y);	941	map->insert (op, x, y);
944	}	942	}
945	}	943	}
946	}	944	}
…		…
954		952
955	static struct freed_map : maptile	953	static struct freed_map : maptile
956	{	954	{
957	freed_map ()	955	freed_map ()
958	{	956	{
959	path = "<freed objects map>";	957	path = "<freed objects map>";
960	name = "/internal/freed_objects_map";	958	name = "/internal/freed_objects_map";
961	width = 3;	959	width = 3;
962	height = 3;	960	height = 3;
963	nodrop = 1;	961	no_drop = 1;
		962	no_reset = 1;
964		963
965	alloc ();	964	alloc ();
966	in_memory = MAP_ACTIVE;	965	in_memory = MAP_ACTIVE;
967	}	966	}
		967
		968	~freed_map ()
		969	{
		970	destroy ();
		971	}
968	} freed_map; // freed objects are moved here to avoid crashes	972	} freed_map; // freed objects are moved here to avoid crashes
969		973
970	void	974	void
971	object::do_destroy ()	975	object::do_destroy ()
972	{	976	{
973	if (flag [FLAG_IS_LINKED])	977	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	978	remove_link ();
975		979
976	if (flag [FLAG_FRIENDLY])	980	if (flag [FLAG_FRIENDLY])
977	remove_friendly_object (this);	981	remove_friendly_object (this);
978		982
979	remove ();	983	remove ();
…		…
1004	attacked_by = 0;	1008	attacked_by = 0;
1005	current_weapon = 0;	1009	current_weapon = 0;
1006	}	1010	}
1007		1011
1008	void	1012	void
1009	object::destroy (bool destroy_inventory)	1013	object::destroy ()
1010	{	1014	{
1011	if (destroyed ())	1015	if (destroyed ())
1012	return;	1016	return;
1013		1017
1014	if (!is_head () && !head->destroyed ())	1018	if (!is_head () && !head->destroyed ())
1015	{	1019	{
1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1020	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1017	head->destroy (destroy_inventory);	1021	head->destroy ();
1018	return;	1022	return;
1019	}	1023	}
1020		1024
1021	destroy_inv (!destroy_inventory);	1025	destroy_inv (false);
1022		1026
1023	if (is_head ())	1027	if (is_head ())
1024	if (sound_destroy)	1028	if (sound_destroy)
1025	play_sound (sound_destroy);	1029	play_sound (sound_destroy);
1026	else if (flag [FLAG_MONSTER])	1030	else if (flag [FLAG_MONSTER])
…		…
1063	esrv_del_item (pl->contr, count);	1067	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1068	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1069
1066	adjust_weight (env, -total_weight ());	1070	adjust_weight (env, -total_weight ());
1067		1071
1068	*(above ? &above->below : &env->inv) = below;	1072	object *pl = in_player ();
1069
1070	if (below)
1071	below->above = above;
1072		1073
1073	/* we set up values so that it could be inserted into	1074	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up	1075	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.	1076	* to the caller to decide what we want to do.
1076	*/	1077	*/
1077	map = env->map;	1078	map = env->map;
1078	x = env->x;	1079	x = env->x;
1079	y = env->y;	1080	y = env->y;
		1081
		1082	// make sure cmov optimisation is applicable
		1083	*(above ? &above->below : &env->inv) = below;
		1084	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1085
1080	above = 0;	1086	above = 0;
1081	below = 0;	1087	below = 0;
1082	env = 0;	1088	env = 0;
1083		1089
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1090	/* NO_FIX_PLAYER is set when a great many changes are being
1085	* made to players inventory. If set, avoiding the call	1091	* made to players inventory. If set, avoiding the call
1086	* to save cpu time.	1092	* to save cpu time.
1087	*/	1093	*/
1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1094	if (pl)
		1095	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1096	{
1089	otmp->update_stats ();	1097	pl->update_stats ();
		1098
		1099	if (glow_radius && pl->is_on_map ())
		1100	update_all_los (pl->map, pl->x, pl->y);
		1101	}
1090	}	1102	}
1091	else if (map)	1103	else if (map)
1092	{	1104	{
1093	map->dirty = true;	1105	map->dirty = true;
1094	mapspace &ms = this->ms ();	1106	mapspace &ms = this->ms ();
1095		1107
1096	if (object *pl = ms.player ())	1108	if (object *pl = ms.player ())
1097	{	1109	{
1098	if (type == PLAYER) // this == pl(!)	1110	if (is_player ())
1099	{	1111	{
		1112	if (!flag [FLAG_WIZPASS])
		1113	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1114
1100	// leaving a spot always closes any open container on the ground	1115	// leaving a spot always closes any open container on the ground
1101	if (container && !container->env)	1116	if (container && !container->env)
1102	// this causes spurious floorbox updates, but it ensures	1117	// this causes spurious floorbox updates, but it ensures
1103	// that the CLOSE event is being sent.	1118	// that the CLOSE event is being sent.
1104	close_container ();	1119	close_container ();
1105		1120
1106	--map->players;	1121	--map->players;
1107	map->touch ();	1122	map->touch ();
1108	}	1123	}
1109	else if (pl->container == this)	1124	else if (pl->container_ () == this)
1110	{	1125	{
1111	// removing a container should close it	1126	// removing a container should close it
1112	close_container ();	1127	close_container ();
1113	}	1128	}
1114		1129
1115	esrv_del_item (pl->contr, count);	1130	esrv_del_item (pl->contr, count);
1116	}	1131	}
1117		1132
1118	/* link the object above us */	1133	/* link the object above us */
1119	if (above)	1134	// re-link, make sure compiler can easily use cmove
1120	above->below = below;	1135	*(above ? &above->below : &ms.top) = below;
1121	else	1136	*(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		1137
1139	above = 0;	1138	above = 0;
1140	below = 0;	1139	below = 0;
1141		1140
		1141	ms.invalidate ();
		1142
1142	if (map->in_memory == MAP_SAVING)	1143	if (map->in_memory == MAP_SAVING)
1143	return;	1144	return;
1144		1145
1145	int check_walk_off = !flag [FLAG_NO_APPLY];	1146	int check_walk_off = !flag [FLAG_NO_APPLY];
1146		1147
1147	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1148	{	1149	{
1149	if (pl->container == this)	1150	if (pl->container_ () == this)
1150	/* If a container that the player is currently using somehow gets	1151	/* If a container that the player is currently using somehow gets
1151	* removed (most likely destroyed), update the player view	1152	* removed (most likely destroyed), update the player view
1152	* appropriately.	1153	* appropriately.
1153	*/	1154	*/
1154	pl->close_container ();	1155	pl->close_container ();
…		…
1178	}	1179	}
1179		1180
1180	last = tmp;	1181	last = tmp;
1181	}	1182	}
1182		1183
1183	/* last == NULL if there are no objects on this space */	1184	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);	1185	update_all_los (map, x, y);
1192	}	1186	}
1193	}	1187	}
1194		1188
1195	/*	1189	/*
…		…
1219	esrv_update_item (UPD_NROF, pl, top);	1213	esrv_update_item (UPD_NROF, pl, top);
1220		1214
1221	op->weight = 0; // cancel the addition above	1215	op->weight = 0; // cancel the addition above
1222	op->carrying = 0; // must be 0 already	1216	op->carrying = 0; // must be 0 already
1223		1217
1224	op->destroy (1);	1218	op->destroy ();
1225		1219
1226	return top;	1220	return top;
1227	}	1221	}
1228		1222
1229	return 0;	1223	return 0;
…		…
1257	* job preparing multi-part monsters.	1251	* job preparing multi-part monsters.
1258	*/	1252	*/
1259	object *	1253	object *
1260	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1254	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1261	{	1255	{
		1256	op->remove ();
		1257
1262	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1258	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1263	{	1259	{
1264	tmp->x = x + tmp->arch->x;	1260	tmp->x = x + tmp->arch->x;
1265	tmp->y = y + tmp->arch->y;	1261	tmp->y = y + tmp->arch->y;
1266	}	1262	}
…		…
1289	* just 'op' otherwise	1285	* just 'op' otherwise
1290	*/	1286	*/
1291	object *	1287	object *
1292	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1288	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1293	{	1289	{
1294	assert (!op->flag [FLAG_FREED]);
1295
1296	op->remove ();	1290	op->remove ();
		1291
		1292	if (m == &freed_map)//D TODO: remove soon
		1293	{//D
		1294	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1295	}//D
1297		1296
1298	/* Ideally, the caller figures this out. However, it complicates a lot	1297	/* 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	1298	* of areas of callers (eg, anything that uses find_free_spot would now
1300	* need extra work	1299	* need extra work
1301	*/	1300	*/
		1301	maptile *newmap = m;
1302	if (!xy_normalise (m, op->x, op->y))	1302	if (!xy_normalise (newmap, op->x, op->y))
1303	{	1303	{
1304	op->destroy (1);	1304	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1305	return 0;	1305	return 0;
1306	}	1306	}
1307		1307
1308	if (object *more = op->more)	1308	if (object *more = op->more)
1309	if (!insert_ob_in_map (more, m, originator, flag))	1309	if (!insert_ob_in_map (more, m, originator, flag))
1310	return 0;	1310	return 0;
1311		1311
1312	CLEAR_FLAG (op, FLAG_REMOVED);	1312	op->flag [FLAG_REMOVED] = false;
1313		1313	op->env = 0;
1314	op->map = m;	1314	op->map = newmap;
		1315
1315	mapspace &ms = op->ms ();	1316	mapspace &ms = op->ms ();
1316		1317
1317	/* this has to be done after we translate the coordinates.	1318	/* this has to be done after we translate the coordinates.
1318	*/	1319	*/
1319	if (op->nrof && !(flag & INS_NO_MERGE))	1320	if (op->nrof && !(flag & INS_NO_MERGE))
1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1321	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1321	if (object::can_merge (op, tmp))	1322	if (object::can_merge (op, tmp))
1322	{	1323	{
1323	// TODO: we atcually want to update tmp, not op,	1324	// TODO: we actually want to update tmp, not op,
1324	// but some caller surely breaks when we return tmp	1325	// but some caller surely breaks when we return tmp
1325	// from here :/	1326	// from here :/
1326	op->nrof += tmp->nrof;	1327	op->nrof += tmp->nrof;
1327	tmp->destroy (1);	1328	tmp->destroy ();
1328	}	1329	}
1329		1330
1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1331	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1332	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1332		1333
…		…
1339	{	1340	{
1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1341	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1341	abort ();	1342	abort ();
1342	}	1343	}
1343		1344
		1345	if (!originator->is_on_map ())
		1346	{
		1347	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1348	op->debug_desc (), originator->debug_desc ());
		1349	abort ();
		1350	}
		1351
1344	op->above = originator;	1352	op->above = originator;
1345	op->below = originator->below;	1353	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;	1354	originator->below = op;
		1355
		1356	*(op->below ? &op->below->above : &ms.bot) = op;
1354	}	1357	}
1355	else	1358	else
1356	{	1359	{
1357	object top, floor = NULL;	1360	object *floor = 0;
1358		1361	object *top = ms.top;
1359	top = ms.bot;
1360		1362
1361	/* If there are other objects, then */	1363	/* If there are other objects, then */
1362	if (top)	1364	if (top)
1363	{	1365	{
1364	object *last = 0;
1365
1366	/*	1366	/*
1367	* If there are multiple objects on this space, we do some trickier handling.	1367	* If there are multiple objects on this space, we do some trickier handling.
1368	* We've already dealt with merging if appropriate.	1368	* We've already dealt with merging if appropriate.
1369	* Generally, we want to put the new object on top. But if	1369	* Generally, we want to put the new object on top. But if
1370	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1370	* 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	1373	* 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	1374	* 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	1375	* when lots of spells are cast in one area. Currently, it is presumed
1376	* that flying non pickable objects are spell objects.	1376	* that flying non pickable objects are spell objects.
1377	*/	1377	*/
1378	for (top = ms.bot; top; top = top->above)	1378	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1379	{	1379	{
1380	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1380	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1381	floor = top;	1381	floor = tmp;
1382		1382
1383	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1383	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1384	{	1384	{
1385	/* We insert above top, so we want this object below this */	1385	/* We insert above top, so we want this object below this */
1386	top = top->below;	1386	top = tmp->below;
1387	break;	1387	break;
1388	}	1388	}
1389		1389
1390	last = top;	1390	top = tmp;
1391	}	1391	}
1392
1393	/* Don't want top to be NULL, so set it to the last valid object */
1394	top = last;
1395		1392
1396	/* We let update_position deal with figuring out what the space	1393	/* We let update_position deal with figuring out what the space
1397	* looks like instead of lots of conditions here.	1394	* looks like instead of lots of conditions here.
1398	* makes things faster, and effectively the same result.	1395	* makes things faster, and effectively the same result.
1399	*/	1396	*/
…		…
1406	*/	1403	*/
1407	if (!(flag & INS_ON_TOP)	1404	if (!(flag & INS_ON_TOP)
1408	&& ms.flags () & P_BLOCKSVIEW	1405	&& ms.flags () & P_BLOCKSVIEW
1409	&& (op->face && !faces [op->face].visibility))	1406	&& (op->face && !faces [op->face].visibility))
1410	{	1407	{
		1408	object *last;
		1409
1411	for (last = top; last != floor; last = last->below)	1410	for (last = top; last != floor; last = last->below)
1412	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1411	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1413	break;	1412	break;
1414		1413
1415	/* Check to see if we found the object that blocks view,	1414	/* Check to see if we found the object that blocks view,
…		…
1423	} /* If objects on this space */	1422	} /* If objects on this space */
1424		1423
1425	if (flag & INS_ABOVE_FLOOR_ONLY)	1424	if (flag & INS_ABOVE_FLOOR_ONLY)
1426	top = floor;	1425	top = floor;
1427		1426
1428	/* Top is the object that our object (op) is going to get inserted above.	1427	// insert object above top, or bottom-most if top = 0
1429	*/
1430
1431	/* First object on this space */
1432	if (!top)	1428	if (!top)
1433	{	1429	{
		1430	op->below = 0;
1434	op->above = ms.bot;	1431	op->above = ms.bot;
1435
1436	if (op->above)
1437	op->above->below = op;
1438
1439	op->below = 0;
1440	ms.bot = op;	1432	ms.bot = op;
		1433
		1434	*(op->above ? &op->above->below : &ms.top) = op;
1441	}	1435	}
1442	else	1436	else
1443	{ /* get inserted into the stack above top */	1437	{
1444	op->above = top->above;	1438	op->above = top->above;
1445
1446	if (op->above)
1447	op->above->below = op;	1439	top->above = op;
1448		1440
1449	op->below = top;	1441	op->below = top;
1450	top->above = op;	1442	*(op->above ? &op->above->below : &ms.top) = op;
1451	}	1443	}
		1444	}
1452		1445
1453	if (!op->above)	1446	if (op->is_player ())
1454	ms.top = op;
1455	} /* else not INS_BELOW_ORIGINATOR */
1456
1457	if (op->type == PLAYER)
1458	{	1447	{
1459	op->contr->do_los = 1;	1448	op->contr->do_los = 1;
1460	++op->map->players;	1449	++op->map->players;
1461	op->map->touch ();	1450	op->map->touch ();
1462	}	1451	}
…		…
1477	* be far away from this change and not affected in any way -	1466	* be far away from this change and not affected in any way -
1478	* this should get redone to only look for players within range,	1467	* this should get redone to only look for players within range,
1479	* or just updating the P_UPTODATE for spaces within this area	1468	* or just updating the P_UPTODATE for spaces within this area
1480	* of effect may be sufficient.	1469	* of effect may be sufficient.
1481	*/	1470	*/
1482	if (op->map->darkness && (op->glow_radius != 0))	1471	if (op->affects_los ())
		1472	{
		1473	op->ms ().invalidate ();
1483	update_all_los (op->map, op->x, op->y);	1474	update_all_los (op->map, op->x, op->y);
		1475	}
1484		1476
1485	/* updates flags (blocked, alive, no magic, etc) for this map space */	1477	/* updates flags (blocked, alive, no magic, etc) for this map space */
1486	update_object (op, UP_OBJ_INSERT);	1478	update_object (op, UP_OBJ_INSERT);
1487		1479
1488	INVOKE_OBJECT (INSERT, op);	1480	INVOKE_OBJECT (INSERT, op);
…		…
1495	* blocked() and wall() work properly), and these flags are updated by	1487	* blocked() and wall() work properly), and these flags are updated by
1496	* update_object().	1488	* update_object().
1497	*/	1489	*/
1498		1490
1499	/* if this is not the head or flag has been passed, don't check walk on status */	1491	/* 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)	1492	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1501	{	1493	{
1502	if (check_move_on (op, originator))	1494	if (check_move_on (op, originator))
1503	return 0;	1495	return 0;
1504		1496
1505	/* If we are a multi part object, lets work our way through the check	1497	/* 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	1508	/* 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.	1509	* 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.	1510	* op is the object to insert it under: supplies x and the map.
1519	*/	1511	*/
1520	void	1512	void
1521	replace_insert_ob_in_map (const char arch_string, object op)	1513	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1522	{	1514	{
1523	/* first search for itself and remove any old instances */	1515	/* first search for itself and remove any old instances */
1524		1516
1525	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1526	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1518	if (tmp->arch->archname == archname) /* same archetype */
1527	tmp->destroy (1);	1519	tmp->destroy ();
1528		1520
1529	object *tmp = arch_to_object (archetype::find (arch_string));	1521	object *tmp = arch_to_object (archetype::find (archname));
1530		1522
1531	tmp->x = op->x;	1523	tmp->x = op->x;
1532	tmp->y = op->y;	1524	tmp->y = op->y;
1533		1525
1534	insert_ob_in_map (tmp, op->map, op, 0);	1526	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1556	if (!nr)	1548	if (!nr)
1557	return true;	1549	return true;
1558		1550
1559	nr = min (nr, nrof);	1551	nr = min (nr, nrof);
1560		1552
		1553	if (nrof > nr)
		1554	{
1561	nrof -= nr;	1555	nrof -= nr;
1562
1563	if (nrof)
1564	{
1565	adjust_weight (env, -weight * nr); // carrying == 0	1556	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1566		1557
1567	if (object *pl = visible_to ())	1558	if (object *pl = visible_to ())
1568	esrv_update_item (UPD_NROF, pl, this);	1559	esrv_update_item (UPD_NROF, pl, this);
1569		1560
1570	return true;	1561	return true;
1571	}	1562	}
1572	else	1563	else
1573	{	1564	{
1574	destroy (1);	1565	destroy ();
1575	return false;	1566	return false;
1576	}	1567	}
1577	}	1568	}
1578		1569
1579	/*	1570	/*
…		…
1596	}	1587	}
1597	else	1588	else
1598	{	1589	{
1599	decrease (nr);	1590	decrease (nr);
1600		1591
1601	object *op = object_create_clone (this);	1592	object *op = deep_clone ();
1602	op->nrof = nr;	1593	op->nrof = nr;
1603	return op;	1594	return op;
1604	}	1595	}
1605	}	1596	}
1606		1597
…		…
1656	if (object *pl = tmp->visible_to ())	1647	if (object *pl = tmp->visible_to ())
1657	esrv_update_item (UPD_NROF, pl, tmp);	1648	esrv_update_item (UPD_NROF, pl, tmp);
1658		1649
1659	adjust_weight (this, op->total_weight ());	1650	adjust_weight (this, op->total_weight ());
1660		1651
1661	op->destroy (1);	1652	op->destroy ();
1662	op = tmp;	1653	op = tmp;
1663	goto inserted;	1654	goto inserted;
1664	}	1655	}
1665		1656
1666	op->owner = 0; // it's his/hers now. period.	1657	op->owner = 0; // it's his/hers now. period.
…		…
1684		1675
1685	adjust_weight (this, op->total_weight ());	1676	adjust_weight (this, op->total_weight ());
1686		1677
1687	inserted:	1678	inserted:
1688	/* reset the light list and los of the players on the map */	1679	/* reset the light list and los of the players on the map */
1689	if (op->glow_radius && map && map->darkness)	1680	if (op->glow_radius && is_on_map ())
		1681	{
		1682	update_stats ();
1690	update_all_los (map, x, y);	1683	update_all_los (map, x, y);
1691		1684	}
		1685	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1692	// if this is a player's inventory, update stats	1686	// if this is a player's inventory, update stats
1693	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1694	update_stats ();	1687	update_stats ();
1695		1688
1696	INVOKE_OBJECT (INSERT, this);	1689	INVOKE_OBJECT (INSERT, this);
1697		1690
1698	return op;	1691	return op;
…		…
1719	* on top.	1712	* on top.
1720	*/	1713	*/
1721	int	1714	int
1722	check_move_on (object op, object originator)	1715	check_move_on (object op, object originator)
1723	{	1716	{
		1717	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1718	return 0;
		1719
1724	object *tmp;	1720	object *tmp;
1725	maptile *m = op->map;	1721	maptile *m = op->map;
1726	int x = op->x, y = op->y;	1722	int x = op->x, y = op->y;
1727		1723
1728	MoveType move_on, move_slow, move_block;	1724	mapspace &ms = m->at (x, y);
1729		1725
1730	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1726	ms.update ();
1731	return 0;
1732		1727
1733	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1728	MoveType move_on = ms.move_on;
1734	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1729	MoveType move_slow = ms.move_slow;
1735	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1730	MoveType move_block = ms.move_block;
1736		1731
1737	/* if nothing on this space will slow op down or be applied,	1732	/* 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	1733	* 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	1734	* is set, as lots of objects don't have it set - we treat that
1740	* as walking.	1735	* as walking.
…		…
1751	return 0;	1746	return 0;
1752		1747
1753	/* The objects have to be checked from top to bottom.	1748	/* The objects have to be checked from top to bottom.
1754	* Hence, we first go to the top:	1749	* Hence, we first go to the top:
1755	*/	1750	*/
1756		1751	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	}	1752	{
		1753	next = tmp->below;
1766		1754
1767	for (; tmp; tmp = tmp->below)
1768	{
1769	if (tmp == op)	1755	if (tmp == op)
1770	continue; /* Can't apply yourself */	1756	continue; /* Can't apply yourself */
1771		1757
1772	/* Check to see if one of the movement types should be slowed down.	1758	/* 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	1759	* Second check makes sure that the movement types not being slowed
…		…
1778	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1779	{	1765	{
1780	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1766	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))	1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1782	{	1768	{
1783
1784	float
1785	diff = tmp->move_slow_penalty * fabs (op->speed);	1769	float diff = tmp->move_slow_penalty * fabs (op->speed);
1786		1770
1787	if (op->type == PLAYER)	1771	if (op->is_player ())
1788	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1772	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)))	1773	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1790	diff /= 4.0;	1774	diff /= 4.0;
1791		1775
1792	op->speed_left -= diff;	1776	op->speed_left -= diff;
1793	}	1777	}
1794	}	1778	}
…		…
1827	LOG (llevError, "Present_arch called outside map.\n");	1811	LOG (llevError, "Present_arch called outside map.\n");
1828	return NULL;	1812	return NULL;
1829	}	1813	}
1830		1814
1831	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1815	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1832	if (tmp->arch == at)	1816	if (tmp->arch->archname == at->archname)
1833	return tmp;	1817	return tmp;
1834		1818
1835	return NULL;	1819	return NULL;
1836	}	1820	}
1837		1821
…		…
1901	* The first matching object is returned, or NULL if none.	1885	* The first matching object is returned, or NULL if none.
1902	*/	1886	*/
1903	object *	1887	object *
1904	present_arch_in_ob (const archetype at, const object op)	1888	present_arch_in_ob (const archetype at, const object op)
1905	{	1889	{
1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1890	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1907	if (tmp->arch == at)	1891	if (tmp->arch->archname == at->archname)
1908	return tmp;	1892	return tmp;
1909		1893
1910	return NULL;	1894	return NULL;
1911	}	1895	}
1912		1896
…		…
2000	* head of the object should correspond for the entire object.	1984	* head of the object should correspond for the entire object.
2001	*/	1985	*/
2002	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1986	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2003	continue;	1987	continue;
2004		1988
2005	if (ob->blocked (m, pos.x, pos.y))	1989	if (ob->blocked (pos.m, pos.x, pos.y))
2006	continue;	1990	continue;
2007		1991
2008	altern [index++] = i;	1992	altern [index++] = i;
2009	}	1993	}
2010		1994
…		…
2078	* there is capable of.	2062	* there is capable of.
2079	*/	2063	*/
2080	int	2064	int
2081	find_dir (maptile m, int x, int y, object exclude)	2065	find_dir (maptile m, int x, int y, object exclude)
2082	{	2066	{
2083	int i, max = SIZEOFFREE, mflags;	2067	int max = SIZEOFFREE, mflags;
2084
2085	sint16 nx, ny;
2086	object *tmp;
2087	maptile *mp;
2088
2089	MoveType blocked, move_type;	2068	MoveType move_type;
2090		2069
2091	if (exclude && exclude->head_ () != exclude)	2070	if (exclude && exclude->head_ () != exclude)
2092	{	2071	{
2093	exclude = exclude->head;	2072	exclude = exclude->head;
2094	move_type = exclude->move_type;	2073	move_type = exclude->move_type;
…		…
2097	{	2076	{
2098	/* If we don't have anything, presume it can use all movement types. */	2077	/* If we don't have anything, presume it can use all movement types. */
2099	move_type = MOVE_ALL;	2078	move_type = MOVE_ALL;
2100	}	2079	}
2101		2080
2102	for (i = 1; i < max; i++)	2081	for (int i = 1; i < max; i++)
2103	{	2082	{
2104	mp = m;	2083	mapxy pos (m, x, y);
2105	nx = x + freearr_x[i];	2084	pos.move (i);
2106	ny = y + freearr_y[i];
2107		2085
2108	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2086	if (!pos.normalise ())
2109
2110	if (mflags & P_OUT_OF_MAP)
2111	max = maxfree[i];	2087	max = maxfree[i];
2112	else	2088	else
2113	{	2089	{
2114	mapspace &ms = mp->at (nx, ny);	2090	mapspace &ms = *pos;
2115		2091
2116	blocked = ms.move_block;
2117
2118	if ((move_type & blocked) == move_type)	2092	if ((move_type & ms.move_block) == move_type)
2119	max = maxfree[i];	2093	max = maxfree [i];
2120	else if (mflags & P_IS_ALIVE)	2094	else if (ms.flags () & P_IS_ALIVE)
2121	{	2095	{
2122	for (tmp = ms.bot; tmp; tmp = tmp->above)	2096	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2123	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2097	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2124	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2098	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2125	break;
2126
2127	if (tmp)
2128	return freedir[i];	2099	return freedir [i];
2129	}	2100	}
2130	}	2101	}
2131	}	2102	}
2132		2103
2133	return 0;	2104	return 0;
…		…
2208	* This basically means that if direction is 15, then it could either go	2179	* 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.	2180	* 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	2181	* Moved from spell_util.c to object.c with the other related direction
2211	* functions.	2182	* functions.
2212	*/	2183	*/
2213	int reduction_dir[SIZEOFFREE][3] = {	2184	const int reduction_dir[SIZEOFFREE][3] = {
2214	{0, 0, 0}, /* 0 */	2185	{0, 0, 0}, /* 0 */
2215	{0, 0, 0}, /* 1 */	2186	{0, 0, 0}, /* 1 */
2216	{0, 0, 0}, /* 2 */	2187	{0, 0, 0}, /* 2 */
2217	{0, 0, 0}, /* 3 */	2188	{0, 0, 0}, /* 3 */
2218	{0, 0, 0}, /* 4 */	2189	{0, 0, 0}, /* 4 */
…		…
2314	int	2285	int
2315	can_pick (const object who, const object item)	2286	can_pick (const object who, const object item)
2316	{	2287	{
2317	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2288	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2318	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2289	(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));	2290	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2320	}	2291	}
2321		2292
2322	/*	2293	/*
2323	* create clone from object to another	2294	* create clone from object to another
2324	*/	2295	*/
2325	object *	2296	object *
2326	object_create_clone (object *asrc)	2297	object::deep_clone ()
2327	{	2298	{
		2299	assert (("deep_clone called on non-head object", is_head ()));
		2300
2328	object *dst = 0;	2301	object *dst = clone ();
2329		2302
2330	if (!asrc)
2331	return 0;
2332
2333	object *src = asrc->head_ ();
2334
2335	object *prev = 0;	2303	object *prev = dst;
2336	for (object *part = src; part; part = part->more)	2304	for (object *part = this->more; part; part = part->more)
2337	{	2305	{
2338	object *tmp = part->clone ();	2306	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;	2307	tmp->head = dst;
2350
2351	tmp->more = 0;
2352
2353	if (prev)
2354	prev->more = tmp;	2308	prev->more = tmp;
2355
2356	prev = tmp;	2309	prev = tmp;
2357	}	2310	}
2358		2311
2359	for (object *item = src->inv; item; item = item->below)	2312	for (object *item = inv; item; item = item->below)
2360	insert_ob_in_ob (object_create_clone (item), dst);	2313	insert_ob_in_ob (item->deep_clone (), dst);
2361		2314
2362	return dst;	2315	return dst;
2363	}	2316	}
2364		2317
2365	/* This returns the first object in who's inventory that	2318	/* This returns the first object in who's inventory that
…		…
2374	return tmp;	2327	return tmp;
2375		2328
2376	return 0;	2329	return 0;
2377	}	2330	}
2378		2331
2379	/* If ob has a field named key, return the link from the list,	2332	shstr_tmp
2380	* otherwise return NULL.	2333	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	{	2334	{
2388	for (key_value *link = ob->key_values; link; link = link->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2389	if (link->key == key)	2336	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;	2337	return kv->value;
2424		2338
2425	return 0;	2339	return shstr ();
2426	}	2340	}
2427		2341
2428	/*	2342	void
2429	* Updates the canonical_key in op to value.	2343	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	{	2344	{
2441	key_value field = NULL, last = NULL;	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2442		2346	if (kv->key == key)
2443	for (field = op->key_values; field != NULL; field = field->next)
2444	{
2445	if (field->key != canonical_key)
2446	{	2347	{
2447	last = field;	2348	kv->value = value;
2448	continue;	2349	return;
2449	}	2350	}
2450		2351
2451	if (value)	2352	key_value *kv = new key_value;
2452	field->value = value;	2353
2453	else	2354	kv->next = key_values;
		2355	kv->key = key;
		2356	kv->value = value;
		2357
		2358	key_values = kv;
		2359	}
		2360
		2361	void
		2362	object::kv_del (shstr_tmp key)
		2363	{
		2364	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2365	if ((*kvp)->key == key)
2454	{	2366	{
2455	/* Basically, if the archetype has this key set,	2367	key_value kv = kvp;
2456	* we need to store the null value so when we save	2368	kvp = (kvp)->next;
2457	* it, we save the empty value so that when we load,	2369	delete kv;
2458	* we get this value back again.	2370	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	}	2371	}
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	}	2372	}
2517		2373
2518	object::depth_iterator::depth_iterator (object *container)	2374	object::depth_iterator::depth_iterator (object *container)
2519	: iterator_base (container)	2375	: iterator_base (container)
2520	{	2376	{
…		…
2570	{	2426	{
2571	char flagdesc[512];	2427	char flagdesc[512];
2572	char info2[256 * 4];	2428	char info2[256 * 4];
2573	char *p = info;	2429	char *p = info;
2574		2430
2575	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2431	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2576	count,	2432	count,
2577	uuid.c_str (),	2433	uuid.c_str (),
2578	&name,	2434	&name,
2579	title ? "\",title:\"" : "",	2435	title ? ",title:\"" : "",
2580	title ? (const char *)title : "",	2436	title ? (const char *)title : "",
		2437	title ? "\"" : "",
2581	flag_desc (flagdesc, 512), type);	2438	flag_desc (flagdesc, 512), type);
2582		2439
2583	if (!flag[FLAG_REMOVED] && env)	2440	if (!flag[FLAG_REMOVED] && env)
2584	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2441	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2585		2442
…		…
2641	container = 0;	2498	container = 0;
2642		2499
2643	// client needs item update to make it work, client bug requires this to be separate	2500	// client needs item update to make it work, client bug requires this to be separate
2644	esrv_update_item (UPD_FLAGS, this, old_container);	2501	esrv_update_item (UPD_FLAGS, this, old_container);
2645		2502
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2503	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2647	play_sound (sound_find ("chest_close"));	2504	play_sound (sound_find ("chest_close"));
2648	}	2505	}
2649		2506
2650	if (new_container)	2507	if (new_container)
2651	{	2508	{
…		…
2661	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2662	new_container->insert (closer);	2519	new_container->insert (closer);
2663	}	2520	}
2664	#endif	2521	#endif
2665		2522
2666	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2523	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2667		2524
2668	// make sure the container is available, client bug requires this to be separate	2525	// make sure the container is available, client bug requires this to be separate
2669	esrv_send_item (this, new_container);	2526	esrv_send_item (this, new_container);
2670		2527
2671	new_container->flag [FLAG_APPLIED] = true;	2528	new_container->flag [FLAG_APPLIED] = true;
…		…
2679	// else if (!old_container->env && contr && contr->ns)	2536	// else if (!old_container->env && contr && contr->ns)
2680	// contr->ns->floorbox_reset ();	2537	// contr->ns->floorbox_reset ();
2681	}	2538	}
2682		2539
2683	object *	2540	object *
2684	object::force_find (const shstr name)	2541	object::force_find (shstr_tmp name)
2685	{	2542	{
2686	/* cycle through his inventory to look for the MARK we want to	2543	/* cycle through his inventory to look for the MARK we want to
2687	* place	2544	* place
2688	*/	2545	*/
2689	for (object *tmp = inv; tmp; tmp = tmp->below)	2546	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2692		2549
2693	return 0;	2550	return 0;
2694	}	2551	}
2695		2552
2696	void	2553	void
		2554	object::force_set_timer (int duration)
		2555	{
		2556	this->duration = 1;
		2557	this->speed_left = -1.f;
		2558
		2559	this->set_speed (duration ? 1.f / duration : 0.f);
		2560	}
		2561
		2562	object *
2697	object::force_add (const shstr name, int duration)	2563	object::force_add (shstr_tmp name, int duration)
2698	{	2564	{
2699	if (object *force = force_find (name))	2565	if (object *force = force_find (name))
2700	force->destroy ();	2566	force->destroy ();
2701		2567
2702	object *force = get_archetype (FORCE_NAME);	2568	object *force = get_archetype (FORCE_NAME);
2703		2569
2704	force->slaying = name;	2570	force->slaying = name;
2705	force->stats.food = 1;
2706	force->speed_left = -1.f;
2707		2571
2708	force->set_speed (duration ? 1.f / duration : 0.f);	2572	force->force_set_timer (duration);
2709	force->flag [FLAG_IS_USED_UP] = true;	2573
2710	force->flag [FLAG_APPLIED] = true;	2574	force->flag [FLAG_APPLIED] = true;
2711		2575
2712	insert (force);	2576	return insert (force);
2713	}	2577	}
2714		2578
2715	void	2579	void
2716	object::play_sound (faceidx sound)	2580	object::play_sound (faceidx sound) const
2717	{	2581	{
2718	if (!sound)	2582	if (!sound)
2719	return;	2583	return;
2720		2584
2721	if (flag [FLAG_REMOVED])	2585	if (is_on_map ())
		2586	map->play_sound (sound, x, y);
		2587	else if (object *pl = in_player ())
		2588	pl->contr->play_sound (sound);
		2589	}
		2590
		2591	void
		2592	object::say_msg (const char *msg) const
		2593	{
		2594	if (is_on_map ())
		2595	map->say_msg (msg, x, y);
		2596	else if (object *pl = in_player ())
		2597	pl->contr->play_sound (sound);
		2598	}
		2599
		2600	void
		2601	object::make_noise ()
		2602	{
		2603	// we do not model noise in the map, so instead put
		2604	// a temporary light into the noise source
		2605	// could use the map instead, but that's less reliable for our
		2606	// goal, which is to make invisibility a bit harder to exploit
		2607
		2608	// currently only works sensibly for players
		2609	if (!is_player ())
2722	return;	2610	return;
2723		2611
2724	if (env)	2612	// find old force, or create new one
2725	{	2613	object *force = force_find (shstr_noise_force);
2726	if (object *pl = in_player ())	2614
2727	pl->contr->play_sound (sound);	2615	if (force)
2728	}	2616	force->speed_left = -1.f; // patch old speed up
2729	else	2617	else
2730	map->play_sound (sound, x, y);	2618	{
2731	}	2619	force = archetype::get (shstr_noise_force);
2732		2620
		2621	force->slaying = shstr_noise_force;
		2622	force->stats.food = 1;
		2623	force->speed_left = -1.f;
		2624
		2625	force->set_speed (1.f / 4.f);
		2626	force->flag [FLAG_IS_USED_UP] = true;
		2627	force->flag [FLAG_APPLIED] = true;
		2628
		2629	insert (force);
		2630	}
		2631	}
		2632

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.292 by root, Mon Oct 19 21:48:49 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.292 by root, Mon Oct 19 21:48:49 2009 UTC