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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC vs.
Revision 1.252 by root, Mon Aug 11 23:23:41 2008 UTC

…		…
139		139
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	141	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
143	{	143	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
147	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
149	*/	147	*/
150		148
151	/* For each field in wants, */	149	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	151	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	152	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		153
169	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	155	return true;
171	}	156	}
172		157
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	159	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	160	compare_ob_value_lists (const object ob1, const object ob2)
176	{	161	{
177	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison twice. :(	163	* so we need to run the comparison twice. :(
179	*/	164	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
181	}	167	}
182		168
183	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	170	* they can be merged together.
185	*	171	*
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		207
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		210
225	if (ob1->arch->name != ob2->arch->name	211	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	212	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	213	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	214	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	215	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	216	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	217	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	218	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	219	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	220	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	221	\|\| ob1->animation_id != ob2->animation_id
		222	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	223	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	224	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	225	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	226	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	227	\|\| ob1->move_type != ob2->move_type
…		…
358	else	345	else
359	{	346	{
360	// maybe there is a player standing on the same mapspace	347	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	348	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363	if (!pl->container \|\| this == pl->container)	351	\|\| this == pl->container)
364	return pl;	352	return pl;
365	}	353	}
366	}	354	}
367		355
368	return 0;	356	return 0;
369	}	357	}
370		358
371	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
372	static sint32	360	static sint32
373	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
374	{	362	{
375	return op->type == CONTAINER	363	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	365	: weight;
378	}	366	}
…		…
384	static void	372	static void
385	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
386	{	374	{
387	while (op)	375	while (op)
388	{	376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
390		381
391	if (!weight)	382	if (!weight)
392	return;	383	return;
393		384
394	op->carrying += weight;	385	op->carrying += weight;
…		…
417	op->update_weight ();	408	op->update_weight ();
418		409
419	sum += op->total_weight ();	410	sum += op->total_weight ();
420	}	411	}
421		412
422	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
423		414
424	if (sum != carrying)	415	if (sum != carrying)
425	{	416	{
426	carrying = sum;	417	carrying = sum;
427		418
…		…
489	*/	480	*/
490	object *	481	object *
491	find_object_name (const char *str)	482	find_object_name (const char *str)
492	{	483	{
493	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
494	object *op;
495		485
		486	if (str_)
496	for_all_objects (op)	487	for_all_objects (op)
497	if (op->name == str_)	488	if (op->name == str_)
498	break;	489	return op;
499		490
500	return op;	491	return 0;
501	}	492	}
502		493
503	/*	494	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	496	* skill and experience objects.
…		…
603	}	594	}
604		595
605	op->key_values = 0;	596	op->key_values = 0;
606	}	597	}
607		598
608	object &	599	/*
609	object::operator =(const object &src)	600	* copy_to first frees everything allocated by the dst object,
		601	* and then copies the contents of itself into the second
		602	* object, allocating what needs to be allocated. Basically, any
		603	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		604	* if the first object is freed, the pointers in the new object
		605	* will point at garbage.
		606	*/
		607	void
		608	object::copy_to (object *dst)
610	{	609	{
611	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	(object_copy )this = src;	611	(object_copy )dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
618		613
619	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
620	if (src.key_values)	615	if (key_values)
621	{	616	{
622	key_value *tail = 0;	617	key_value *tail = 0;
623	key_values = 0;	618	dst->key_values = 0;
624		619
625	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
626	{	621	{
627	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
628		623
629	new_link->next = 0;	624	new_link->next = 0;
630	new_link->key = i->key;	625	new_link->key = i->key;
631	new_link->value = i->value;	626	new_link->value = i->value;
632		627
633	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
634	if (!key_values)	629	if (!dst->key_values)
635	{	630	{
636	key_values = new_link;	631	dst->key_values = new_link;
637	tail = new_link;	632	tail = new_link;
638	}	633	}
639	else	634	else
640	{	635	{
641	tail->next = new_link;	636	tail->next = new_link;
642	tail = new_link;	637	tail = new_link;
643	}	638	}
644	}	639	}
645	}	640	}
646	}
647
648	/*
649	* copy_to first frees everything allocated by the dst object,
650	* and then copies the contents of itself into the second
651	* object, allocating what needs to be allocated. Basically, any
652	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
653	* if the first object is freed, the pointers in the new object
654	* will point at garbage.
655	*/
656	void
657	object::copy_to (object *dst)
658	{
659	dst = this;
660		641
661	if (speed < 0)	642	if (speed < 0)
662	dst->speed_left -= rndm ();	643	dst->speed_left -= rndm ();
663		644
664	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
…		…
686	object *	667	object *
687	object::clone ()	668	object::clone ()
688	{	669	{
689	object *neu = create ();	670	object *neu = create ();
690	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
691	return neu;	673	return neu;
692	}	674	}
693		675
694	/*	676	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
746	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
747	*/	729	*/
748	void	730	void
749	update_object (object *op, int action)	731	update_object (object *op, int action)
750	{	732	{
751	if (op == NULL)	733	if (!op)
752	{	734	{
753	/* this should never happen */	735	/* this should never happen */
754	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
755	return;	737	return;
756	}	738	}
757		739
758	if (op->env)	740	if (!op->is_on_map ())
759	{	741	{
760	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
761	* to do in this case.	743	* to do in this case.
762	*/	744	*/
763	return;	745	return;
764	}	746	}
765
766	/* If the map is saving, don't do anything as everything is
767	* going to get freed anyways.
768	*/
769	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
770	return;
771		747
772	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
773	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	749	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
774	{	750	{
775	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
786	else if (action == UP_OBJ_INSERT)	762	else if (action == UP_OBJ_INSERT)
787	{	763	{
788	// this is likely overkill, TODO: revisit (schmorp)	764	// this is likely overkill, TODO: revisit (schmorp)
789	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
790	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	766	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
791	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
792	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
793	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
794	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
795	\|\| (m.move_on \| op->move_on ) != m.move_on	770	\|\| (m.move_on \| op->move_on ) != m.move_on
796	\|\| (m.move_off \| op->move_off ) != m.move_off	771	\|\| (m.move_off \| op->move_off ) != m.move_off
797	\|\| (m.move_slow \| op->move_slow) != m.move_slow	772	\|\| (m.move_slow \| op->move_slow) != m.move_slow
798	/* This isn't perfect, but I don't expect a lot of objects to	773	/* This isn't perfect, but I don't expect a lot of objects to
799	* to have move_allow right now.	774	* have move_allow right now.
800	*/	775	*/
801	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	776	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
802	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	777	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
803	m.flags_ = 0;	778	m.flags_ = 0;
804	}	779	}
…		…
930	* drop on that space.	905	* drop on that space.
931	*/	906	*/
932	if (!drop_to_ground	907	if (!drop_to_ground
933	\|\| !map	908	\|\| !map
934	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
935	\|\| map->nodrop	910	\|\| map->no_drop
936	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
937	{	912	{
938	while (inv)	913	while (inv)
939	{
940	inv->destroy_inv (false);
941	inv->destroy ();	914	inv->destroy (true);
942	}
943	}	915	}
944	else	916	else
945	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
946	while (inv)	918	while (inv)
947	{	919	{
…		…
965	object *op = new object;	937	object *op = new object;
966	op->link ();	938	op->link ();
967	return op;	939	return op;
968	}	940	}
969		941
		942	static struct freed_map : maptile
		943	{
		944	freed_map ()
		945	{
		946	path = "<freed objects map>";
		947	name = "/internal/freed_objects_map";
		948	width = 3;
		949	height = 3;
		950	no_drop = 1;
		951	no_reset = 1;
		952
		953	alloc ();
		954	in_memory = MAP_ACTIVE;
		955	}
		956
		957	~freed_map ()
		958	{
		959	destroy ();
		960	}
		961	} freed_map; // freed objects are moved here to avoid crashes
		962
970	void	963	void
971	object::do_destroy ()	964	object::do_destroy ()
972	{	965	{
973	if (flag [FLAG_IS_LINKED])	966	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	967	remove_button_link (this);
…		…
984	unlink ();	977	unlink ();
985		978
986	flag [FLAG_FREED] = 1;	979	flag [FLAG_FREED] = 1;
987		980
988	// hack to ensure that freed objects still have a valid map	981	// hack to ensure that freed objects still have a valid map
989	{
990	static maptile *freed_map; // freed objects are moved here to avoid crashes
991
992	if (!freed_map)
993	{
994	freed_map = new maptile;
995
996	freed_map->path = "<freed objects map>";
997	freed_map->name = "/internal/freed_objects_map";
998	freed_map->width = 3;
999	freed_map->height = 3;
1000	freed_map->nodrop = 1;
1001
1002	freed_map->alloc ();
1003	freed_map->in_memory = MAP_ACTIVE;
1004	}
1005
1006	map = freed_map;	982	map = &freed_map;
1007	x = 1;	983	x = 1;
1008	y = 1;	984	y = 1;
1009	}
1010		985
1011	if (more)	986	if (more)
1012	{	987	{
1013	more->destroy ();	988	more->destroy ();
1014	more = 0;	989	more = 0;
…		…
1031		1006
1032	if (!is_head () && !head->destroyed ())	1007	if (!is_head () && !head->destroyed ())
1033	{	1008	{
1034	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1035	head->destroy (destroy_inventory);	1010	head->destroy (destroy_inventory);
		1011	return;
1036	}	1012	}
1037		1013
1038	destroy_inv (!destroy_inventory);	1014	destroy_inv (!destroy_inventory);
1039		1015
1040	if (is_head ())	1016	if (is_head ())
…		…
1079	if (object *pl = visible_to ())	1055	if (object *pl = visible_to ())
1080	esrv_del_item (pl->contr, count);	1056	esrv_del_item (pl->contr, count);
1081	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1082		1058
1083	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
1084
1085	*(above ? &above->below : &env->inv) = below;
1086
1087	if (below)
1088	below->above = above;
1089		1060
1090	/* we set up values so that it could be inserted into	1061	/* we set up values so that it could be inserted into
1091	* the map, but we don't actually do that - it is up	1062	* the map, but we don't actually do that - it is up
1092	* to the caller to decide what we want to do.	1063	* to the caller to decide what we want to do.
1093	*/	1064	*/
1094	map = env->map;	1065	map = env->map;
1095	x = env->x;	1066	x = env->x;
1096	y = env->y;	1067	y = env->y;
		1068
		1069	// make sure cmov optimisation is applicable
		1070	*(above ? &above->below : &env->inv) = below;
		1071	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1072
1097	above = 0;	1073	above = 0;
1098	below = 0;	1074	below = 0;
1099	env = 0;	1075	env = 0;
1100		1076
1101	/* NO_FIX_PLAYER is set when a great many changes are being	1077	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1131		1107
1132	esrv_del_item (pl->contr, count);	1108	esrv_del_item (pl->contr, count);
1133	}	1109	}
1134		1110
1135	/* link the object above us */	1111	/* link the object above us */
1136	if (above)	1112	// re-link, make sure compiler can easily use cmove
1137	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1138	else	1114	*(below ? &below->above : &ms.bot) = above;
1139	ms.top = below; /* we were top, set new top */
1140
1141	/* Relink the object below us, if there is one */
1142	if (below)
1143	below->above = above;
1144	else
1145	{
1146	/* Nothing below, which means we need to relink map object for this space
1147	* use translated coordinates in case some oddness with map tiling is
1148	* evident
1149	*/
1150	if (GET_MAP_OB (map, x, y) != this)
1151	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 ());
1152
1153	ms.bot = above; /* goes on above it. */
1154	}
1155		1115
1156	above = 0;	1116	above = 0;
1157	below = 0;	1117	below = 0;
1158		1118
1159	if (map->in_memory == MAP_SAVING)	1119	if (map->in_memory == MAP_SAVING)
…		…
1169	* appropriately.	1129	* appropriately.
1170	*/	1130	*/
1171	pl->close_container ();	1131	pl->close_container ();
1172		1132
1173	//TODO: the floorbox prev/next might need updating	1133	//TODO: the floorbox prev/next might need updating
1174	esrv_del_item (pl->contr, count);	1134	//esrv_del_item (pl->contr, count);
		1135	//TODO: update floorbox to preserve ordering
		1136	if (pl->contr->ns)
		1137	pl->contr->ns->floorbox_update ();
1175	}	1138	}
1176		1139
1177	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (tmp = ms.bot; tmp; tmp = tmp->above)
1178	{	1141	{
1179	/* No point updating the players look faces if he is the object	1142	/* No point updating the players look faces if he is the object
…		…
1271	* job preparing multi-part monsters.	1234	* job preparing multi-part monsters.
1272	*/	1235	*/
1273	object *	1236	object *
1274	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1237	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1275	{	1238	{
		1239	op->remove ();
		1240
1276	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1241	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1277	{	1242	{
1278	tmp->x = x + tmp->arch->x;	1243	tmp->x = x + tmp->arch->x;
1279	tmp->y = y + tmp->arch->y;	1244	tmp->y = y + tmp->arch->y;
1280	}	1245	}
…		…
1303	* just 'op' otherwise	1268	* just 'op' otherwise
1304	*/	1269	*/
1305	object *	1270	object *
1306	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1271	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1307	{	1272	{
1308	assert (!op->flag [FLAG_FREED]);	1273	if (op->is_on_map ())
		1274	{
		1275	LOG (llevError, "insert_ob_in_map called for object already on map");
		1276	abort ();
		1277	}
1309		1278
		1279	if (op->env)
		1280	{
		1281	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1310	op->remove ();	1282	op->remove ();
		1283	}
		1284
		1285	if (op->face && !face_info (op->face))//D TODO: remove soon
		1286	{//D
		1287	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1288	op->face = 1;//D
		1289	}//D
1311		1290
1312	/* Ideally, the caller figures this out. However, it complicates a lot	1291	/* Ideally, the caller figures this out. However, it complicates a lot
1313	* of areas of callers (eg, anything that uses find_free_spot would now	1292	* of areas of callers (eg, anything that uses find_free_spot would now
1314	* need extra work	1293	* need extra work
1315	*/	1294	*/
1316	if (!xy_normalise (m, op->x, op->y))	1295	if (!xy_normalise (m, op->x, op->y))
1317	{	1296	{
1318	op->destroy (1);	1297	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1319	return 0;	1298	return 0;
1320	}	1299	}
1321		1300
1322	if (object *more = op->more)	1301	if (object *more = op->more)
1323	if (!insert_ob_in_map (more, m, originator, flag))	1302	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1332	*/	1311	*/
1333	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
1334	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1313	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1335	if (object::can_merge (op, tmp))	1314	if (object::can_merge (op, tmp))
1336	{	1315	{
1337	// TODO: we atcually want to update tmp, not op,	1316	// TODO: we actually want to update tmp, not op,
1338	// but some caller surely breaks when we return tmp	1317	// but some caller surely breaks when we return tmp
1339	// from here :/	1318	// from here :/
1340	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1341	tmp->destroy (1);	1320	tmp->destroy (1);
1342	}	1321	}
…		…
1353	{	1332	{
1354	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1333	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1355	abort ();	1334	abort ();
1356	}	1335	}
1357		1336
		1337	if (!originator->is_on_map ())
		1338	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1339	op->debug_desc (), originator->debug_desc ());
		1340
1358	op->above = originator;	1341	op->above = originator;
1359	op->below = originator->below;	1342	op->below = originator->below;
1360
1361	if (op->below)
1362	op->below->above = op;
1363	else
1364	ms.bot = op;
1365
1366	/* since below originator, no need to update top */
1367	originator->below = op;	1343	originator->below = op;
		1344
		1345	*(op->below ? &op->below->above : &ms.bot) = op;
1368	}	1346	}
1369	else	1347	else
1370	{	1348	{
1371	object top, floor = NULL;	1349	object *floor = 0;
1372		1350	object *top = ms.top;
1373	top = ms.bot;
1374		1351
1375	/* If there are other objects, then */	1352	/* If there are other objects, then */
1376	if (top)	1353	if (top)
1377	{	1354	{
1378	object *last = 0;
1379
1380	/*	1355	/*
1381	* If there are multiple objects on this space, we do some trickier handling.	1356	* If there are multiple objects on this space, we do some trickier handling.
1382	* We've already dealt with merging if appropriate.	1357	* We've already dealt with merging if appropriate.
1383	* Generally, we want to put the new object on top. But if	1358	* Generally, we want to put the new object on top. But if
1384	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1359	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1387	* once we get to them. This reduces the need to traverse over all of	1362	* once we get to them. This reduces the need to traverse over all of
1388	* them when adding another one - this saves quite a bit of cpu time	1363	* them when adding another one - this saves quite a bit of cpu time
1389	* when lots of spells are cast in one area. Currently, it is presumed	1364	* when lots of spells are cast in one area. Currently, it is presumed
1390	* that flying non pickable objects are spell objects.	1365	* that flying non pickable objects are spell objects.
1391	*/	1366	*/
1392	for (top = ms.bot; top; top = top->above)	1367	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1393	{	1368	{
1394	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1369	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1395	floor = top;	1370	floor = tmp;
1396		1371
1397	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1372	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1398	{	1373	{
1399	/* We insert above top, so we want this object below this */	1374	/* We insert above top, so we want this object below this */
1400	top = top->below;	1375	top = tmp->below;
1401	break;	1376	break;
1402	}	1377	}
1403		1378
1404	last = top;	1379	top = tmp;
1405	}	1380	}
1406
1407	/* Don't want top to be NULL, so set it to the last valid object */
1408	top = last;
1409		1381
1410	/* We let update_position deal with figuring out what the space	1382	/* We let update_position deal with figuring out what the space
1411	* looks like instead of lots of conditions here.	1383	* looks like instead of lots of conditions here.
1412	* makes things faster, and effectively the same result.	1384	* makes things faster, and effectively the same result.
1413	*/	1385	*/
…		…
1420	*/	1392	*/
1421	if (!(flag & INS_ON_TOP)	1393	if (!(flag & INS_ON_TOP)
1422	&& ms.flags () & P_BLOCKSVIEW	1394	&& ms.flags () & P_BLOCKSVIEW
1423	&& (op->face && !faces [op->face].visibility))	1395	&& (op->face && !faces [op->face].visibility))
1424	{	1396	{
		1397	object *last;
		1398
1425	for (last = top; last != floor; last = last->below)	1399	for (last = top; last != floor; last = last->below)
1426	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1400	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1427	break;	1401	break;
1428		1402
1429	/* Check to see if we found the object that blocks view,	1403	/* Check to see if we found the object that blocks view,
…		…
1437	} /* If objects on this space */	1411	} /* If objects on this space */
1438		1412
1439	if (flag & INS_ABOVE_FLOOR_ONLY)	1413	if (flag & INS_ABOVE_FLOOR_ONLY)
1440	top = floor;	1414	top = floor;
1441		1415
1442	/* Top is the object that our object (op) is going to get inserted above.	1416	// insert object above top, or bottom-most if top = 0
1443	*/
1444
1445	/* First object on this space */
1446	if (!top)	1417	if (!top)
1447	{	1418	{
		1419	op->below = 0;
1448	op->above = ms.bot;	1420	op->above = ms.bot;
1449
1450	if (op->above)
1451	op->above->below = op;
1452
1453	op->below = 0;
1454	ms.bot = op;	1421	ms.bot = op;
		1422
		1423	*(op->above ? &op->above->below : &ms.top) = op;
1455	}	1424	}
1456	else	1425	else
1457	{ /* get inserted into the stack above top */	1426	{
1458	op->above = top->above;	1427	op->above = top->above;
1459
1460	if (op->above)
1461	op->above->below = op;	1428	top->above = op;
1462		1429
1463	op->below = top;	1430	op->below = top;
1464	top->above = op;	1431	*(op->above ? &op->above->below : &ms.top) = op;
1465	}	1432	}
1466		1433	}
1467	if (!op->above)
1468	ms.top = op;
1469	} /* else not INS_BELOW_ORIGINATOR */
1470		1434
1471	if (op->type == PLAYER)	1435	if (op->type == PLAYER)
1472	{	1436	{
1473	op->contr->do_los = 1;	1437	op->contr->do_los = 1;
1474	++op->map->players;	1438	++op->map->players;
…		…
1477		1441
1478	op->map->dirty = true;	1442	op->map->dirty = true;
1479		1443
1480	if (object *pl = ms.player ())	1444	if (object *pl = ms.player ())
1481	//TODO: the floorbox prev/next might need updating	1445	//TODO: the floorbox prev/next might need updating
1482	esrv_send_item (pl, op);	1446	//esrv_send_item (pl, op);
		1447	//TODO: update floorbox to preserve ordering
		1448	if (pl->contr->ns)
		1449	pl->contr->ns->floorbox_update ();
1483		1450
1484	/* If this object glows, it may affect lighting conditions that are	1451	/* If this object glows, it may affect lighting conditions that are
1485	* visible to others on this map. But update_all_los is really	1452	* visible to others on this map. But update_all_los is really
1486	* an inefficient way to do this, as it means los for all players	1453	* an inefficient way to do this, as it means los for all players
1487	* on the map will get recalculated. The players could very well	1454	* on the map will get recalculated. The players could very well
…		…
1567	if (!nr)	1534	if (!nr)
1568	return true;	1535	return true;
1569		1536
1570	nr = min (nr, nrof);	1537	nr = min (nr, nrof);
1571		1538
		1539	if (nrof > nr)
		1540	{
1572	nrof -= nr;	1541	nrof -= nr;
1573
1574	if (nrof)
1575	{
1576	adjust_weight (env, -weight * nr); // carrying == 0	1542	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1577		1543
1578	if (object *pl = visible_to ())	1544	if (object *pl = visible_to ())
1579	esrv_update_item (UPD_NROF, pl, this);	1545	esrv_update_item (UPD_NROF, pl, this);
1580		1546
1581	return true;	1547	return true;
1582	}	1548	}
1583	else	1549	else
1584	{	1550	{
1585	destroy (1);	1551	destroy ();
1586	return false;	1552	return false;
1587	}	1553	}
1588	}	1554	}
1589		1555
1590	/*	1556	/*
…		…
1607	}	1573	}
1608	else	1574	else
1609	{	1575	{
1610	decrease (nr);	1576	decrease (nr);
1611		1577
1612	object *op = object_create_clone (this);	1578	object *op = deep_clone ();
1613	op->nrof = nr;	1579	op->nrof = nr;
1614	return op;	1580	return op;
1615	}	1581	}
1616	}	1582	}
1617		1583
…		…
1838	LOG (llevError, "Present_arch called outside map.\n");	1804	LOG (llevError, "Present_arch called outside map.\n");
1839	return NULL;	1805	return NULL;
1840	}	1806	}
1841		1807
1842	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1808	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1843	if (tmp->arch == at)	1809	if (tmp->arch->archname == at->archname)
1844	return tmp;	1810	return tmp;
1845		1811
1846	return NULL;	1812	return NULL;
1847	}	1813	}
1848		1814
…		…
1912	* The first matching object is returned, or NULL if none.	1878	* The first matching object is returned, or NULL if none.
1913	*/	1879	*/
1914	object *	1880	object *
1915	present_arch_in_ob (const archetype at, const object op)	1881	present_arch_in_ob (const archetype at, const object op)
1916	{	1882	{
1917	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1883	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1918	if (tmp->arch == at)	1884	if (tmp->arch->archname == at->archname)
1919	return tmp;	1885	return tmp;
1920		1886
1921	return NULL;	1887	return NULL;
1922	}	1888	}
1923		1889
…		…
2332		2298
2333	/*	2299	/*
2334	* create clone from object to another	2300	* create clone from object to another
2335	*/	2301	*/
2336	object *	2302	object *
2337	object_create_clone (object *asrc)	2303	object::deep_clone ()
2338	{	2304	{
2339	object dst = 0, tmp, src, prev, *item;	2305	assert (("deep_clone called on non-head object", is_head ()));
2340		2306
2341	if (!asrc)	2307	object *dst = clone ();
2342	return 0;
2343		2308
2344	src = asrc->head_ ();	2309	object *prev = dst;
2345
2346	prev = 0;
2347	for (object *part = src; part; part = part->more)	2310	for (object *part = this->more; part; part = part->more)
2348	{	2311	{
2349	tmp = part->clone ();	2312	object *tmp = part->clone ();
2350	tmp->x -= src->x;
2351	tmp->y -= src->y;
2352
2353	if (!part->head)
2354	{
2355	dst = tmp;
2356	tmp->head = 0;
2357	}
2358	else
2359	tmp->head = dst;	2313	tmp->head = dst;
2360
2361	tmp->more = 0;
2362
2363	if (prev)
2364	prev->more = tmp;	2314	prev->more = tmp;
2365
2366	prev = tmp;	2315	prev = tmp;
2367	}	2316	}
2368		2317
2369	for (item = src->inv; item; item = item->below)	2318	for (object *item = inv; item; item = item->below)
2370	insert_ob_in_ob (object_create_clone (item), dst);	2319	insert_ob_in_ob (item->deep_clone (), dst);
2371		2320
2372	return dst;	2321	return dst;
2373	}	2322	}
2374		2323
2375	/* This returns the first object in who's inventory that	2324	/* This returns the first object in who's inventory that
…		…
2384	return tmp;	2333	return tmp;
2385		2334
2386	return 0;	2335	return 0;
2387	}	2336	}
2388		2337
2389	/* If ob has a field named key, return the link from the list,	2338	const shstr &
2390	* otherwise return NULL.	2339	object::kv_get (const shstr &key) const
2391	*
2392	* key must be a passed in shared string - otherwise, this won't
2393	* do the desired thing.
2394	*/
2395	key_value *
2396	get_ob_key_link (const object ob, const char key)
2397	{	2340	{
2398	for (key_value *link = ob->key_values; link; link = link->next)	2341	for (key_value *kv = key_values; kv; kv = kv->next)
2399	if (link->key == key)	2342	if (kv->key == key)
2400	return link;
2401
2402	return 0;
2403	}
2404
2405	/*
2406	* Returns the value of op has an extra_field for key, or NULL.
2407	*
2408	* The argument doesn't need to be a shared string.
2409	*
2410	* The returned string is shared.
2411	*/
2412	const char *
2413	get_ob_key_value (const object op, const char const key)
2414	{
2415	key_value *link;
2416	shstr_cmp canonical_key (key);
2417
2418	if (!canonical_key)
2419	{
2420	/* 1. There being a field named key on any object
2421	* implies there'd be a shared string to find.
2422	* 2. Since there isn't, no object has this field.
2423	* 3. Therefore, this object doesn't have this field.
2424	*/
2425	return 0;
2426	}
2427
2428	/* This is copied from get_ob_key_link() above -
2429	* only 4 lines, and saves the function call overhead.
2430	*/
2431	for (link = op->key_values; link; link = link->next)
2432	if (link->key == canonical_key)
2433	return link->value;	2343	return kv->value;
2434		2344
2435	return 0;	2345	return shstr_null;
2436	}	2346	}
2437		2347
2438	/*	2348	void
2439	* Updates the canonical_key in op to value.	2349	object::kv_set (const shstr &key, const shstr &value)
2440	*
2441	* canonical_key is a shared string (value doesn't have to be).
2442	*
2443	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2444	* keys.
2445	*
2446	* Returns TRUE on success.
2447	*/
2448	int
2449	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2450	{	2350	{
2451	key_value field = NULL, last = NULL;	2351	for (key_value *kv = key_values; kv; kv = kv->next)
2452		2352	if (kv->key == key)
2453	for (field = op->key_values; field != NULL; field = field->next)
2454	{
2455	if (field->key != canonical_key)
2456	{	2353	{
2457	last = field;	2354	kv->value = value;
2458	continue;	2355	return;
2459	}	2356	}
2460		2357
2461	if (value)	2358	key_value *kv = new key_value;
2462	field->value = value;	2359
2463	else	2360	kv->next = key_values;
		2361	kv->key = key;
		2362	kv->value = value;
		2363
		2364	key_values = kv;
		2365	}
		2366
		2367	void
		2368	object::kv_del (const shstr &key)
		2369	{
		2370	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2371	if ((*kvp)->key == key)
2464	{	2372	{
2465	/* Basically, if the archetype has this key set,	2373	key_value kv = kvp;
2466	* we need to store the null value so when we save	2374	kvp = (kvp)->next;
2467	* it, we save the empty value so that when we load,	2375	delete kv;
2468	* we get this value back again.	2376	return;
2469	*/
2470	if (get_ob_key_link (op->arch, canonical_key))
2471	field->value = 0;
2472	else
2473	{
2474	if (last)
2475	last->next = field->next;
2476	else
2477	op->key_values = field->next;
2478
2479	delete field;
2480	}
2481	}	2377	}
2482	return TRUE;
2483	}
2484	/* IF we get here, key doesn't exist */
2485
2486	/* No field, we'll have to add it. */
2487
2488	if (!add_key)
2489	return FALSE;
2490
2491	/* There isn't any good reason to store a null
2492	* value in the key/value list. If the archetype has
2493	* this key, then we should also have it, so shouldn't
2494	* be here. If user wants to store empty strings,
2495	* should pass in ""
2496	*/
2497	if (value == NULL)
2498	return TRUE;
2499
2500	field = new key_value;
2501
2502	field->key = canonical_key;
2503	field->value = value;
2504	/* Usual prepend-addition. */
2505	field->next = op->key_values;
2506	op->key_values = field;
2507
2508	return TRUE;
2509	}
2510
2511	/*
2512	* Updates the key in op to value.
2513	*
2514	* If add_key is FALSE, this will only update existing keys,
2515	* and not add new ones.
2516	* In general, should be little reason FALSE is ever passed in for add_key
2517	*
2518	* Returns TRUE on success.
2519	*/
2520	int
2521	set_ob_key_value (object op, const char key, const char *value, int add_key)
2522	{
2523	shstr key_ (key);
2524
2525	return set_ob_key_value_s (op, key_, value, add_key);
2526	}	2378	}
2527		2379
2528	object::depth_iterator::depth_iterator (object *container)	2380	object::depth_iterator::depth_iterator (object *container)
2529	: iterator_base (container)	2381	: iterator_base (container)
2530	{	2382	{
…		…
2580	{	2432	{
2581	char flagdesc[512];	2433	char flagdesc[512];
2582	char info2[256 * 4];	2434	char info2[256 * 4];
2583	char *p = info;	2435	char *p = info;
2584		2436
2585	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}",
2586	count,	2438	count,
2587	uuid.c_str (),	2439	uuid.c_str (),
2588	&name,	2440	&name,
2589	title ? "\",title:\"" : "",	2441	title ? ",title:\"" : "",
2590	title ? (const char *)title : "",	2442	title ? (const char *)title : "",
		2443	title ? "\"" : "",
2591	flag_desc (flagdesc, 512), type);	2444	flag_desc (flagdesc, 512), type);
2592		2445
2593	if (!flag[FLAG_REMOVED] && env)	2446	if (!flag[FLAG_REMOVED] && env)
2594	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2447	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2595		2448

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC vs. Revision 1.252 by root, Mon Aug 11 23:23:41 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.221 by root, Thu Apr 24 12:06:01 2008 UTC vs.
Revision 1.252 by root, Mon Aug 11 23:23:41 2008 UTC