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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC vs.
Revision 1.255 by root, Sun Aug 31 02:01: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	*
…		…
200	\|\| ob1->speed != ob2->speed	186	\|\| ob1->speed != ob2->speed
201	\|\| ob1->value != ob2->value	187	\|\| ob1->value != ob2->value
202	\|\| ob1->name != ob2->name)	188	\|\| ob1->name != ob2->name)
203	return 0;	189	return 0;
204		190
205	/* Do not merge objects if nrof would overflow. First part checks	191	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	192	* is always 0 .. 2*31-1 /
207	* would fit into a 32 bit signed int, which is often used to hold	193	if (ob1->nrof > 0x7fffffff - ob2->nrof)
208	* nrof values.
209	*/
210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	194	return 0;
212		195
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* This is to the comparison of the flags below will be OK. We	197	* This is to the comparison of the flags below will be OK. We
215	* just can't ignore the been applied or identified flags, as they	198	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		204
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		207
225	if (ob1->arch->name != ob2->arch->name	208	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	209	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	210	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	211	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	212	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	213	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	214	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	215	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	216	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	217	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	218	\|\| ob1->animation_id != ob2->animation_id
		219	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	220	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	221	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	222	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	223	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	224	\|\| ob1->move_type != ob2->move_type
…		…
248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	233	return 0;
250		234
251	if ((ob1->flag ^ ob2->flag)	235	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	236	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	237	.reset (FLAG_REMOVED)
255	.any ())	238	.any ())
256	return 0;	239	return 0;
257		240
258	/* This is really a spellbook check - we should in general	241	/* This is really a spellbook check - we should in general
…		…
358	else	341	else
359	{	342	{
360	// maybe there is a player standing on the same mapspace	343	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	344	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	345	if (object *pl = ms ().player ())
		346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363	if (!pl->container \|\| this == pl->container)	347	\|\| this == pl->container)
364	return pl;	348	return pl;
365	}	349	}
366	}	350	}
367		351
368	return 0;	352	return 0;
369	}	353	}
370		354
371	// adjust weight per container type ("of holding")	355	// adjust weight per container type ("of holding")
372	static sint32	356	static sint32
373	weight_adjust (object *op, sint32 weight)	357	weight_adjust_for (object *op, sint32 weight)
374	{	358	{
375	return op->type == CONTAINER	359	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	360	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	361	: weight;
378	}	362	}
…		…
384	static void	368	static void
385	adjust_weight (object *op, sint32 weight)	369	adjust_weight (object *op, sint32 weight)
386	{	370	{
387	while (op)	371	while (op)
388	{	372	{
		373	// adjust by actual difference to account for rounding errors
		374	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	375	weight = weight_adjust_for (op, op->carrying)
		376	- weight_adjust_for (op, op->carrying - weight);
390		377
391	if (!weight)	378	if (!weight)
392	return;	379	return;
393		380
394	op->carrying += weight;	381	op->carrying += weight;
…		…
417	op->update_weight ();	404	op->update_weight ();
418		405
419	sum += op->total_weight ();	406	sum += op->total_weight ();
420	}	407	}
421		408
422	sum = weight_adjust (this, sum);	409	sum = weight_adjust_for (this, sum);
423		410
424	if (sum != carrying)	411	if (sum != carrying)
425	{	412	{
426	carrying = sum;	413	carrying = sum;
427		414
…		…
489	*/	476	*/
490	object *	477	object *
491	find_object_name (const char *str)	478	find_object_name (const char *str)
492	{	479	{
493	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
494	object *op;
495		481
		482	if (str_)
496	for_all_objects (op)	483	for_all_objects (op)
497	if (op->name == str_)	484	if (op->name == str_)
498	break;	485	return op;
499		486
500	return op;	487	return 0;
501	}	488	}
502		489
503	/*	490	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	491	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	492	* skill and experience objects.
…		…
603	}	590	}
604		591
605	op->key_values = 0;	592	op->key_values = 0;
606	}	593	}
607		594
608	object &	595	/*
609	object::operator =(const object &src)	596	* copy_to first frees everything allocated by the dst object,
		597	* and then copies the contents of itself into the second
		598	* object, allocating what needs to be allocated. Basically, any
		599	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		600	* if the first object is freed, the pointers in the new object
		601	* will point at garbage.
		602	*/
		603	void
		604	object::copy_to (object *dst)
