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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC vs.
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 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	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1103
1091	// leaving a spot always closes any open container on the ground	1104	// leaving a spot always closes any open container on the ground
1092	if (container && !container->env)	1105	if (container && !container->env)
1093	// this causes spurious floorbox updates, but it ensures	1106	// this causes spurious floorbox updates, but it ensures
1094	// that the CLOSE event is being sent.	1107	// that the CLOSE event is being sent.
1095	close_container ();	1108	close_container ();
…		…
1105		1118
1106	esrv_del_item (pl->contr, count);	1119	esrv_del_item (pl->contr, count);
1107	}	1120	}
1108		1121
1109	/* link the object above us */	1122	/* link the object above us */
1110	if (above)	1123	// re-link, make sure compiler can easily use cmove
1111	above->below = below;	1124	*(above ? &above->below : &ms.top) = below;
1112	else	1125	*(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		1126
1130	above = 0;	1127	above = 0;
1131	below = 0;	1128	below = 0;
		1129
		1130	ms.invalidate ();
1132		1131
1133	if (map->in_memory == MAP_SAVING)	1132	if (map->in_memory == MAP_SAVING)
1134	return;	1133	return;
1135		1134
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1135	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1169	}	1168	}
1170		1169
1171	last = tmp;	1170	last = tmp;
1172	}	1171	}
1173		1172
1174	/* last == NULL if there are no objects on this space */	1173	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);	1174	update_all_los (map, x, y);
1183	}	1175	}
1184	}	1176	}
1185		1177
1186	/*	1178	/*
…		…
1210	esrv_update_item (UPD_NROF, pl, top);	1202	esrv_update_item (UPD_NROF, pl, top);
1211		1203
1212	op->weight = 0; // cancel the addition above	1204	op->weight = 0; // cancel the addition above
1213	op->carrying = 0; // must be 0 already	1205	op->carrying = 0; // must be 0 already
1214		1206
1215	op->destroy (1);	1207	op->destroy ();
1216		1208
1217	return top;	1209	return top;
1218	}	1210	}
1219		1211
1220	return 0;	1212	return 0;
…		…
1248	* job preparing multi-part monsters.	1240	* job preparing multi-part monsters.
1249	*/	1241	*/
1250	object *	1242	object *
1251	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1243	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1252	{	1244	{
		1245	op->remove ();
		1246
1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1247	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254	{	1248	{
1255	tmp->x = x + tmp->arch->x;	1249	tmp->x = x + tmp->arch->x;
1256	tmp->y = y + tmp->arch->y;	1250	tmp->y = y + tmp->arch->y;
1257	}	1251	}
…		…
1280	* just 'op' otherwise	1274	* just 'op' otherwise
1281	*/	1275	*/
1282	object *	1276	object *
1283	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1277	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1284	{	1278	{
1285	assert (!op->flag [FLAG_FREED]);
1286
1287	op->remove ();	1279	op->remove ();
		1280
		1281	if (m == &freed_map)//D TODO: remove soon
		1282	{//D
		1283	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1284	}//D
1288		1285
1289	/* Ideally, the caller figures this out. However, it complicates a lot	1286	/* 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	1287	* of areas of callers (eg, anything that uses find_free_spot would now
1291	* need extra work	1288	* need extra work
1292	*/	1289	*/
1293	if (!xy_normalise (m, op->x, op->y))	1290	if (!xy_normalise (m, op->x, op->y))
1294	{	1291	{
1295	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1292	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1296	return 0;	1293	return 0;
1297	}	1294	}
1298		1295
1299	if (object *more = op->more)	1296	if (object *more = op->more)
1300	if (!insert_ob_in_map (more, m, originator, flag))	1297	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1309	*/	1306	*/
1310	if (op->nrof && !(flag & INS_NO_MERGE))	1307	if (op->nrof && !(flag & INS_NO_MERGE))
1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1308	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312	if (object::can_merge (op, tmp))	1309	if (object::can_merge (op, tmp))
1313	{	1310	{
1314	// TODO: we atcually want to update tmp, not op,	1311	// TODO: we actually want to update tmp, not op,
1315	// but some caller surely breaks when we return tmp	1312	// but some caller surely breaks when we return tmp
1316	// from here :/	1313	// from here :/
1317	op->nrof += tmp->nrof;	1314	op->nrof += tmp->nrof;
1318	tmp->destroy (1);	1315	tmp->destroy ();
1319	}	1316	}
1320		1317
1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1318	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1319	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1323		1320
…		…
1330	{	1327	{
1331	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1328	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1332	abort ();	1329	abort ();
1333	}	1330	}
1334		1331
		1332	if (!originator->is_on_map ())
		1333	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1334	op->debug_desc (), originator->debug_desc ());
		1335
1335	op->above = originator;	1336	op->above = originator;
1336	op->below = originator->below;	1337	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;	1338	originator->below = op;
		1339
		1340	*(op->below ? &op->below->above : &ms.bot) = op;
1345	}	1341	}
1346	else	1342	else
1347	{	1343	{
1348	object top, floor = NULL;	1344	object *floor = 0;
1349		1345	object *top = ms.top;
1350	top = ms.bot;
1351		1346
1352	/* If there are other objects, then */	1347	/* If there are other objects, then */
1353	if (top)	1348	if (top)
1354	{	1349	{
1355	object *last = 0;
1356
1357	/*	1350	/*
1358	* If there are multiple objects on this space, we do some trickier handling.	1351	* If there are multiple objects on this space, we do some trickier handling.
1359	* We've already dealt with merging if appropriate.	1352	* We've already dealt with merging if appropriate.
1360	* Generally, we want to put the new object on top. But if	1353	* Generally, we want to put the new object on top. But if
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1354	* 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	1357	* 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	1358	* 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	1359	* when lots of spells are cast in one area. Currently, it is presumed
1367	* that flying non pickable objects are spell objects.	1360	* that flying non pickable objects are spell objects.
1368	*/	1361	*/
1369	for (top = ms.bot; top; top = top->above)	1362	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1363	{
1371	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1364	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1372	floor = top;	1365	floor = tmp;
1373		1366
1374	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1367	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1375	{	1368	{
1376	/* We insert above top, so we want this object below this */	1369	/* We insert above top, so we want this object below this */
1377	top = top->below;	1370	top = tmp->below;
1378	break;	1371	break;
1379	}	1372	}
1380		1373
1381	last = top;	1374	top = tmp;
1382	}	1375	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1376
1387	/* We let update_position deal with figuring out what the space	1377	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1378	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1379	* makes things faster, and effectively the same result.
1390	*/	1380	*/
…		…
1397	*/	1387	*/
1398	if (!(flag & INS_ON_TOP)	1388	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1389	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1390	&& (op->face && !faces [op->face].visibility))
1401	{	1391	{
		1392	object *last;
		1393
1402	for (last = top; last != floor; last = last->below)	1394	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1395	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404	break;	1396	break;
1405		1397
1406	/* Check to see if we found the object that blocks view,	1398	/* Check to see if we found the object that blocks view,
…		…
1414	} /* If objects on this space */	1406	} /* If objects on this space */
1415		1407
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1408	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1409	top = floor;
1418		1410
1419	/* Top is the object that our object (op) is going to get inserted above.	1411	// insert object above top, or bottom-most if top = 0
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1412	if (!top)
1424	{	1413	{
		1414	op->below = 0;
1425	op->above = ms.bot;	1415	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1416	ms.bot = op;
		1417
		1418	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1419	}
1433	else	1420	else
1434	{ /* get inserted into the stack above top */	1421	{
1435	op->above = top->above;	1422	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1423	top->above = op;
1439		1424
1440	op->below = top;	1425	op->below = top;
1441	top->above = op;	1426	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1427	}
		1428	}
1443		1429
1444	if (!op->above)	1430	if (op->is_player ())
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447
1448	if (op->type == PLAYER)
1449	{	1431	{
1450	op->contr->do_los = 1;	1432	op->contr->do_los = 1;
1451	++op->map->players;	1433	++op->map->players;
1452	op->map->touch ();	1434	op->map->touch ();
1453	}	1435	}
…		…
1468	* be far away from this change and not affected in any way -	1450	* be far away from this change and not affected in any way -
1469	* this should get redone to only look for players within range,	1451	* this should get redone to only look for players within range,
1470	* or just updating the P_UPTODATE for spaces within this area	1452	* or just updating the P_UPTODATE for spaces within this area
1471	* of effect may be sufficient.	1453	* of effect may be sufficient.
1472	*/	1454	*/
1473	if (op->map->darkness && (op->glow_radius != 0))	1455	if (op->affects_los ())
		1456	{
		1457	op->ms ().invalidate ();
1474	update_all_los (op->map, op->x, op->y);	1458	update_all_los (op->map, op->x, op->y);
		1459	}
1475		1460
1476	/* updates flags (blocked, alive, no magic, etc) for this map space */	1461	/* updates flags (blocked, alive, no magic, etc) for this map space */
1477	update_object (op, UP_OBJ_INSERT);	1462	update_object (op, UP_OBJ_INSERT);
1478		1463
1479	INVOKE_OBJECT (INSERT, op);	1464	INVOKE_OBJECT (INSERT, op);
…		…
1513	{	1498	{
1514	/* first search for itself and remove any old instances */	1499	/* first search for itself and remove any old instances */
1515		1500
1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1501	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1502	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1518	tmp->destroy (1);	1503	tmp->destroy ();
1519		1504
1520	object *tmp = arch_to_object (archetype::find (arch_string));	1505	object *tmp = arch_to_object (archetype::find (arch_string));
1521		1506
1522	tmp->x = op->x;	1507	tmp->x = op->x;
1523	tmp->y = op->y;	1508	tmp->y = op->y;
…		…
1547	if (!nr)	1532	if (!nr)
1548	return true;	1533	return true;
1549		1534
1550	nr = min (nr, nrof);	1535	nr = min (nr, nrof);
1551		1536
		1537	if (nrof > nr)
		1538	{
1552	nrof -= nr;	1539	nrof -= nr;
1553
1554	if (nrof)
1555	{
1556	adjust_weight (env, -weight * nr); // carrying == 0	1540	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557		1541
1558	if (object *pl = visible_to ())	1542	if (object *pl = visible_to ())
1559	esrv_update_item (UPD_NROF, pl, this);	1543	esrv_update_item (UPD_NROF, pl, this);
1560		1544
1561	return true;	1545	return true;
1562	}	1546	}
1563	else	1547	else
1564	{	1548	{
1565	destroy (1);	1549	destroy ();
1566	return false;	1550	return false;
1567	}	1551	}
1568	}	1552	}
1569		1553
1570	/*	1554	/*
…		…
1647	if (object *pl = tmp->visible_to ())	1631	if (object *pl = tmp->visible_to ())
1648	esrv_update_item (UPD_NROF, pl, tmp);	1632	esrv_update_item (UPD_NROF, pl, tmp);
1649		1633
1650	adjust_weight (this, op->total_weight ());	1634	adjust_weight (this, op->total_weight ());
1651		1635
1652	op->destroy (1);	1636	op->destroy ();
1653	op = tmp;	1637	op = tmp;
1654	goto inserted;	1638	goto inserted;
1655	}	1639	}
1656		1640
1657	op->owner = 0; // it's his/hers now. period.	1641	op->owner = 0; // it's his/hers now. period.
…		…
1675		1659
1676	adjust_weight (this, op->total_weight ());	1660	adjust_weight (this, op->total_weight ());
1677		1661
1678	inserted:	1662	inserted:
1679	/* reset the light list and los of the players on the map */	1663	/* reset the light list and los of the players on the map */
1680	if (op->glow_radius && map && map->darkness)	1664	if (op->glow_radius && is_on_map ())
		1665	{
		1666	update_stats ();
1681	update_all_los (map, x, y);	1667	update_all_los (map, x, y);
1682		1668	}
		1669	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1683	// if this is a player's inventory, update stats	1670	// if this is a player's inventory, update stats
1684	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1685	update_stats ();	1671	update_stats ();
1686		1672
1687	INVOKE_OBJECT (INSERT, this);	1673	INVOKE_OBJECT (INSERT, this);
1688		1674
1689	return op;	1675	return op;
…		…
1773	{	1759	{
1774		1760
1775	float	1761	float
1776	diff = tmp->move_slow_penalty * fabs (op->speed);	1762	diff = tmp->move_slow_penalty * fabs (op->speed);
1777		1763
1778	if (op->type == PLAYER)	1764	if (op->is_player ())
1779	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1765	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)))	1766	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1781	diff /= 4.0;	1767	diff /= 4.0;
1782		1768
1783	op->speed_left -= diff;	1769	op->speed_left -= diff;
…		…
1991	* head of the object should correspond for the entire object.	1977	* head of the object should correspond for the entire object.
1992	*/	1978	*/
1993	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1979	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1994	continue;	1980	continue;
1995		1981
1996	if (ob->blocked (m, pos.x, pos.y))	1982	if (ob->blocked (pos.m, pos.x, pos.y))
1997	continue;	1983	continue;
1998		1984
1999	altern [index++] = i;	1985	altern [index++] = i;
2000	}	1986	}
2001		1987
…		…
2109	if ((move_type & blocked) == move_type)	2095	if ((move_type & blocked) == move_type)
2110	max = maxfree[i];	2096	max = maxfree[i];
2111	else if (mflags & P_IS_ALIVE)	2097	else if (mflags & P_IS_ALIVE)
2112	{	2098	{
2113	for (tmp = ms.bot; tmp; tmp = tmp->above)	2099	for (tmp = ms.bot; tmp; tmp = tmp->above)
2114	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2100	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2115	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2101	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2116	break;	2102	break;
2117		2103
2118	if (tmp)	2104	if (tmp)
2119	return freedir[i];	2105	return freedir[i];
…		…
2305	int	2291	int
2306	can_pick (const object who, const object item)	2292	can_pick (const object who, const object item)
2307	{	2293	{
2308	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2294	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2309	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2295	(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));	2296	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2311	}	2297	}
2312		2298
2313	/*	2299	/*
2314	* create clone from object to another	2300	* create clone from object to another
2315	*/	2301	*/
…		…
2446	{	2432	{
2447	char flagdesc[512];	2433	char flagdesc[512];
2448	char info2[256 * 4];	2434	char info2[256 * 4];
2449	char *p = info;	2435	char *p = info;
2450		2436
2451	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2437	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2452	count,	2438	count,
2453	uuid.c_str (),	2439	uuid.c_str (),
2454	&name,	2440	&name,
2455	title ? "\",title:\"" : "",	2441	title ? ",title:\"" : "",
2456	title ? (const char *)title : "",	2442	title ? (const char *)title : "",
		2443	title ? "\"" : "",
2457	flag_desc (flagdesc, 512), type);	2444	flag_desc (flagdesc, 512), type);
2458		2445
2459	if (!flag[FLAG_REMOVED] && env)	2446	if (!flag[FLAG_REMOVED] && env)
2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2447	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2461		2448
…		…
2567	return splay (tmp);	2554	return splay (tmp);
2568		2555
2569	return 0;	2556	return 0;
2570	}	2557	}
2571		2558
2572	void	2559	object *
2573	object::force_add (const shstr name, int duration)	2560	object::force_add (const shstr name, int duration)
2574	{	2561	{
2575	if (object *force = force_find (name))	2562	if (object *force = force_find (name))
2576	force->destroy ();	2563	force->destroy ();
2577		2564
…		…
2583		2570
2584	force->set_speed (duration ? 1.f / duration : 0.f);	2571	force->set_speed (duration ? 1.f / duration : 0.f);
2585	force->flag [FLAG_IS_USED_UP] = true;	2572	force->flag [FLAG_IS_USED_UP] = true;
2586	force->flag [FLAG_APPLIED] = true;	2573	force->flag [FLAG_APPLIED] = true;
2587		2574
2588	insert (force);	2575	return insert (force);
2589	}	2576	}
2590		2577
2591	void	2578	void
2592	object::play_sound (faceidx sound)	2579	object::play_sound (faceidx sound)
2593	{	2580	{
…		…
2604	}	2591	}
2605	else	2592	else
2606	map->play_sound (sound, x, y);	2593	map->play_sound (sound, x, y);
2607	}	2594	}
2608		2595
		2596	void
		2597	object::make_noise ()
		2598	{
		2599	// we do not model noise in the map, so instead put
		2600	// a temporary light into the noise source
		2601	// could use the map instead, but that's less reliable for our
		2602	// goal, which is to make invisibility a bit harder to exploit
		2603
		2604	// currently only works sensibly for players
		2605	if (!is_player ())
		2606	return;
		2607
		2608	// find old force, or create new one
		2609	object *force = force_find (shstr_noise_force);
		2610
		2611	if (force)
		2612	force->speed_left = -1.f; // patch old speed up
		2613	else
		2614	{
		2615	force = archetype::get (shstr_noise_force);
		2616
		2617	force->slaying = shstr_noise_force;
		2618	force->stats.food = 1;
		2619	force->speed_left = -1.f;
		2620
		2621	force->set_speed (1.f / 4.f);
		2622	force->flag [FLAG_IS_USED_UP] = true;
		2623	force->flag [FLAG_APPLIED] = true;
		2624
		2625	insert (force);
		2626	}
		2627	}
		2628

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC vs. Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC vs.
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC