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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.230 by root, Sun May 4 08:25:32 2008 UTC vs.
Revision 1.278 by root, Thu Jan 1 19:42:43 2009 UTC

…		…
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
40		41
41	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
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;
355	}	354	}
356		355
357	// adjust weight per container type ("of holding")	356	// adjust weight per container type ("of holding")
358	static sint32	357	static sint32
359	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
360	{	359	{
361	return op->type == CONTAINER	360	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363	: weight;	362	: weight;
364	}	363	}
…		…
370	static void	369	static void
371	adjust_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
372	{	371	{
373	while (op)	372	while (op)
374	{	373	{
		374	// adjust by actual difference to account for rounding errors
		375	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375	weight = weight_adjust (op, weight);	376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
376		378
377	if (!weight)	379	if (!weight)
378	return;	380	return;
379		381
380	op->carrying += weight;	382	op->carrying += weight;
…		…
403	op->update_weight ();	405	op->update_weight ();
404		406
405	sum += op->total_weight ();	407	sum += op->total_weight ();
406	}	408	}
407		409
408	sum = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
409		411
410	if (sum != carrying)	412	if (sum != carrying)
411	{	413	{
412	carrying = sum;	414	carrying = sum;
413		415
…		…
475	*/	477	*/
476	object *	478	object *
477	find_object_name (const char *str)	479	find_object_name (const char *str)
478	{	480	{
479	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
480	object *op;
481		482
		483	if (str_)
482	for_all_objects (op)	484	for_all_objects (op)
483	if (op->name == str_)	485	if (op->name == str_)
484	break;	486	return op;
485		487
486	return op;	488	return 0;
487	}	489	}
488		490
489	/*	491	/*
490	* 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
491	* skill and experience objects.	493	* skill and experience objects.
…		…
635	}	637	}
636		638
637	if (speed < 0)	639	if (speed < 0)
638	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
639		641
640	dst->set_speed (dst->speed);	642	dst->activate ();
641	}	643	}
642		644
643	void	645	void
644	object::instantiate ()	646	object::instantiate ()
645	{	647	{
…		…
757	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
758	{	760	{
759	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
760	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
761	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
762	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
763	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
764	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
765	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
766	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
767	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
768	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
769	/* 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
770	* to have move_allow right now.	772	* have move_allow right now.
771	*/	773	*/
772	\|\| ((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
773	\|\| 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)
774	m.flags_ = 0;	776	m.invalidate ();
775	}	777	}
776	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
777	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
778	* that is being removed.	780	* that is being removed.
779	*/	781	*/
780	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
781	m.flags_ = 0;	783	m.invalidate ();
782	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
783	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
784	else	786	else
785	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
786		788
…		…
828	object::activate ()	830	object::activate ()
829	{	831	{
830	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
831	if (active)	833	if (active)
832	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
833		838
834	if (has_active_speed ())	839	if (has_active_speed ())
835	actives.insert (this);	840	actives.insert (this);
836	}	841	}
837		842
…		…
901	* drop on that space.	906	* drop on that space.
902	*/	907	*/
903	if (!drop_to_ground	908	if (!drop_to_ground
904	\|\| !map	909	\|\| !map
905	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
906	\|\| map->nodrop	911	\|\| map->no_drop
907	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
908	{	913	{
909	while (inv)	914	while (inv)
910	{
911	inv->destroy_inv (false);
912	inv->destroy ();	915	inv->destroy ();
913	}
914	}	916	}
915	else	917	else
916	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
917	while (inv)	919	while (inv)
918	{	920	{
…		…
922	\|\| op->flag [FLAG_NO_DROP]	924	\|\| op->flag [FLAG_NO_DROP]
923	\|\| op->type == RUNE	925	\|\| op->type == RUNE
924	\|\| op->type == TRAP	926	\|\| op->type == TRAP
925	\|\| op->flag [FLAG_IS_A_TEMPLATE]	927	\|\| op->flag [FLAG_IS_A_TEMPLATE]
926	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
927	op->destroy (true);	929	op->destroy ();
928	else	930	else
929	map->insert (op, x, y);	931	map->insert (op, x, y);
930	}	932	}
931	}	933	}
932	}	934	}
…		…
940		942
941	static struct freed_map : maptile	943	static struct freed_map : maptile
942	{	944	{
943	freed_map ()	945	freed_map ()
944	{	946	{
945	path = "<freed objects map>";	947	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	948	name = "/internal/freed_objects_map";
947	width = 3;	949	width = 3;
948	height = 3;	950	height = 3;
949	nodrop = 1;	951	no_drop = 1;
		952	no_reset = 1;
950		953
951	alloc ();	954	alloc ();
952	in_memory = MAP_ACTIVE;	955	in_memory = MAP_ACTIVE;
953	}	956	}
954		957
…		…
995	attacked_by = 0;	998	attacked_by = 0;
996	current_weapon = 0;	999	current_weapon = 0;
997	}	1000	}
998		1001
999	void	1002	void
1000	object::destroy (bool destroy_inventory)	1003	object::destroy ()
1001	{	1004	{
1002	if (destroyed ())	1005	if (destroyed ())
1003	return;	1006	return;
1004		1007
1005	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1006	{	1009	{
1007	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1008	head->destroy (destroy_inventory);	1011	head->destroy ();
1009	return;	1012	return;
1010	}	1013	}
1011		1014
1012	destroy_inv (!destroy_inventory);	1015	destroy_inv (false);
1013		1016
1014	if (is_head ())	1017	if (is_head ())
1015	if (sound_destroy)	1018	if (sound_destroy)
1016	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1017	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1054	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1055	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
1056		1059
1057	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1058		1061
1059	*(above ? &above->below : &env->inv) = below;	1062	object *pl = in_player ();
1060
1061	if (below)
1062	below->above = above;
1063		1063
1064	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1065	* 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
1066	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1067	*/	1067	*/
1068	map = env->map;	1068	map = env->map;
1069	x = env->x;	1069	x = env->x;
1070	y = env->y;	1070	y = env->y;
		1071
		1072	// make sure cmov optimisation is applicable
		1073	*(above ? &above->below : &env->inv) = below;
		1074	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1075
1071	above = 0;	1076	above = 0;
1072	below = 0;	1077	below = 0;
1073	env = 0;	1078	env = 0;
1074		1079
1075	/* 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
1076	* made to players inventory. If set, avoiding the call	1081	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	1082	* to save cpu time.
1078	*/	1083	*/
1079	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	{
1080	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	}
1081	}	1092	}
1082	else if (map)	1093	else if (map)
1083	{	1094	{
1084	map->dirty = true;	1095	map->dirty = true;
1085	mapspace &ms = this->ms ();	1096	mapspace &ms = this->ms ();
1086		1097
1087	if (object *pl = ms.player ())	1098	if (object *pl = ms.player ())
1088	{	1099	{
1089	if (type == PLAYER) // this == pl(!)	1100	if (is_player ())
1090	{	1101	{
		1102	if (!flag [FLAG_WIZPASS])
		1103	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1104
1091	// leaving a spot always closes any open container on the ground	1105	// leaving a spot always closes any open container on the ground
1092	if (container && !container->env)	1106	if (container && !container->env)
1093	// this causes spurious floorbox updates, but it ensures	1107	// this causes spurious floorbox updates, but it ensures
1094	// that the CLOSE event is being sent.	1108	// that the CLOSE event is being sent.
1095	close_container ();	1109	close_container ();
…		…
1105		1119
1106	esrv_del_item (pl->contr, count);	1120	esrv_del_item (pl->contr, count);
1107	}	1121	}
1108		1122
1109	/* link the object above us */	1123	/* link the object above us */
1110	if (above)	1124	// re-link, make sure compiler can easily use cmove
1111	above->below = below;	1125	*(above ? &above->below : &ms.top) = below;
1112	else	1126	*(below ? &below->above : &ms.bot) = above;
1113	ms.top = below; /* we were top, set new top */
1114
1115	/* Relink the object below us, if there is one */
1116	if (below)
1117	below->above = above;
1118	else
1119	{
1120	/* Nothing below, which means we need to relink map object for this space
1121	* use translated coordinates in case some oddness with map tiling is
1122	* evident
1123	*/
1124	if (GET_MAP_OB (map, x, y) != this)
1125	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 ());
1126
1127	ms.bot = above; /* goes on above it. */
1128	}
1129		1127
1130	above = 0;	1128	above = 0;
1131	below = 0;	1129	below = 0;
		1130
		1131	ms.invalidate ();
1132		1132
1133	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1134	return;	1134	return;
1135		1135
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1169	}	1169	}
1170		1170
1171	last = tmp;	1171	last = tmp;
1172	}	1172	}
1173		1173
1174	/* last == NULL if there are no objects on this space */	1174	if (affects_los ())
1175	//TODO: this makes little sense, why only update the topmost object?
1176	if (!last)
1177	map->at (x, y).flags_ = 0;
1178	else
1179	update_object (last, UP_OBJ_REMOVE);
1180
1181	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1182	update_all_los (map, x, y);	1175	update_all_los (map, x, y);
1183	}	1176	}
1184	}	1177	}
1185		1178
1186	/*	1179	/*
…		…
1210	esrv_update_item (UPD_NROF, pl, top);	1203	esrv_update_item (UPD_NROF, pl, top);
1211		1204
1212	op->weight = 0; // cancel the addition above	1205	op->weight = 0; // cancel the addition above
1213	op->carrying = 0; // must be 0 already	1206	op->carrying = 0; // must be 0 already
1214		1207
1215	op->destroy (1);	1208	op->destroy ();
1216		1209
1217	return top;	1210	return top;
1218	}	1211	}
1219		1212
1220	return 0;	1213	return 0;
…		…
1248	* job preparing multi-part monsters.	1241	* job preparing multi-part monsters.
1249	*/	1242	*/
1250	object *	1243	object *
1251	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)
1252	{	1245	{
		1246	op->remove ();
		1247
1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254	{	1249	{
1255	tmp->x = x + tmp->arch->x;	1250	tmp->x = x + tmp->arch->x;
1256	tmp->y = y + tmp->arch->y;	1251	tmp->y = y + tmp->arch->y;
1257	}	1252	}
…		…
1280	* just 'op' otherwise	1275	* just 'op' otherwise
1281	*/	1276	*/
1282	object *	1277	object *
1283	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)
1284	{	1279	{
1285	assert (!op->flag [FLAG_FREED]);
1286
1287	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
1288		1286
1289	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1290	* 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
1291	* need extra work	1289	* need extra work
1292	*/	1290	*/
		1291	maptile *newmap = m;
1293	if (!xy_normalise (m, op->x, op->y))	1292	if (!xy_normalise (newmap, op->x, op->y))
1294	{	1293	{
1295	op->destroy (1);	1294	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1296	return 0;	1295	return 0;
1297	}	1296	}
1298		1297
1299	if (object *more = op->more)	1298	if (object *more = op->more)
1300	if (!insert_ob_in_map (more, m, originator, flag))	1299	if (!insert_ob_in_map (more, m, originator, flag))
1301	return 0;	1300	return 0;
1302		1301
1303	CLEAR_FLAG (op, FLAG_REMOVED);	1302	CLEAR_FLAG (op, FLAG_REMOVED);
1304		1303
1305	op->map = m;	1304	op->map = newmap;
1306	mapspace &ms = op->ms ();	1305	mapspace &ms = op->ms ();
1307		1306
1308	/* this has to be done after we translate the coordinates.	1307	/* this has to be done after we translate the coordinates.
1309	*/	1308	*/
1310	if (op->nrof && !(flag & INS_NO_MERGE))	1309	if (op->nrof && !(flag & INS_NO_MERGE))
1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1310	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312	if (object::can_merge (op, tmp))	1311	if (object::can_merge (op, tmp))
1313	{	1312	{
1314	// TODO: we atcually want to update tmp, not op,	1313	// TODO: we actually want to update tmp, not op,
1315	// but some caller surely breaks when we return tmp	1314	// but some caller surely breaks when we return tmp
1316	// from here :/	1315	// from here :/
1317	op->nrof += tmp->nrof;	1316	op->nrof += tmp->nrof;
1318	tmp->destroy (1);	1317	tmp->destroy ();
1319	}	1318	}
1320		1319
1321	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 */
1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1321	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1323		1322
…		…
1330	{	1329	{
1331	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");
1332	abort ();	1331	abort ();
1333	}	1332	}
1334		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
1335	op->above = originator;	1338	op->above = originator;
1336	op->below = originator->below;	1339	op->below = originator->below;
1337
1338	if (op->below)
1339	op->below->above = op;
1340	else
1341	ms.bot = op;
1342
1343	/* since below originator, no need to update top */
1344	originator->below = op;	1340	originator->below = op;
		1341
		1342	*(op->below ? &op->below->above : &ms.bot) = op;
1345	}	1343	}
1346	else	1344	else
1347	{	1345	{
1348	object top, floor = NULL;	1346	object *floor = 0;
1349		1347	object *top = ms.top;
1350	top = ms.bot;
1351		1348
1352	/* If there are other objects, then */	1349	/* If there are other objects, then */
1353	if (top)	1350	if (top)
1354	{	1351	{
1355	object *last = 0;
1356
1357	/*	1352	/*
1358	* 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.
1359	* We've already dealt with merging if appropriate.	1354	* We've already dealt with merging if appropriate.
1360	* 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
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1364	* 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
1365	* 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
1366	* 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
1367	* that flying non pickable objects are spell objects.	1362	* that flying non pickable objects are spell objects.
1368	*/	1363	*/
1369	for (top = ms.bot; top; top = top->above)	1364	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1365	{
1371	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))
1372	floor = top;	1367	floor = tmp;
1373		1368
1374	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))
1375	{	1370	{
1376	/* We insert above top, so we want this object below this */	1371	/* We insert above top, so we want this object below this */
1377	top = top->below;	1372	top = tmp->below;
1378	break;	1373	break;
1379	}	1374	}
1380		1375
1381	last = top;	1376	top = tmp;
1382	}	1377	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1378
1387	/* We let update_position deal with figuring out what the space	1379	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1380	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1381	* makes things faster, and effectively the same result.
1390	*/	1382	*/
…		…
1397	*/	1389	*/
1398	if (!(flag & INS_ON_TOP)	1390	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1391	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1392	&& (op->face && !faces [op->face].visibility))
1401	{	1393	{
		1394	object *last;
		1395
1402	for (last = top; last != floor; last = last->below)	1396	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1397	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404	break;	1398	break;
1405		1399
1406	/* Check to see if we found the object that blocks view,	1400	/* Check to see if we found the object that blocks view,
…		…
1414	} /* If objects on this space */	1408	} /* If objects on this space */
1415		1409
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1410	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1411	top = floor;
1418		1412
1419	/* 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
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1414	if (!top)
1424	{	1415	{
		1416	op->below = 0;
1425	op->above = ms.bot;	1417	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1418	ms.bot = op;
		1419
		1420	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1421	}
1433	else	1422	else
1434	{ /* get inserted into the stack above top */	1423	{
1435	op->above = top->above;	1424	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1425	top->above = op;
1439		1426
1440	op->below = top;	1427	op->below = top;
1441	top->above = op;	1428	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1429	}
		1430	}
1443		1431
1444	if (!op->above)	1432	if (op->is_player ())
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447
1448	if (op->type == PLAYER)
1449	{	1433	{
1450	op->contr->do_los = 1;	1434	op->contr->do_los = 1;
1451	++op->map->players;	1435	++op->map->players;
1452	op->map->touch ();	1436	op->map->touch ();
1453	}	1437	}
…		…
1468	* 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 -
1469	* this should get redone to only look for players within range,	1453	* this should get redone to only look for players within range,
1470	* or just updating the P_UPTODATE for spaces within this area	1454	* or just updating the P_UPTODATE for spaces within this area
1471	* of effect may be sufficient.	1455	* of effect may be sufficient.
1472	*/	1456	*/
1473	if (op->map->darkness && (op->glow_radius != 0))	1457	if (op->affects_los ())
		1458	{
		1459	op->ms ().invalidate ();
1474	update_all_los (op->map, op->x, op->y);	1460	update_all_los (op->map, op->x, op->y);
		1461	}
1475		1462
1476	/* updates flags (blocked, alive, no magic, etc) for this map space */	1463	/* updates flags (blocked, alive, no magic, etc) for this map space */
1477	update_object (op, UP_OBJ_INSERT);	1464	update_object (op, UP_OBJ_INSERT);
1478		1465
1479	INVOKE_OBJECT (INSERT, op);	1466	INVOKE_OBJECT (INSERT, op);
…		…
1507	/* this function inserts an object in the map, but if it	1494	/* this function inserts an object in the map, but if it
1508	* 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.
1509	* 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.
1510	*/	1497	*/
1511	void	1498	void
1512	replace_insert_ob_in_map (const char arch_string, object op)	1499	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1513	{	1500	{
1514	/* first search for itself and remove any old instances */	1501	/* first search for itself and remove any old instances */
1515		1502
1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1504	if (tmp->arch->archname == archname) /* same archetype */
1518	tmp->destroy (1);	1505	tmp->destroy ();
1519		1506
1520	object *tmp = arch_to_object (archetype::find (arch_string));	1507	object *tmp = arch_to_object (archetype::find (archname));
1521		1508
1522	tmp->x = op->x;	1509	tmp->x = op->x;
1523	tmp->y = op->y;	1510	tmp->y = op->y;
1524		1511
1525	insert_ob_in_map (tmp, op->map, op, 0);	1512	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1547	if (!nr)	1534	if (!nr)
1548	return true;	1535	return true;
1549		1536
1550	nr = min (nr, nrof);	1537	nr = min (nr, nrof);
1551		1538
		1539	if (nrof > nr)
		1540	{
1552	nrof -= nr;	1541	nrof -= nr;
1553
1554	if (nrof)
1555	{
1556	adjust_weight (env, -weight * nr); // carrying == 0	1542	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557		1543
1558	if (object *pl = visible_to ())	1544	if (object *pl = visible_to ())
1559	esrv_update_item (UPD_NROF, pl, this);	1545	esrv_update_item (UPD_NROF, pl, this);
1560		1546
1561	return true;	1547	return true;
1562	}	1548	}
1563	else	1549	else
1564	{	1550	{
1565	destroy (1);	1551	destroy ();
1566	return false;	1552	return false;
1567	}	1553	}
1568	}	1554	}
1569		1555
1570	/*	1556	/*
…		…
1647	if (object *pl = tmp->visible_to ())	1633	if (object *pl = tmp->visible_to ())
1648	esrv_update_item (UPD_NROF, pl, tmp);	1634	esrv_update_item (UPD_NROF, pl, tmp);
1649		1635
1650	adjust_weight (this, op->total_weight ());	1636	adjust_weight (this, op->total_weight ());
1651		1637
1652	op->destroy (1);	1638	op->destroy ();
1653	op = tmp;	1639	op = tmp;
1654	goto inserted;	1640	goto inserted;
1655	}	1641	}
1656		1642
1657	op->owner = 0; // it's his/hers now. period.	1643	op->owner = 0; // it's his/hers now. period.
…		…
1675		1661
1676	adjust_weight (this, op->total_weight ());	1662	adjust_weight (this, op->total_weight ());
1677		1663
1678	inserted:	1664	inserted:
1679	/* 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 */
1680	if (op->glow_radius && map && map->darkness)	1666	if (op->glow_radius && is_on_map ())
		1667	{
		1668	update_stats ();
1681	update_all_los (map, x, y);	1669	update_all_los (map, x, y);
1682		1670	}
		1671	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1683	// if this is a player's inventory, update stats	1672	// if this is a player's inventory, update stats
1684	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1685	update_stats ();	1673	update_stats ();
1686		1674
1687	INVOKE_OBJECT (INSERT, this);	1675	INVOKE_OBJECT (INSERT, this);
1688		1676
1689	return op;	1677	return op;
…		…
1773	{	1761	{
1774		1762
1775	float	1763	float
1776	diff = tmp->move_slow_penalty * fabs (op->speed);	1764	diff = tmp->move_slow_penalty * fabs (op->speed);
1777		1765
1778	if (op->type == PLAYER)	1766	if (op->is_player ())
1779	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)) \|\|
1780	(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)))
1781	diff /= 4.0;	1769	diff /= 4.0;
1782		1770
1783	op->speed_left -= diff;	1771	op->speed_left -= diff;
…		…
1818	LOG (llevError, "Present_arch called outside map.\n");	1806	LOG (llevError, "Present_arch called outside map.\n");
1819	return NULL;	1807	return NULL;
1820	}	1808	}
1821		1809
1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1810	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1823	if (tmp->arch == at)	1811	if (tmp->arch->archname == at->archname)
1824	return tmp;	1812	return tmp;
1825		1813
1826	return NULL;	1814	return NULL;
1827	}	1815	}
1828		1816
…		…
1892	* The first matching object is returned, or NULL if none.	1880	* The first matching object is returned, or NULL if none.
1893	*/	1881	*/
1894	object *	1882	object *
1895	present_arch_in_ob (const archetype at, const object op)	1883	present_arch_in_ob (const archetype at, const object op)
1896	{	1884	{
1897	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1898	if (tmp->arch == at)	1886	if (tmp->arch->archname == at->archname)
1899	return tmp;	1887	return tmp;
1900		1888
1901	return NULL;	1889	return NULL;
1902	}	1890	}
1903		1891
…		…
1991	* head of the object should correspond for the entire object.	1979	* head of the object should correspond for the entire object.
1992	*/	1980	*/
1993	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1994	continue;	1982	continue;
1995		1983
1996	if (ob->blocked (m, pos.x, pos.y))	1984	if (ob->blocked (pos.m, pos.x, pos.y))
1997	continue;	1985	continue;
1998		1986
1999	altern [index++] = i;	1987	altern [index++] = i;
2000	}	1988	}
2001		1989
…		…
2069	* there is capable of.	2057	* there is capable of.
2070	*/	2058	*/
2071	int	2059	int
2072	find_dir (maptile m, int x, int y, object exclude)	2060	find_dir (maptile m, int x, int y, object exclude)
2073	{	2061	{
2074	int i, max = SIZEOFFREE, mflags;	2062	int max = SIZEOFFREE, mflags;
2075
2076	sint16 nx, ny;
2077	object *tmp;
2078	maptile *mp;
2079
2080	MoveType blocked, move_type;	2063	MoveType move_type;
2081		2064
2082	if (exclude && exclude->head_ () != exclude)	2065	if (exclude && exclude->head_ () != exclude)
2083	{	2066	{
2084	exclude = exclude->head;	2067	exclude = exclude->head;
2085	move_type = exclude->move_type;	2068	move_type = exclude->move_type;
…		…
2088	{	2071	{
2089	/* 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. */
2090	move_type = MOVE_ALL;	2073	move_type = MOVE_ALL;
2091	}	2074	}
2092		2075
2093	for (i = 1; i < max; i++)	2076	for (int i = 1; i < max; i++)
2094	{	2077	{
2095	mp = m;	2078	mapxy pos (m, x, y);
2096	nx = x + freearr_x[i];	2079	pos.move (i);
2097	ny = y + freearr_y[i];
2098		2080
2099	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2081	if (!pos.normalise ())
2100
2101	if (mflags & P_OUT_OF_MAP)
2102	max = maxfree[i];	2082	max = maxfree[i];
2103	else	2083	else
2104	{	2084	{
2105	mapspace &ms = mp->at (nx, ny);	2085	mapspace &ms = *pos;
2106		2086
2107	blocked = ms.move_block;
2108
2109	if ((move_type & blocked) == move_type)	2087	if ((move_type & ms.move_block) == move_type)
2110	max = maxfree[i];	2088	max = maxfree [i];
2111	else if (mflags & P_IS_ALIVE)	2089	else if (ms.flags () & P_IS_ALIVE)
2112	{	2090	{
2113	for (tmp = ms.bot; tmp; tmp = tmp->above)	2091	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2114	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2092	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2115	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2093	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2116	break;
2117
2118	if (tmp)
2119	return freedir[i];	2094	return freedir [i];
2120	}	2095	}
2121	}	2096	}
2122	}	2097	}
2123		2098
2124	return 0;	2099	return 0;
…		…
2199	* 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
2200	* 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.
2201	* 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
2202	* functions.	2177	* functions.
2203	*/	2178	*/
2204	int reduction_dir[SIZEOFFREE][3] = {	2179	const int reduction_dir[SIZEOFFREE][3] = {
2205	{0, 0, 0}, /* 0 */	2180	{0, 0, 0}, /* 0 */
2206	{0, 0, 0}, /* 1 */	2181	{0, 0, 0}, /* 1 */
2207	{0, 0, 0}, /* 2 */	2182	{0, 0, 0}, /* 2 */
2208	{0, 0, 0}, /* 3 */	2183	{0, 0, 0}, /* 3 */
2209	{0, 0, 0}, /* 4 */	2184	{0, 0, 0}, /* 4 */
…		…
2305	int	2280	int
2306	can_pick (const object who, const object item)	2281	can_pick (const object who, const object item)
2307	{	2282	{
2308	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2283	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2309	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2310	!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));
2311	}	2286	}
2312		2287
2313	/*	2288	/*
2314	* create clone from object to another	2289	* create clone from object to another
2315	*/	2290	*/
…		…
2347	return tmp;	2322	return tmp;
2348		2323
2349	return 0;	2324	return 0;
2350	}	2325	}
2351		2326
2352	const shstr &	2327	shstr_tmp
2353	object::kv_get (const shstr &key) const	2328	object::kv_get (shstr_tmp key) const
2354	{	2329	{
2355	for (key_value *kv = key_values; kv; kv = kv->next)	2330	for (key_value *kv = key_values; kv; kv = kv->next)
2356	if (kv->key == key)	2331	if (kv->key == key)
2357	return kv->value;	2332	return kv->value;
2358		2333
2359	return shstr_null;	2334	return shstr ();
2360	}	2335	}
2361		2336
2362	void	2337	void
2363	object::kv_set (const shstr &key, const shstr &value)	2338	object::kv_set (shstr_tmp key, shstr_tmp value)
2364	{	2339	{
2365	for (key_value *kv = key_values; kv; kv = kv->next)	2340	for (key_value *kv = key_values; kv; kv = kv->next)
2366	if (kv->key == key)	2341	if (kv->key == key)
2367	{	2342	{
2368	kv->value = value;	2343	kv->value = value;
…		…
2377		2352
2378	key_values = kv;	2353	key_values = kv;
2379	}	2354	}
2380		2355
2381	void	2356	void
2382	object::kv_del (const shstr &key)	2357	object::kv_del (shstr_tmp key)
2383	{	2358	{
2384	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2359	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2385	if ((*kvp)->key == key)	2360	if ((*kvp)->key == key)
2386	{	2361	{
2387	key_value kv = kvp;	2362	key_value kv = kvp;
…		…
2446	{	2421	{
2447	char flagdesc[512];	2422	char flagdesc[512];
2448	char info2[256 * 4];	2423	char info2[256 * 4];
2449	char *p = info;	2424	char *p = info;
2450		2425
2451	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}",
2452	count,	2427	count,
2453	uuid.c_str (),	2428	uuid.c_str (),
2454	&name,	2429	&name,
2455	title ? "\",title:\"" : "",	2430	title ? ",title:\"" : "",
2456	title ? (const char *)title : "",	2431	title ? (const char *)title : "",
		2432	title ? "\"" : "",
2457	flag_desc (flagdesc, 512), type);	2433	flag_desc (flagdesc, 512), type);
2458		2434
2459	if (!flag[FLAG_REMOVED] && env)	2435	if (!flag[FLAG_REMOVED] && env)
2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2436	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2461		2437
…		…
2555	// else if (!old_container->env && contr && contr->ns)	2531	// else if (!old_container->env && contr && contr->ns)
2556	// contr->ns->floorbox_reset ();	2532	// contr->ns->floorbox_reset ();
2557	}	2533	}
2558		2534
2559	object *	2535	object *
2560	object::force_find (const shstr name)	2536	object::force_find (shstr_tmp name)
2561	{	2537	{
2562	/* 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
2563	* place	2539	* place
2564	*/	2540	*/
2565	for (object *tmp = inv; tmp; tmp = tmp->below)	2541	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2567	return splay (tmp);	2543	return splay (tmp);
2568		2544
2569	return 0;	2545	return 0;
2570	}	2546	}
2571		2547
2572	void	2548	object *
2573	object::force_add (const shstr name, int duration)	2549	object::force_add (shstr_tmp name, int duration)
2574	{	2550	{
2575	if (object *force = force_find (name))	2551	if (object *force = force_find (name))
2576	force->destroy ();	2552	force->destroy ();
2577		2553
2578	object *force = get_archetype (FORCE_NAME);	2554	object *force = get_archetype (FORCE_NAME);
…		…
2583		2559
2584	force->set_speed (duration ? 1.f / duration : 0.f);	2560	force->set_speed (duration ? 1.f / duration : 0.f);
2585	force->flag [FLAG_IS_USED_UP] = true;	2561	force->flag [FLAG_IS_USED_UP] = true;
2586	force->flag [FLAG_APPLIED] = true;	2562	force->flag [FLAG_APPLIED] = true;
2587		2563
2588	insert (force);	2564	return insert (force);
2589	}	2565	}
2590		2566
2591	void	2567	void
2592	object::play_sound (faceidx sound)	2568	object::play_sound (faceidx sound)
2593	{	2569	{
…		…
2604	}	2580	}
2605	else	2581	else
2606	map->play_sound (sound, x, y);	2582	map->play_sound (sound, x, y);
2607	}	2583	}
2608		2584
		2585	void
		2586	object::make_noise ()
		2587	{
		2588	// we do not model noise in the map, so instead put
		2589	// a temporary light into the noise source
		2590	// could use the map instead, but that's less reliable for our
		2591	// goal, which is to make invisibility a bit harder to exploit
		2592
		2593	// currently only works sensibly for players
		2594	if (!is_player ())
		2595	return;
		2596
		2597	// find old force, or create new one
		2598	object *force = force_find (shstr_noise_force);
		2599
		2600	if (force)
		2601	force->speed_left = -1.f; // patch old speed up
		2602	else
		2603	{
		2604	force = archetype::get (shstr_noise_force);
		2605
		2606	force->slaying = shstr_noise_force;
		2607	force->stats.food = 1;
		2608	force->speed_left = -1.f;
		2609
		2610	force->set_speed (1.f / 4.f);
		2611	force->flag [FLAG_IS_USED_UP] = true;
		2612	force->flag [FLAG_APPLIED] = true;
		2613
		2614	insert (force);
		2615	}
		2616	}
		2617

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.230 by root, Sun May 4 08:25:32 2008 UTC vs. Revision 1.278 by root, Thu Jan 1 19:42:43 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.230 by root, Sun May 4 08:25:32 2008 UTC vs.
Revision 1.278 by root, Thu Jan 1 19:42:43 2009 UTC