610	{	605	{
611	bool is_freed = flag [FLAG_FREED];	606	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	(object_copy )this = src;	607	(object_copy )dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	608	dst->flag [FLAG_REMOVED] = true;
618		609
619	/* Copy over key_values, if any. */	610	/* Copy over key_values, if any. */
620	if (src.key_values)	611	if (key_values)
621	{	612	{
622	key_value *tail = 0;	613	key_value *tail = 0;
623	key_values = 0;	614	dst->key_values = 0;
624		615
625	for (key_value *i = src.key_values; i; i = i->next)	616	for (key_value *i = key_values; i; i = i->next)
626	{	617	{
627	key_value *new_link = new key_value;	618	key_value *new_link = new key_value;
628		619
629	new_link->next = 0;	620	new_link->next = 0;
630	new_link->key = i->key;	621	new_link->key = i->key;
631	new_link->value = i->value;	622	new_link->value = i->value;
632		623
633	/* Try and be clever here, too. */	624	/* Try and be clever here, too. */
634	if (!key_values)	625	if (!dst->key_values)
635	{	626	{
636	key_values = new_link;	627	dst->key_values = new_link;
637	tail = new_link;	628	tail = new_link;
638	}	629	}
639	else	630	else
640	{	631	{
641	tail->next = new_link;	632	tail->next = new_link;
642	tail = new_link;	633	tail = new_link;
643	}	634	}
644	}	635	}
645	}	636	}
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		637
661	if (speed < 0)	638	if (speed < 0)
662	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
663		640
664	dst->set_speed (dst->speed);	641	dst->set_speed (dst->speed);
…		…
686	object *	663	object *
687	object::clone ()	664	object::clone ()
688	{	665	{
689	object *neu = create ();	666	object *neu = create ();
690	copy_to (neu);	667	copy_to (neu);
		668	neu->map = map; // not copied by copy_to
691	return neu;	669	return neu;
692	}	670	}
693		671
694	/*	672	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	673	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
788	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
789	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
790	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
791	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
792	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
793	* to have move_allow right now.	771	* have move_allow right now.
794	*/	772	*/
795	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
796	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
797	m.flags_ = 0;	775	m.flags_ = 0;
798	}	776	}
…		…
924	* drop on that space.	902	* drop on that space.
925	*/	903	*/
926	if (!drop_to_ground	904	if (!drop_to_ground
927	\|\| !map	905	\|\| !map
928	\|\| map->in_memory != MAP_ACTIVE	906	\|\| map->in_memory != MAP_ACTIVE
929	\|\| map->nodrop	907	\|\| map->no_drop
930	\|\| ms ().move_block == MOVE_ALL)	908	\|\| ms ().move_block == MOVE_ALL)
931	{	909	{
932	while (inv)	910	while (inv)
933	{
934	inv->destroy_inv (false);
935	inv->destroy ();	911	inv->destroy (true);
936	}
937	}	912	}
938	else	913	else
939	{ /* Put objects in inventory onto this space */	914	{ /* Put objects in inventory onto this space */
940	while (inv)	915	while (inv)
941	{	916	{
…		…
959	object *op = new object;	934	object *op = new object;
960	op->link ();	935	op->link ();
961	return op;	936	return op;
962	}	937	}
963		938
		939	static struct freed_map : maptile
		940	{
		941	freed_map ()
		942	{
		943	path = "<freed objects map>";
		944	name = "/internal/freed_objects_map";
		945	width = 3;
		946	height = 3;
		947	no_drop = 1;
		948	no_reset = 1;
		949
		950	alloc ();
		951	in_memory = MAP_ACTIVE;
		952	}
		953
		954	~freed_map ()
		955	{
		956	destroy ();
		957	}
		958	} freed_map; // freed objects are moved here to avoid crashes
		959
964	void	960	void
965	object::do_destroy ()	961	object::do_destroy ()
966	{	962	{
967	if (flag [FLAG_IS_LINKED])	963	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	964	remove_button_link (this);
…		…
978	unlink ();	974	unlink ();
979		975
980	flag [FLAG_FREED] = 1;	976	flag [FLAG_FREED] = 1;
981		977
982	// hack to ensure that freed objects still have a valid map	978	// hack to ensure that freed objects still have a valid map
983	{
984	static maptile *freed_map; // freed objects are moved here to avoid crashes
985
986	if (!freed_map)
987	{
988	freed_map = new maptile;
989
990	freed_map->path = "<freed objects map>";
991	freed_map->name = "/internal/freed_objects_map";
992	freed_map->width = 3;
993	freed_map->height = 3;
994	freed_map->nodrop = 1;
995
996	freed_map->alloc ();
997	freed_map->in_memory = MAP_ACTIVE;
998	}
999
1000	map = freed_map;	979	map = &freed_map;
1001	x = 1;	980	x = 1;
1002	y = 1;	981	y = 1;
1003	}
1004		982
1005	if (more)	983	if (more)
1006	{	984	{
1007	more->destroy ();	985	more->destroy ();
1008	more = 0;	986	more = 0;
…		…
1025		1003
1026	if (!is_head () && !head->destroyed ())	1004	if (!is_head () && !head->destroyed ())
1027	{	1005	{
1028	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1006	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1029	head->destroy (destroy_inventory);	1007	head->destroy (destroy_inventory);
		1008	return;
1030	}	1009	}
1031		1010
1032	destroy_inv (!destroy_inventory);	1011	destroy_inv (!destroy_inventory);
1033		1012
1034	if (is_head ())	1013	if (is_head ())
…		…
1073	if (object *pl = visible_to ())	1052	if (object *pl = visible_to ())
1074	esrv_del_item (pl->contr, count);	1053	esrv_del_item (pl->contr, count);
1075	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1054	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1076		1055
1077	adjust_weight (env, -total_weight ());	1056	adjust_weight (env, -total_weight ());
1078
1079	*(above ? &above->below : &env->inv) = below;
1080
1081	if (below)
1082	below->above = above;
1083		1057
1084	/* we set up values so that it could be inserted into	1058	/* we set up values so that it could be inserted into
1085	* the map, but we don't actually do that - it is up	1059	* the map, but we don't actually do that - it is up
1086	* to the caller to decide what we want to do.	1060	* to the caller to decide what we want to do.
1087	*/	1061	*/
1088	map = env->map;	1062	map = env->map;
1089	x = env->x;	1063	x = env->x;
1090	y = env->y;	1064	y = env->y;
		1065
		1066	// make sure cmov optimisation is applicable
		1067	*(above ? &above->below : &env->inv) = below;
		1068	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1069
1091	above = 0;	1070	above = 0;
1092	below = 0;	1071	below = 0;
1093	env = 0;	1072	env = 0;
1094		1073
1095	/* NO_FIX_PLAYER is set when a great many changes are being	1074	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1125		1104
1126	esrv_del_item (pl->contr, count);	1105	esrv_del_item (pl->contr, count);
1127	}	1106	}
1128		1107
1129	/* link the object above us */	1108	/* link the object above us */
1130	if (above)	1109	// re-link, make sure compiler can easily use cmove
1131	above->below = below;	1110	*(above ? &above->below : &ms.top) = below;
1132	else	1111	*(below ? &below->above : &ms.bot) = above;
1133	ms.top = below; /* we were top, set new top */
1134
1135	/* Relink the object below us, if there is one */
1136	if (below)
1137	below->above = above;
1138	else
1139	{
1140	/* Nothing below, which means we need to relink map object for this space
1141	* use translated coordinates in case some oddness with map tiling is
1142	* evident
1143	*/
1144	if (GET_MAP_OB (map, x, y) != this)
1145	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 ());
1146
1147	ms.bot = above; /* goes on above it. */
1148	}
1149		1112
1150	above = 0;	1113	above = 0;
1151	below = 0;	1114	below = 0;
		1115
		1116	ms.flags_ = 0;
1152		1117
1153	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1154	return;	1119	return;
1155		1120
1156	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1163	* appropriately.	1128	* appropriately.
1164	*/	1129	*/
1165	pl->close_container ();	1130	pl->close_container ();
1166		1131
1167	//TODO: the floorbox prev/next might need updating	1132	//TODO: the floorbox prev/next might need updating
1168	esrv_del_item (pl->contr, count);	1133	//esrv_del_item (pl->contr, count);
		1134	//TODO: update floorbox to preserve ordering
		1135	if (pl->contr->ns)
		1136	pl->contr->ns->floorbox_update ();
1169	}	1137	}
1170		1138
1171	for (tmp = ms.bot; tmp; tmp = tmp->above)	1139	for (tmp = ms.bot; tmp; tmp = tmp->above)
1172	{	1140	{
1173	/* No point updating the players look faces if he is the object	1141	/* No point updating the players look faces if he is the object
…		…
1186	}	1154	}
1187		1155
1188	last = tmp;	1156	last = tmp;
1189	}	1157	}
1190		1158
1191	/* last == NULL if there are no objects on this space */
1192	//TODO: this makes little sense, why only update the topmost object?
1193	if (!last)
1194	map->at (x, y).flags_ = 0;
1195	else
1196	update_object (last, UP_OBJ_REMOVE);
1197
1198	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1159	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1199	update_all_los (map, x, y);	1160	update_all_los (map, x, y);
1200	}	1161	}
1201	}	1162	}
1202		1163
…		…
1265	* job preparing multi-part monsters.	1226	* job preparing multi-part monsters.
1266	*/	1227	*/
1267	object *	1228	object *
1268	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1229	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1269	{	1230	{
		1231	op->remove ();
		1232
1270	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1233	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271	{	1234	{
1272	tmp->x = x + tmp->arch->x;	1235	tmp->x = x + tmp->arch->x;
1273	tmp->y = y + tmp->arch->y;	1236	tmp->y = y + tmp->arch->y;
1274	}	1237	}
…		…
1297	* just 'op' otherwise	1260	* just 'op' otherwise
1298	*/	1261	*/
1299	object *	1262	object *
1300	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1263	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1301	{	1264	{
1302	assert (!op->flag [FLAG_FREED]);	1265	if (op->is_on_map ())
		1266	{
		1267	LOG (llevError, "insert_ob_in_map called for object already on map");
		1268	abort ();
		1269	}
1303		1270
		1271	if (op->env)
		1272	{
		1273	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1304	op->remove ();	1274	op->remove ();
		1275	}
		1276
		1277	if (op->face && !face_info (op->face))//D TODO: remove soon
		1278	{//D
		1279	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1280	op->face = 1;//D
		1281	}//D
1305		1282
1306	/* Ideally, the caller figures this out. However, it complicates a lot	1283	/* Ideally, the caller figures this out. However, it complicates a lot
1307	* of areas of callers (eg, anything that uses find_free_spot would now	1284	* of areas of callers (eg, anything that uses find_free_spot would now
1308	* need extra work	1285	* need extra work
1309	*/	1286	*/
1310	if (!xy_normalise (m, op->x, op->y))	1287	if (!xy_normalise (m, op->x, op->y))
1311	{	1288	{
1312	op->destroy (1);	1289	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1313	return 0;	1290	return 0;
1314	}	1291	}
1315		1292
1316	if (object *more = op->more)	1293	if (object *more = op->more)
1317	if (!insert_ob_in_map (more, m, originator, flag))	1294	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1326	*/	1303	*/
1327	if (op->nrof && !(flag & INS_NO_MERGE))	1304	if (op->nrof && !(flag & INS_NO_MERGE))
1328	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1305	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329	if (object::can_merge (op, tmp))	1306	if (object::can_merge (op, tmp))
1330	{	1307	{
1331	// TODO: we atcually want to update tmp, not op,	1308	// TODO: we actually want to update tmp, not op,
1332	// but some caller surely breaks when we return tmp	1309	// but some caller surely breaks when we return tmp
1333	// from here :/	1310	// from here :/
1334	op->nrof += tmp->nrof;	1311	op->nrof += tmp->nrof;
1335	tmp->destroy (1);	1312	tmp->destroy (1);
1336	}	1313	}
…		…
1347	{	1324	{
1348	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1325	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1349	abort ();	1326	abort ();
1350	}	1327	}
1351		1328
		1329	if (!originator->is_on_map ())
		1330	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1331	op->debug_desc (), originator->debug_desc ());
		1332
1352	op->above = originator;	1333	op->above = originator;
1353	op->below = originator->below;	1334	op->below = originator->below;
1354
1355	if (op->below)
1356	op->below->above = op;
1357	else
1358	ms.bot = op;
1359
1360	/* since below originator, no need to update top */
1361	originator->below = op;	1335	originator->below = op;
		1336
		1337	*(op->below ? &op->below->above : &ms.bot) = op;
1362	}	1338	}
1363	else	1339	else
1364	{	1340	{
1365	object top, floor = NULL;	1341	object *floor = 0;
1366		1342	object *top = ms.top;
1367	top = ms.bot;
1368		1343
1369	/* If there are other objects, then */	1344	/* If there are other objects, then */
1370	if (top)	1345	if (top)
1371	{	1346	{
1372	object *last = 0;
1373
1374	/*	1347	/*
1375	* If there are multiple objects on this space, we do some trickier handling.	1348	* If there are multiple objects on this space, we do some trickier handling.
1376	* We've already dealt with merging if appropriate.	1349	* We've already dealt with merging if appropriate.
1377	* Generally, we want to put the new object on top. But if	1350	* Generally, we want to put the new object on top. But if
1378	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1351	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1381	* once we get to them. This reduces the need to traverse over all of	1354	* once we get to them. This reduces the need to traverse over all of
1382	* them when adding another one - this saves quite a bit of cpu time	1355	* them when adding another one - this saves quite a bit of cpu time
1383	* when lots of spells are cast in one area. Currently, it is presumed	1356	* when lots of spells are cast in one area. Currently, it is presumed
1384	* that flying non pickable objects are spell objects.	1357	* that flying non pickable objects are spell objects.
1385	*/	1358	*/
1386	for (top = ms.bot; top; top = top->above)	1359	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1387	{	1360	{
1388	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1361	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1389	floor = top;	1362	floor = tmp;
1390		1363
1391	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1364	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1392	{	1365	{
1393	/* We insert above top, so we want this object below this */	1366	/* We insert above top, so we want this object below this */
1394	top = top->below;	1367	top = tmp->below;
1395	break;	1368	break;
1396	}	1369	}
1397		1370
1398	last = top;	1371	top = tmp;
1399	}	1372	}
1400
1401	/* Don't want top to be NULL, so set it to the last valid object */
1402	top = last;
1403		1373
1404	/* We let update_position deal with figuring out what the space	1374	/* We let update_position deal with figuring out what the space
1405	* looks like instead of lots of conditions here.	1375	* looks like instead of lots of conditions here.
1406	* makes things faster, and effectively the same result.	1376	* makes things faster, and effectively the same result.
1407	*/	1377	*/
…		…
1414	*/	1384	*/
1415	if (!(flag & INS_ON_TOP)	1385	if (!(flag & INS_ON_TOP)
1416	&& ms.flags () & P_BLOCKSVIEW	1386	&& ms.flags () & P_BLOCKSVIEW
1417	&& (op->face && !faces [op->face].visibility))	1387	&& (op->face && !faces [op->face].visibility))
1418	{	1388	{
		1389	object *last;
		1390
1419	for (last = top; last != floor; last = last->below)	1391	for (last = top; last != floor; last = last->below)
1420	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1392	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1421	break;	1393	break;
1422		1394
1423	/* Check to see if we found the object that blocks view,	1395	/* Check to see if we found the object that blocks view,
…		…
1431	} /* If objects on this space */	1403	} /* If objects on this space */
1432		1404
1433	if (flag & INS_ABOVE_FLOOR_ONLY)	1405	if (flag & INS_ABOVE_FLOOR_ONLY)
1434	top = floor;	1406	top = floor;
1435		1407
1436	/* Top is the object that our object (op) is going to get inserted above.	1408	// insert object above top, or bottom-most if top = 0
1437	*/
1438
1439	/* First object on this space */
1440	if (!top)	1409	if (!top)
1441	{	1410	{
		1411	op->below = 0;
1442	op->above = ms.bot;	1412	op->above = ms.bot;
1443
1444	if (op->above)
1445	op->above->below = op;
1446
1447	op->below = 0;
1448	ms.bot = op;	1413	ms.bot = op;
		1414
		1415	*(op->above ? &op->above->below : &ms.top) = op;
1449	}	1416	}
1450	else	1417	else
1451	{ /* get inserted into the stack above top */	1418	{
1452	op->above = top->above;	1419	op->above = top->above;
1453
1454	if (op->above)
1455	op->above->below = op;	1420	top->above = op;
1456		1421
1457	op->below = top;	1422	op->below = top;
1458	top->above = op;	1423	*(op->above ? &op->above->below : &ms.top) = op;
1459	}	1424	}
1460		1425	}
1461	if (!op->above)
1462	ms.top = op;
1463	} /* else not INS_BELOW_ORIGINATOR */
1464		1426
1465	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1466	{	1428	{
1467	op->contr->do_los = 1;	1429	op->contr->do_los = 1;
1468	++op->map->players;	1430	++op->map->players;
…		…
1471		1433
1472	op->map->dirty = true;	1434	op->map->dirty = true;
1473		1435
1474	if (object *pl = ms.player ())	1436	if (object *pl = ms.player ())
1475	//TODO: the floorbox prev/next might need updating	1437	//TODO: the floorbox prev/next might need updating
1476	esrv_send_item (pl, op);	1438	//esrv_send_item (pl, op);
		1439	//TODO: update floorbox to preserve ordering
		1440	if (pl->contr->ns)
		1441	pl->contr->ns->floorbox_update ();
1477		1442
1478	/* If this object glows, it may affect lighting conditions that are	1443	/* If this object glows, it may affect lighting conditions that are
1479	* visible to others on this map. But update_all_los is really	1444	* visible to others on this map. But update_all_los is really
1480	* an inefficient way to do this, as it means los for all players	1445	* an inefficient way to do this, as it means los for all players
1481	* on the map will get recalculated. The players could very well	1446	* on the map will get recalculated. The players could very well
…		…
1561	if (!nr)	1526	if (!nr)
1562	return true;	1527	return true;
1563		1528
1564	nr = min (nr, nrof);	1529	nr = min (nr, nrof);
1565		1530
		1531	if (nrof > nr)
		1532	{
1566	nrof -= nr;	1533	nrof -= nr;
1567
1568	if (nrof)
1569	{
1570	adjust_weight (env, -weight * nr); // carrying == 0	1534	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1571		1535
1572	if (object *pl = visible_to ())	1536	if (object *pl = visible_to ())
1573	esrv_update_item (UPD_NROF, pl, this);	1537	esrv_update_item (UPD_NROF, pl, this);
1574		1538
1575	return true;	1539	return true;
1576	}	1540	}
1577	else	1541	else
1578	{	1542	{
1579	destroy (1);	1543	destroy ();
1580	return false;	1544	return false;
1581	}	1545	}
1582	}	1546	}
1583		1547
1584	/*	1548	/*
…		…
1601	}	1565	}
1602	else	1566	else
1603	{	1567	{
1604	decrease (nr);	1568	decrease (nr);
1605		1569
1606	object *op = object_create_clone (this);	1570	object *op = deep_clone ();
1607	op->nrof = nr;	1571	op->nrof = nr;
1608	return op;	1572	return op;
1609	}	1573	}
1610	}	1574	}
1611		1575
…		…
1832	LOG (llevError, "Present_arch called outside map.\n");	1796	LOG (llevError, "Present_arch called outside map.\n");
1833	return NULL;	1797	return NULL;
1834	}	1798	}
1835		1799
1836	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1800	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837	if (tmp->arch == at)	1801	if (tmp->arch->archname == at->archname)
1838	return tmp;	1802	return tmp;
1839		1803
1840	return NULL;	1804	return NULL;
1841	}	1805	}
1842		1806
…		…
1906	* The first matching object is returned, or NULL if none.	1870	* The first matching object is returned, or NULL if none.
1907	*/	1871	*/
1908	object *	1872	object *
1909	present_arch_in_ob (const archetype at, const object op)	1873	present_arch_in_ob (const archetype at, const object op)
1910	{	1874	{
1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1875	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912	if (tmp->arch == at)	1876	if (tmp->arch->archname == at->archname)
1913	return tmp;	1877	return tmp;
1914		1878
1915	return NULL;	1879	return NULL;
1916	}	1880	}
1917		1881
…		…
2326		2290
2327	/*	2291	/*
2328	* create clone from object to another	2292	* create clone from object to another
2329	*/	2293	*/
2330	object *	2294	object *
2331	object_create_clone (object *asrc)	2295	object::deep_clone ()
2332	{	2296	{
2333	object dst = 0, tmp, src, prev, *item;	2297	assert (("deep_clone called on non-head object", is_head ()));
2334		2298
2335	if (!asrc)	2299	object *dst = clone ();
2336	return 0;
2337		2300
2338	src = asrc->head_ ();	2301	object *prev = dst;
2339
2340	prev = 0;
2341	for (object *part = src; part; part = part->more)	2302	for (object *part = this->more; part; part = part->more)
2342	{	2303	{
2343	tmp = part->clone ();	2304	object *tmp = part->clone ();
2344	tmp->x -= src->x;
2345	tmp->y -= src->y;
2346
2347	if (!part->head)
2348	{
2349	dst = tmp;
2350	tmp->head = 0;
2351	}
2352	else
2353	tmp->head = dst;	2305	tmp->head = dst;
2354
2355	tmp->more = 0;
2356
2357	if (prev)
2358	prev->more = tmp;	2306	prev->more = tmp;
2359
2360	prev = tmp;	2307	prev = tmp;
2361	}	2308	}
2362		2309
2363	for (item = src->inv; item; item = item->below)	2310	for (object *item = inv; item; item = item->below)
2364	insert_ob_in_ob (object_create_clone (item), dst);	2311	insert_ob_in_ob (item->deep_clone (), dst);
2365		2312
2366	return dst;	2313	return dst;
2367	}	2314	}
2368		2315
2369	/* This returns the first object in who's inventory that	2316	/* This returns the first object in who's inventory that
…		…
2378	return tmp;	2325	return tmp;
2379		2326
2380	return 0;	2327	return 0;
2381	}	2328	}
2382		2329
2383	/* If ob has a field named key, return the link from the list,	2330	const shstr &
2384	* otherwise return NULL.	2331	object::kv_get (const shstr &key) const
2385	*
2386	* key must be a passed in shared string - otherwise, this won't
2387	* do the desired thing.
2388	*/
2389	key_value *
2390	get_ob_key_link (const object ob, const char key)
2391	{	2332	{
2392	for (key_value *link = ob->key_values; link; link = link->next)	2333	for (key_value *kv = key_values; kv; kv = kv->next)
2393	if (link->key == key)	2334	if (kv->key == key)
2394	return link;
2395
2396	return 0;
2397	}
2398
2399	/*
2400	* Returns the value of op has an extra_field for key, or NULL.
2401	*
2402	* The argument doesn't need to be a shared string.
2403	*
2404	* The returned string is shared.
2405	*/
2406	const char *
2407	get_ob_key_value (const object op, const char const key)
2408	{
2409	key_value *link;
2410	shstr_cmp canonical_key (key);
2411
2412	if (!canonical_key)
2413	{
2414	/* 1. There being a field named key on any object
2415	* implies there'd be a shared string to find.
2416	* 2. Since there isn't, no object has this field.
2417	* 3. Therefore, this object doesn't have this field.
2418	*/
2419	return 0;
2420	}
2421
2422	/* This is copied from get_ob_key_link() above -
2423	* only 4 lines, and saves the function call overhead.
2424	*/
2425	for (link = op->key_values; link; link = link->next)
2426	if (link->key == canonical_key)
2427	return link->value;	2335	return kv->value;
2428		2336
2429	return 0;	2337	return shstr_null;
2430	}	2338	}
2431		2339
2432	/*	2340	void
2433	* Updates the canonical_key in op to value.	2341	object::kv_set (const shstr &key, const shstr &value)
2434	*
2435	* canonical_key is a shared string (value doesn't have to be).
2436	*
2437	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2438	* keys.
2439	*
2440	* Returns TRUE on success.
2441	*/
2442	int
2443	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2444	{	2342	{
2445	key_value field = NULL, last = NULL;	2343	for (key_value *kv = key_values; kv; kv = kv->next)
2446		2344	if (kv->key == key)
2447	for (field = op->key_values; field != NULL; field = field->next)
2448	{
2449	if (field->key != canonical_key)
2450	{	2345	{
2451	last = field;	2346	kv->value = value;
2452	continue;	2347	return;
2453	}	2348	}
2454		2349
2455	if (value)	2350	key_value *kv = new key_value;
2456	field->value = value;	2351
2457	else	2352	kv->next = key_values;
		2353	kv->key = key;
		2354	kv->value = value;
		2355
		2356	key_values = kv;
		2357	}
		2358
		2359	void
		2360	object::kv_del (const shstr &key)
		2361	{
		2362	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2363	if ((*kvp)->key == key)
2458	{	2364	{
2459	/* Basically, if the archetype has this key set,	2365	key_value kv = kvp;
2460	* we need to store the null value so when we save	2366	kvp = (kvp)->next;
2461	* it, we save the empty value so that when we load,	2367	delete kv;
2462	* we get this value back again.	2368	return;
2463	*/
2464	if (get_ob_key_link (op->arch, canonical_key))
2465	field->value = 0;
2466	else
2467	{
2468	if (last)
2469	last->next = field->next;
2470	else
2471	op->key_values = field->next;
2472
2473	delete field;
2474	}
2475	}	2369	}
2476	return TRUE;
2477	}
2478	/* IF we get here, key doesn't exist */
2479
2480	/* No field, we'll have to add it. */
2481
2482	if (!add_key)
2483	return FALSE;
2484
2485	/* There isn't any good reason to store a null
2486	* value in the key/value list. If the archetype has
2487	* this key, then we should also have it, so shouldn't
2488	* be here. If user wants to store empty strings,
2489	* should pass in ""
2490	*/
2491	if (value == NULL)
2492	return TRUE;
2493
2494	field = new key_value;
2495
2496	field->key = canonical_key;
2497	field->value = value;
2498	/* Usual prepend-addition. */
2499	field->next = op->key_values;
2500	op->key_values = field;
2501
2502	return TRUE;
2503	}
2504
2505	/*
2506	* Updates the key in op to value.
2507	*
2508	* If add_key is FALSE, this will only update existing keys,
2509	* and not add new ones.
2510	* In general, should be little reason FALSE is ever passed in for add_key
2511	*
2512	* Returns TRUE on success.
2513	*/
2514	int
2515	set_ob_key_value (object op, const char key, const char *value, int add_key)
2516	{
2517	shstr key_ (key);
2518
2519	return set_ob_key_value_s (op, key_, value, add_key);
2520	}	2370	}
2521		2371
2522	object::depth_iterator::depth_iterator (object *container)	2372	object::depth_iterator::depth_iterator (object *container)
2523	: iterator_base (container)	2373	: iterator_base (container)
2524	{	2374	{
…		…
2574	{	2424	{
2575	char flagdesc[512];	2425	char flagdesc[512];
2576	char info2[256 * 4];	2426	char info2[256 * 4];
2577	char *p = info;	2427	char *p = info;
2578		2428
2579	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2429	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2580	count,	2430	count,
2581	uuid.c_str (),	2431	uuid.c_str (),
2582	&name,	2432	&name,
2583	title ? "\",title:\"" : "",	2433	title ? ",title:\"" : "",
2584	title ? (const char *)title : "",	2434	title ? (const char *)title : "",
		2435	title ? "\"" : "",
2585	flag_desc (flagdesc, 512), type);	2436	flag_desc (flagdesc, 512), type);
2586		2437
2587	if (!flag[FLAG_REMOVED] && env)	2438	if (!flag[FLAG_REMOVED] && env)
2588	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2439	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2589		2440

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC vs. Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC vs.
Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC