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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC vs.
Revision 1.281 by root, Sun Jan 11 06:08:40 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] = {
…		…
186	\|\| ob1->speed != ob2->speed	187	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	188	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	189	\|\| ob1->name != ob2->name)
189	return 0;	190	return 0;
190		191
191	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	195	return 0;
198		196
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* 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
201	* 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
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		205
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		208
211	if (ob1->arch->name != ob2->arch->name	209	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	210	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	211	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	212	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	213	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	214	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	215	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	216	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	217	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	218	\|\| ob1->value != ob2->value
221	\|\| 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
222	\|\| ob1->client_type != ob2->client_type	221	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	222	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	223	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	224	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	225	\|\| ob1->move_type != ob2->move_type
…		…
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	234	return 0;
236		235
237	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
241	.any ())	239	.any ())
242	return 0;	240	return 0;
243		241
244	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
326	{	324	{
327	// see if we are in a container of sorts	325	// see if we are in a container of sorts
328	if (env)	326	if (env)
329	{	327	{
330	// the player inventory itself is always visible	328	// the player inventory itself is always visible
331	if (env->type == PLAYER)	329	if (env->is_player ())
332	return env;	330	return env;
333		331
334	// else a player could have our env open	332	// else a player could have our env open
335	object *envest = env->outer_env ();	333	object *envest = env->outer_env ();
336		334
…		…
344	else	342	else
345	{	343	{
346	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
350	return pl;	349	return pl;
351	}	350	}
352	}	351	}
353		352
354	return 0;	353	return 0;
…		…
478	*/	477	*/
479	object *	478	object *
480	find_object_name (const char *str)	479	find_object_name (const char *str)
481	{	480	{
482	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
483	object *op;
484		482
		483	if (str_)
485	for_all_objects (op)	484	for_all_objects (op)
486	if (op->name == str_)	485	if (op->name == str_)
487	break;	486	return op;
488		487
489	return op;	488	return 0;
490	}	489	}
491		490
492	/*	491	/*
493	* 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
494	* skill and experience objects.	493	* skill and experience objects.
…		…
638	}	637	}
639		638
640	if (speed < 0)	639	if (speed < 0)
641	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
642		641
643	dst->set_speed (dst->speed);	642	dst->activate ();
644	}	643	}
645		644
646	void	645	void
647	object::instantiate ()	646	object::instantiate ()
648	{	647	{
…		…
760	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
761	{	760	{
762	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
765	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* 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
773	* to have move_allow right now.	772	* have move_allow right now.
774	*/	773	*/
775	\|\| ((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
776	\|\| 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)
777	m.flags_ = 0;	776	m.invalidate ();
778	}	777	}
779	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	780	* that is being removed.
782	*/	781	*/
783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	783	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
787	else	786	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		788
…		…
831	object::activate ()	830	object::activate ()
832	{	831	{
833	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
834	if (active)	833	if (active)
835	return;	834	return;
		835
		836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
836		838
837	if (has_active_speed ())	839	if (has_active_speed ())
838	actives.insert (this);	840	actives.insert (this);
839	}	841	}
840		842
…		…
904	* drop on that space.	906	* drop on that space.
905	*/	907	*/
906	if (!drop_to_ground	908	if (!drop_to_ground
907	\|\| !map	909	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	911	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
911	{	913	{
912	while (inv)	914	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	915	inv->destroy ();
916	}
917	}	916	}
918	else	917	else
919	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
920	while (inv)	919	while (inv)
921	{	920	{
…		…
925	\|\| op->flag [FLAG_NO_DROP]	924	\|\| op->flag [FLAG_NO_DROP]
926	\|\| op->type == RUNE	925	\|\| op->type == RUNE
927	\|\| op->type == TRAP	926	\|\| op->type == TRAP
928	\|\| op->flag [FLAG_IS_A_TEMPLATE]	927	\|\| op->flag [FLAG_IS_A_TEMPLATE]
929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	929	op->destroy ();
931	else	930	else
932	map->insert (op, x, y);	931	map->insert (op, x, y);
933	}	932	}
934	}	933	}
935	}	934	}
…		…
943		942
944	static struct freed_map : maptile	943	static struct freed_map : maptile
945	{	944	{
946	freed_map ()	945	freed_map ()
947	{	946	{
948	path = "<freed objects map>";	947	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	948	name = "/internal/freed_objects_map";
950	width = 3;	949	width = 3;
951	height = 3;	950	height = 3;
952	nodrop = 1;	951	no_drop = 1;
		952	no_reset = 1;
953		953
954	alloc ();	954	alloc ();
955	in_memory = MAP_ACTIVE;	955	in_memory = MAP_ACTIVE;
956	}	956	}
957		957
…		…
963		963
964	void	964	void
965	object::do_destroy ()	965	object::do_destroy ()
966	{	966	{
967	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	968	remove_link ();
969		969
970	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	971	remove_friendly_object (this);
972		972
973	remove ();	973	remove ();
…		…
998	attacked_by = 0;	998	attacked_by = 0;
999	current_weapon = 0;	999	current_weapon = 0;
1000	}	1000	}
1001		1001
1002	void	1002	void
1003	object::destroy (bool destroy_inventory)	1003	object::destroy ()
1004	{	1004	{
1005	if (destroyed ())	1005	if (destroyed ())
1006	return;	1006	return;
1007		1007
1008	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1009	{	1009	{
1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	1011	head->destroy ();
1012	return;	1012	return;
1013	}	1013	}
1014		1014
1015	destroy_inv (!destroy_inventory);	1015	destroy_inv (false);
1016		1016
1017	if (is_head ())	1017	if (is_head ())
1018	if (sound_destroy)	1018	if (sound_destroy)
1019	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1057	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1059
1060	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1061		1061
1062	// make sure cmov optimisation is applicable	1062	object *pl = in_player ();
1063	*(above ? &above->below : &env->inv) = below;
1064	*(below ? &below->above : &above ) = above; // &above is just a dummy
1065
1066	above = 0;
1067	below = 0;
1068	env = 0;
1069		1063
1070	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1071	* the map, but we don't actually do that - it is up	1065	* the map, but we don't actually do that - it is up
1072	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1073	*/	1067	*/
1074	map = env->map;	1068	map = env->map;
1075	x = env->x;	1069	x = env->x;
1076	y = env->y;	1070	y = env->y;
1077		1071
		1072	// make sure cmov optimisation is applicable
		1073	*(above ? &above->below : &env->inv) = below;
		1074	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1075
		1076	above = 0;
		1077	below = 0;
		1078	env = 0;
		1079
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1080	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1081	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1082	* to save cpu time.
1081	*/	1083	*/
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1084	if (pl)
		1085	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1086	{
1083	otmp->update_stats ();	1087	pl->update_stats ();
		1088
		1089	if (glow_radius && pl->is_on_map ())
		1090	update_all_los (pl->map, pl->x, pl->y);
		1091	}
1084	}	1092	}
1085	else if (map)	1093	else if (map)
1086	{	1094	{
1087	map->dirty = true;	1095	map->dirty = true;
1088	mapspace &ms = this->ms ();	1096	mapspace &ms = this->ms ();
1089		1097
1090	if (object *pl = ms.player ())	1098	if (object *pl = ms.player ())
1091	{	1099	{
1092	if (type == PLAYER) // this == pl(!)	1100	if (is_player ())
1093	{	1101	{
		1102	if (!flag [FLAG_WIZPASS])
		1103	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1104
1094	// leaving a spot always closes any open container on the ground	1105	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1106	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1107	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1108	// that the CLOSE event is being sent.
1098	close_container ();	1109	close_container ();
…		…
1115	*(below ? &below->above : &ms.bot) = above;	1126	*(below ? &below->above : &ms.bot) = above;
1116		1127
1117	above = 0;	1128	above = 0;
1118	below = 0;	1129	below = 0;
1119		1130
		1131	ms.invalidate ();
		1132
1120	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1121	return;	1134	return;
1122		1135
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1137
…		…
1156	}	1169	}
1157		1170
1158	last = tmp;	1171	last = tmp;
1159	}	1172	}
1160		1173
1161	/* last == NULL if there are no objects on this space */	1174	if (affects_los ())
1162	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)
1164	map->at (x, y).flags_ = 0;
1165	else
1166	update_object (last, UP_OBJ_REMOVE);
1167
1168	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1169	update_all_los (map, x, y);	1175	update_all_los (map, x, y);
1170	}	1176	}
1171	}	1177	}
1172		1178
1173	/*	1179	/*
…		…
1197	esrv_update_item (UPD_NROF, pl, top);	1203	esrv_update_item (UPD_NROF, pl, top);
1198		1204
1199	op->weight = 0; // cancel the addition above	1205	op->weight = 0; // cancel the addition above
1200	op->carrying = 0; // must be 0 already	1206	op->carrying = 0; // must be 0 already
1201		1207
1202	op->destroy (1);	1208	op->destroy ();
1203		1209
1204	return top;	1210	return top;
1205	}	1211	}
1206		1212
1207	return 0;	1213	return 0;
…		…
1235	* job preparing multi-part monsters.	1241	* job preparing multi-part monsters.
1236	*/	1242	*/
1237	object *	1243	object *
1238	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1244	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1239	{	1245	{
		1246	op->remove ();
		1247
1240	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1241	{	1249	{
1242	tmp->x = x + tmp->arch->x;	1250	tmp->x = x + tmp->arch->x;
1243	tmp->y = y + tmp->arch->y;	1251	tmp->y = y + tmp->arch->y;
1244	}	1252	}
…		…
1267	* just 'op' otherwise	1275	* just 'op' otherwise
1268	*/	1276	*/
1269	object *	1277	object *
1270	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1271	{	1279	{
1272	assert (!op->flag [FLAG_FREED]);
1273
1274	op->remove ();	1280	op->remove ();
		1281
		1282	if (m == &freed_map)//D TODO: remove soon
		1283	{//D
		1284	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1285	}//D
1275		1286
1276	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1277	* of areas of callers (eg, anything that uses find_free_spot would now	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1278	* need extra work	1289	* need extra work
1279	*/	1290	*/
		1291	maptile *newmap = m;
1280	if (!xy_normalise (m, op->x, op->y))	1292	if (!xy_normalise (newmap, op->x, op->y))
1281	{	1293	{
1282	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1294	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1283	return 0;	1295	return 0;
1284	}	1296	}
1285		1297
1286	if (object *more = op->more)	1298	if (object *more = op->more)
1287	if (!insert_ob_in_map (more, m, originator, flag))	1299	if (!insert_ob_in_map (more, m, originator, flag))
1288	return 0;	1300	return 0;
1289		1301
1290	CLEAR_FLAG (op, FLAG_REMOVED);	1302	CLEAR_FLAG (op, FLAG_REMOVED);
1291		1303
1292	op->map = m;	1304	op->map = newmap;
1293	mapspace &ms = op->ms ();	1305	mapspace &ms = op->ms ();
1294		1306
1295	/* this has to be done after we translate the coordinates.	1307	/* this has to be done after we translate the coordinates.
1296	*/	1308	*/
1297	if (op->nrof && !(flag & INS_NO_MERGE))	1309	if (op->nrof && !(flag & INS_NO_MERGE))
1298	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1310	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1299	if (object::can_merge (op, tmp))	1311	if (object::can_merge (op, tmp))
1300	{	1312	{
1301	// TODO: we atcually want to update tmp, not op,	1313	// TODO: we actually want to update tmp, not op,
1302	// but some caller surely breaks when we return tmp	1314	// but some caller surely breaks when we return tmp
1303	// from here :/	1315	// from here :/
1304	op->nrof += tmp->nrof;	1316	op->nrof += tmp->nrof;
1305	tmp->destroy (1);	1317	tmp->destroy ();
1306	}	1318	}
1307		1319
1308	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1320	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1309	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1321	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1310		1322
…		…
1317	{	1329	{
1318	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1330	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1319	abort ();	1331	abort ();
1320	}	1332	}
1321		1333
		1334	if (!originator->is_on_map ())
		1335	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1336	op->debug_desc (), originator->debug_desc ());
		1337
1322	op->above = originator;	1338	op->above = originator;
1323	op->below = originator->below;	1339	op->below = originator->below;
1324
1325	if (op->below)
1326	op->below->above = op;
1327	else
1328	ms.bot = op;
1329
1330	/* since below originator, no need to update top */
1331	originator->below = op;	1340	originator->below = op;
		1341
		1342	*(op->below ? &op->below->above : &ms.bot) = op;
1332	}	1343	}
1333	else	1344	else
1334	{	1345	{
1335	object top, floor = NULL;	1346	object *floor = 0;
1336		1347	object *top = ms.top;
1337	top = ms.bot;
1338		1348
1339	/* If there are other objects, then */	1349	/* If there are other objects, then */
1340	if (top)	1350	if (top)
1341	{	1351	{
1342	object *last = 0;
1343
1344	/*	1352	/*
1345	* If there are multiple objects on this space, we do some trickier handling.	1353	* If there are multiple objects on this space, we do some trickier handling.
1346	* We've already dealt with merging if appropriate.	1354	* We've already dealt with merging if appropriate.
1347	* Generally, we want to put the new object on top. But if	1355	* Generally, we want to put the new object on top. But if
1348	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1351	* once we get to them. This reduces the need to traverse over all of	1359	* once we get to them. This reduces the need to traverse over all of
1352	* them when adding another one - this saves quite a bit of cpu time	1360	* them when adding another one - this saves quite a bit of cpu time
1353	* when lots of spells are cast in one area. Currently, it is presumed	1361	* when lots of spells are cast in one area. Currently, it is presumed
1354	* that flying non pickable objects are spell objects.	1362	* that flying non pickable objects are spell objects.
1355	*/	1363	*/
1356	for (top = ms.bot; top; top = top->above)	1364	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1357	{	1365	{
1358	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1366	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1359	floor = top;	1367	floor = tmp;
1360		1368
1361	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1369	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1362	{	1370	{
1363	/* We insert above top, so we want this object below this */	1371	/* We insert above top, so we want this object below this */
1364	top = top->below;	1372	top = tmp->below;
1365	break;	1373	break;
1366	}	1374	}
1367		1375
1368	last = top;	1376	top = tmp;
1369	}	1377	}
1370
1371	/* Don't want top to be NULL, so set it to the last valid object */
1372	top = last;
1373		1378
1374	/* We let update_position deal with figuring out what the space	1379	/* We let update_position deal with figuring out what the space
1375	* looks like instead of lots of conditions here.	1380	* looks like instead of lots of conditions here.
1376	* makes things faster, and effectively the same result.	1381	* makes things faster, and effectively the same result.
1377	*/	1382	*/
…		…
1384	*/	1389	*/
1385	if (!(flag & INS_ON_TOP)	1390	if (!(flag & INS_ON_TOP)
1386	&& ms.flags () & P_BLOCKSVIEW	1391	&& ms.flags () & P_BLOCKSVIEW
1387	&& (op->face && !faces [op->face].visibility))	1392	&& (op->face && !faces [op->face].visibility))
1388	{	1393	{
		1394	object *last;
		1395
1389	for (last = top; last != floor; last = last->below)	1396	for (last = top; last != floor; last = last->below)
1390	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1397	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1391	break;	1398	break;
1392		1399
1393	/* Check to see if we found the object that blocks view,	1400	/* Check to see if we found the object that blocks view,
…		…
1401	} /* If objects on this space */	1408	} /* If objects on this space */
1402		1409
1403	if (flag & INS_ABOVE_FLOOR_ONLY)	1410	if (flag & INS_ABOVE_FLOOR_ONLY)
1404	top = floor;	1411	top = floor;
1405		1412
1406	/* Top is the object that our object (op) is going to get inserted above.	1413	// insert object above top, or bottom-most if top = 0
1407	*/
1408
1409	/* First object on this space */
1410	if (!top)	1414	if (!top)
1411	{	1415	{
		1416	op->below = 0;
1412	op->above = ms.bot;	1417	op->above = ms.bot;
1413
1414	if (op->above)
1415	op->above->below = op;
1416
1417	op->below = 0;
1418	ms.bot = op;	1418	ms.bot = op;
		1419
		1420	*(op->above ? &op->above->below : &ms.top) = op;
1419	}	1421	}
1420	else	1422	else
1421	{ /* get inserted into the stack above top */	1423	{
1422	op->above = top->above;	1424	op->above = top->above;
1423
1424	if (op->above)
1425	op->above->below = op;	1425	top->above = op;
1426		1426
1427	op->below = top;	1427	op->below = top;
1428	top->above = op;	1428	*(op->above ? &op->above->below : &ms.top) = op;
1429	}	1429	}
		1430	}
1430		1431
1431	if (!op->above)	1432	if (op->is_player ())
1432	ms.top = op;
1433	} /* else not INS_BELOW_ORIGINATOR */
1434
1435	if (op->type == PLAYER)
1436	{	1433	{
1437	op->contr->do_los = 1;	1434	op->contr->do_los = 1;
1438	++op->map->players;	1435	++op->map->players;
1439	op->map->touch ();	1436	op->map->touch ();
1440	}	1437	}
…		…
1455	* be far away from this change and not affected in any way -	1452	* be far away from this change and not affected in any way -
1456	* this should get redone to only look for players within range,	1453	* this should get redone to only look for players within range,
1457	* or just updating the P_UPTODATE for spaces within this area	1454	* or just updating the P_UPTODATE for spaces within this area
1458	* of effect may be sufficient.	1455	* of effect may be sufficient.
1459	*/	1456	*/
1460	if (op->map->darkness && (op->glow_radius != 0))	1457	if (op->affects_los ())
		1458	{
		1459	op->ms ().invalidate ();
1461	update_all_los (op->map, op->x, op->y);	1460	update_all_los (op->map, op->x, op->y);
		1461	}
1462		1462
1463	/* updates flags (blocked, alive, no magic, etc) for this map space */	1463	/* updates flags (blocked, alive, no magic, etc) for this map space */
1464	update_object (op, UP_OBJ_INSERT);	1464	update_object (op, UP_OBJ_INSERT);
1465		1465
1466	INVOKE_OBJECT (INSERT, op);	1466	INVOKE_OBJECT (INSERT, op);
…		…
1494	/* this function inserts an object in the map, but if it	1494	/* this function inserts an object in the map, but if it
1495	* finds an object of its own type, it'll remove that one first.	1495	* finds an object of its own type, it'll remove that one first.
1496	* op is the object to insert it under: supplies x and the map.	1496	* op is the object to insert it under: supplies x and the map.
1497	*/	1497	*/
1498	void	1498	void
1499	replace_insert_ob_in_map (const char arch_string, object op)	1499	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500	{	1500	{
1501	/* first search for itself and remove any old instances */	1501	/* first search for itself and remove any old instances */
1502		1502
1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1504	if (tmp->arch->archname == archname) /* same archetype */
1505	tmp->destroy (1);	1505	tmp->destroy ();
1506		1506
1507	object *tmp = arch_to_object (archetype::find (arch_string));	1507	object *tmp = arch_to_object (archetype::find (archname));
1508		1508
1509	tmp->x = op->x;	1509	tmp->x = op->x;
1510	tmp->y = op->y;	1510	tmp->y = op->y;
1511		1511
1512	insert_ob_in_map (tmp, op->map, op, 0);	1512	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1534	if (!nr)	1534	if (!nr)
1535	return true;	1535	return true;
1536		1536
1537	nr = min (nr, nrof);	1537	nr = min (nr, nrof);
1538		1538
		1539	if (nrof > nr)
		1540	{
1539	nrof -= nr;	1541	nrof -= nr;
1540
1541	if (nrof)
1542	{
1543	adjust_weight (env, -weight * nr); // carrying == 0	1542	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1544		1543
1545	if (object *pl = visible_to ())	1544	if (object *pl = visible_to ())
1546	esrv_update_item (UPD_NROF, pl, this);	1545	esrv_update_item (UPD_NROF, pl, this);
1547		1546
1548	return true;	1547	return true;
1549	}	1548	}
1550	else	1549	else
1551	{	1550	{
1552	destroy (1);	1551	destroy ();
1553	return false;	1552	return false;
1554	}	1553	}
1555	}	1554	}
1556		1555
1557	/*	1556	/*
…		…
1634	if (object *pl = tmp->visible_to ())	1633	if (object *pl = tmp->visible_to ())
1635	esrv_update_item (UPD_NROF, pl, tmp);	1634	esrv_update_item (UPD_NROF, pl, tmp);
1636		1635
1637	adjust_weight (this, op->total_weight ());	1636	adjust_weight (this, op->total_weight ());
1638		1637
1639	op->destroy (1);	1638	op->destroy ();
1640	op = tmp;	1639	op = tmp;
1641	goto inserted;	1640	goto inserted;
1642	}	1641	}
1643		1642
1644	op->owner = 0; // it's his/hers now. period.	1643	op->owner = 0; // it's his/hers now. period.
…		…
1662		1661
1663	adjust_weight (this, op->total_weight ());	1662	adjust_weight (this, op->total_weight ());
1664		1663
1665	inserted:	1664	inserted:
1666	/* reset the light list and los of the players on the map */	1665	/* reset the light list and los of the players on the map */
1667	if (op->glow_radius && map && map->darkness)	1666	if (op->glow_radius && is_on_map ())
		1667	{
		1668	update_stats ();
1668	update_all_los (map, x, y);	1669	update_all_los (map, x, y);
1669		1670	}
		1671	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1670	// if this is a player's inventory, update stats	1672	// if this is a player's inventory, update stats
1671	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1672	update_stats ();	1673	update_stats ();
1673		1674
1674	INVOKE_OBJECT (INSERT, this);	1675	INVOKE_OBJECT (INSERT, this);
1675		1676
1676	return op;	1677	return op;
…		…
1760	{	1761	{
1761		1762
1762	float	1763	float
1763	diff = tmp->move_slow_penalty * fabs (op->speed);	1764	diff = tmp->move_slow_penalty * fabs (op->speed);
1764		1765
1765	if (op->type == PLAYER)	1766	if (op->is_player ())
1766	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1767	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1768	diff /= 4.0;	1769	diff /= 4.0;
1769		1770
1770	op->speed_left -= diff;	1771	op->speed_left -= diff;
…		…
1978	* head of the object should correspond for the entire object.	1979	* head of the object should correspond for the entire object.
1979	*/	1980	*/
1980	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1981	continue;	1982	continue;
1982		1983
1983	if (ob->blocked (m, pos.x, pos.y))	1984	if (ob->blocked (pos.m, pos.x, pos.y))
1984	continue;	1985	continue;
1985		1986
1986	altern [index++] = i;	1987	altern [index++] = i;
1987	}	1988	}
1988		1989
…		…
2056	* there is capable of.	2057	* there is capable of.
2057	*/	2058	*/
2058	int	2059	int
2059	find_dir (maptile m, int x, int y, object exclude)	2060	find_dir (maptile m, int x, int y, object exclude)
2060	{	2061	{
2061	int i, max = SIZEOFFREE, mflags;	2062	int max = SIZEOFFREE, mflags;
2062
2063	sint16 nx, ny;
2064	object *tmp;
2065	maptile *mp;
2066
2067	MoveType blocked, move_type;	2063	MoveType move_type;
2068		2064
2069	if (exclude && exclude->head_ () != exclude)	2065	if (exclude && exclude->head_ () != exclude)
2070	{	2066	{
2071	exclude = exclude->head;	2067	exclude = exclude->head;
2072	move_type = exclude->move_type;	2068	move_type = exclude->move_type;
…		…
2075	{	2071	{
2076	/* If we don't have anything, presume it can use all movement types. */	2072	/* If we don't have anything, presume it can use all movement types. */
2077	move_type = MOVE_ALL;	2073	move_type = MOVE_ALL;
2078	}	2074	}
2079		2075
2080	for (i = 1; i < max; i++)	2076	for (int i = 1; i < max; i++)
2081	{	2077	{
2082	mp = m;	2078	mapxy pos (m, x, y);
2083	nx = x + freearr_x[i];	2079	pos.move (i);
2084	ny = y + freearr_y[i];
2085		2080
2086	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2081	if (!pos.normalise ())
2087
2088	if (mflags & P_OUT_OF_MAP)
2089	max = maxfree[i];	2082	max = maxfree[i];
2090	else	2083	else
2091	{	2084	{
2092	mapspace &ms = mp->at (nx, ny);	2085	mapspace &ms = *pos;
2093		2086
2094	blocked = ms.move_block;
2095
2096	if ((move_type & blocked) == move_type)	2087	if ((move_type & ms.move_block) == move_type)
2097	max = maxfree[i];	2088	max = maxfree [i];
2098	else if (mflags & P_IS_ALIVE)	2089	else if (ms.flags () & P_IS_ALIVE)
2099	{	2090	{
2100	for (tmp = ms.bot; tmp; tmp = tmp->above)	2091	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2092	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2102	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2093	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103	break;
2104
2105	if (tmp)
2106	return freedir[i];	2094	return freedir [i];
2107	}	2095	}
2108	}	2096	}
2109	}	2097	}
2110		2098
2111	return 0;	2099	return 0;
…		…
2186	* This basically means that if direction is 15, then it could either go	2174	* This basically means that if direction is 15, then it could either go
2187	* direction 4, 14, or 16 to get back to where we are.	2175	* direction 4, 14, or 16 to get back to where we are.
2188	* Moved from spell_util.c to object.c with the other related direction	2176	* Moved from spell_util.c to object.c with the other related direction
2189	* functions.	2177	* functions.
2190	*/	2178	*/
2191	int reduction_dir[SIZEOFFREE][3] = {	2179	const int reduction_dir[SIZEOFFREE][3] = {
2192	{0, 0, 0}, /* 0 */	2180	{0, 0, 0}, /* 0 */
2193	{0, 0, 0}, /* 1 */	2181	{0, 0, 0}, /* 1 */
2194	{0, 0, 0}, /* 2 */	2182	{0, 0, 0}, /* 2 */
2195	{0, 0, 0}, /* 3 */	2183	{0, 0, 0}, /* 3 */
2196	{0, 0, 0}, /* 4 */	2184	{0, 0, 0}, /* 4 */
…		…
2292	int	2280	int
2293	can_pick (const object who, const object item)	2281	can_pick (const object who, const object item)
2294	{	2282	{
2295	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2283	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2296	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2297	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2285	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2298	}	2286	}
2299		2287
2300	/*	2288	/*
2301	* create clone from object to another	2289	* create clone from object to another
2302	*/	2290	*/
…		…
2334	return tmp;	2322	return tmp;
2335		2323
2336	return 0;	2324	return 0;
2337	}	2325	}
2338		2326
2339	const shstr &	2327	shstr_tmp
2340	object::kv_get (const shstr &key) const	2328	object::kv_get (shstr_tmp key) const
2341	{	2329	{
2342	for (key_value *kv = key_values; kv; kv = kv->next)	2330	for (key_value *kv = key_values; kv; kv = kv->next)
2343	if (kv->key == key)	2331	if (kv->key == key)
2344	return kv->value;	2332	return kv->value;
2345		2333
2346	return shstr_null;	2334	return shstr ();
2347	}	2335	}
2348		2336
2349	void	2337	void
2350	object::kv_set (const shstr &key, const shstr &value)	2338	object::kv_set (shstr_tmp key, shstr_tmp value)
2351	{	2339	{
2352	for (key_value *kv = key_values; kv; kv = kv->next)	2340	for (key_value *kv = key_values; kv; kv = kv->next)
2353	if (kv->key == key)	2341	if (kv->key == key)
2354	{	2342	{
2355	kv->value = value;	2343	kv->value = value;
…		…
2364		2352
2365	key_values = kv;	2353	key_values = kv;
2366	}	2354	}
2367		2355
2368	void	2356	void
2369	object::kv_del (const shstr &key)	2357	object::kv_del (shstr_tmp key)
2370	{	2358	{
2371	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2359	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2372	if ((*kvp)->key == key)	2360	if ((*kvp)->key == key)
2373	{	2361	{
2374	key_value kv = kvp;	2362	key_value kv = kvp;
…		…
2433	{	2421	{
2434	char flagdesc[512];	2422	char flagdesc[512];
2435	char info2[256 * 4];	2423	char info2[256 * 4];
2436	char *p = info;	2424	char *p = info;
2437		2425
2438	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2426	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2439	count,	2427	count,
2440	uuid.c_str (),	2428	uuid.c_str (),
2441	&name,	2429	&name,
2442	title ? "\",title:\"" : "",	2430	title ? ",title:\"" : "",
2443	title ? (const char *)title : "",	2431	title ? (const char *)title : "",
		2432	title ? "\"" : "",
2444	flag_desc (flagdesc, 512), type);	2433	flag_desc (flagdesc, 512), type);
2445		2434
2446	if (!flag[FLAG_REMOVED] && env)	2435	if (!flag[FLAG_REMOVED] && env)
2447	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2436	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2448		2437
…		…
2504	container = 0;	2493	container = 0;
2505		2494
2506	// client needs item update to make it work, client bug requires this to be separate	2495	// client needs item update to make it work, client bug requires this to be separate
2507	esrv_update_item (UPD_FLAGS, this, old_container);	2496	esrv_update_item (UPD_FLAGS, this, old_container);
2508		2497
2509	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2498	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2510	play_sound (sound_find ("chest_close"));	2499	play_sound (sound_find ("chest_close"));
2511	}	2500	}
2512		2501
2513	if (new_container)	2502	if (new_container)
2514	{	2503	{
…		…
2524	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2513	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2525	new_container->insert (closer);	2514	new_container->insert (closer);
2526	}	2515	}
2527	#endif	2516	#endif
2528		2517
2529	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2518	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2530		2519
2531	// make sure the container is available, client bug requires this to be separate	2520	// make sure the container is available, client bug requires this to be separate
2532	esrv_send_item (this, new_container);	2521	esrv_send_item (this, new_container);
2533		2522
2534	new_container->flag [FLAG_APPLIED] = true;	2523	new_container->flag [FLAG_APPLIED] = true;
…		…
2542	// else if (!old_container->env && contr && contr->ns)	2531	// else if (!old_container->env && contr && contr->ns)
2543	// contr->ns->floorbox_reset ();	2532	// contr->ns->floorbox_reset ();
2544	}	2533	}
2545		2534
2546	object *	2535	object *
2547	object::force_find (const shstr name)	2536	object::force_find (shstr_tmp name)
2548	{	2537	{
2549	/* cycle through his inventory to look for the MARK we want to	2538	/* cycle through his inventory to look for the MARK we want to
2550	* place	2539	* place
2551	*/	2540	*/
2552	for (object *tmp = inv; tmp; tmp = tmp->below)	2541	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2554	return splay (tmp);	2543	return splay (tmp);
2555		2544
2556	return 0;	2545	return 0;
2557	}	2546	}
2558		2547
2559	void	2548	object *
2560	object::force_add (const shstr name, int duration)	2549	object::force_add (shstr_tmp name, int duration)
2561	{	2550	{
2562	if (object *force = force_find (name))	2551	if (object *force = force_find (name))
2563	force->destroy ();	2552	force->destroy ();
2564		2553
2565	object *force = get_archetype (FORCE_NAME);	2554	object *force = get_archetype (FORCE_NAME);
…		…
2570		2559
2571	force->set_speed (duration ? 1.f / duration : 0.f);	2560	force->set_speed (duration ? 1.f / duration : 0.f);
2572	force->flag [FLAG_IS_USED_UP] = true;	2561	force->flag [FLAG_IS_USED_UP] = true;
2573	force->flag [FLAG_APPLIED] = true;	2562	force->flag [FLAG_APPLIED] = true;
2574		2563
2575	insert (force);	2564	return insert (force);
2576	}	2565	}
2577		2566
2578	void	2567	void
2579	object::play_sound (faceidx sound)	2568	object::play_sound (faceidx sound) const
2580	{	2569	{
2581	if (!sound)	2570	if (!sound)
2582	return;	2571	return;
2583		2572
2584	if (flag [FLAG_REMOVED])	2573	if (is_on_map ())
		2574	map->play_sound (sound, x, y);
		2575	else if (object *pl = in_player ())
		2576	pl->contr->play_sound (sound);
		2577	}
		2578
		2579	void
		2580	object::say_msg (const char *msg) const
		2581	{
		2582	if (is_on_map ())
		2583	map->say_msg (msg, x, y);
		2584	else if (object *pl = in_player ())
		2585	pl->contr->play_sound (sound);
		2586	}
		2587
		2588	void
		2589	object::make_noise ()
		2590	{
		2591	// we do not model noise in the map, so instead put
		2592	// a temporary light into the noise source
		2593	// could use the map instead, but that's less reliable for our
		2594	// goal, which is to make invisibility a bit harder to exploit
		2595
		2596	// currently only works sensibly for players
		2597	if (!is_player ())
2585	return;	2598	return;
2586		2599
2587	if (env)	2600	// find old force, or create new one
2588	{	2601	object *force = force_find (shstr_noise_force);
2589	if (object *pl = in_player ())	2602
2590	pl->contr->play_sound (sound);	2603	if (force)
2591	}	2604	force->speed_left = -1.f; // patch old speed up
2592	else	2605	else
2593	map->play_sound (sound, x, y);	2606	{
2594	}	2607	force = archetype::get (shstr_noise_force);
2595		2608
		2609	force->slaying = shstr_noise_force;
		2610	force->stats.food = 1;
		2611	force->speed_left = -1.f;
		2612
		2613	force->set_speed (1.f / 4.f);
		2614	force->flag [FLAG_IS_USED_UP] = true;
		2615	force->flag [FLAG_APPLIED] = true;
		2616
		2617	insert (force);
		2618	}
		2619	}
		2620

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC vs. Revision 1.281 by root, Sun Jan 11 06:08:40 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC vs.
Revision 1.281 by root, Sun Jan 11 06:08:40 2009 UTC