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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs.
Revision 1.245 by root, Sun May 18 19:53:07 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
		191	// some objects are unmergable
		192	if (!ob1->nrof \|\| !ob2->nrof)
		193	return 0;
		194
205	/* Do not merge objects if nrof would overflow. First part checks	195	/* Do not merge objects if nrof would overflow. First part checks
206	* for unsigned overflow (2c), second part checks whether the result	196	* for unsigned overflow (2c), second part checks whether the result
207	* would fit into a 32 bit signed int, which is often used to hold	197	* would fit into a 32 bit signed int, which is often used to hold
208	* nrof values.	198	* nrof values.
209	*/	199	*/
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	210	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		211
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	212	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	213	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		214
225	if (ob1->arch->name != ob2->arch->name	215	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	216	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	217	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	218	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	219	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	220	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	221	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	222	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	223	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	224	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	225	\|\| ob1->animation_id != ob2->animation_id
		226	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	227	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	228	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	229	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	230	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	231	\|\| ob1->move_type != ob2->move_type
…		…
334		325
335	// find player who can see this object	326	// find player who can see this object
336	object *	327	object *
337	object::visible_to () const	328	object::visible_to () const
338	{	329	{
339	if (!flag [FLAG_REMOVED])	330	if (client_visible () && !flag [FLAG_REMOVED])
340	{	331	{
341	// see if we are in a container of sorts	332	// see if we are in a container of sorts
342	if (env)	333	if (env)
343	{	334	{
344	// the player inventory itself is always visible	335	// the player inventory itself is always visible
…		…
358	else	349	else
359	{	350	{
360	// maybe there is a player standing on the same mapspace	351	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	352	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	353	if (object *pl = ms ().player ())
		354	if (!pl->container \|\| this == pl->container)
363	return pl;	355	return pl;
364	}	356	}
365	}	357	}
366		358
367	return 0;	359	return 0;
368	}	360	}
369		361
370	// adjust weight per container type ("of holding")	362	// adjust weight per container type ("of holding")
371	static sint32	363	static sint32
372	weight_adjust (object *op, sint32 weight)	364	weight_adjust_for (object *op, sint32 weight)
373	{	365	{
374	return op->type == CONTAINER	366	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	367	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	368	: weight;
377	}	369	}
…		…
383	static void	375	static void
384	adjust_weight (object *op, sint32 weight)	376	adjust_weight (object *op, sint32 weight)
385	{	377	{
386	while (op)	378	while (op)
387	{	379	{
		380	// adjust by actual difference to account for rounding errors
		381	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	382	weight = weight_adjust_for (op, op->carrying)
		383	- weight_adjust_for (op, op->carrying - weight);
389		384
390	if (!weight)	385	if (!weight)
391	return;	386	return;
392		387
393	op->carrying += weight;	388	op->carrying += weight;
…		…
416	op->update_weight ();	411	op->update_weight ();
417		412
418	sum += op->total_weight ();	413	sum += op->total_weight ();
419	}	414	}
420		415
421	sum = weight_adjust (this, sum);	416	sum = weight_adjust_for (this, sum);
422		417
423	if (sum != carrying)	418	if (sum != carrying)
424	{	419	{
425	carrying = sum;	420	carrying = sum;
426		421
…		…
488	*/	483	*/
489	object *	484	object *
490	find_object_name (const char *str)	485	find_object_name (const char *str)
491	{	486	{
492	shstr_cmp str_ (str);	487	shstr_cmp str_ (str);
493	object *op;
494		488
		489	if (str_)
495	for_all_objects (op)	490	for_all_objects (op)
496	if (op->name == str_)	491	if (op->name == str_)
497	break;	492	return op;
498		493
499	return op;	494	return 0;
500	}	495	}
501		496
502	/*	497	/*
503	* Sets the owner and sets the skill and exp pointers to owner's current	498	* Sets the owner and sets the skill and exp pointers to owner's current
504	* skill and experience objects.	499	* skill and experience objects.
…		…
602	}	597	}
603		598
604	op->key_values = 0;	599	op->key_values = 0;
605	}	600	}
606		601
607	object &	602	/*
608	object::operator =(const object &src)	603	* copy_to first frees everything allocated by the dst object,
		604	* and then copies the contents of itself into the second
		605	* object, allocating what needs to be allocated. Basically, any
		606	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		607	* if the first object is freed, the pointers in the new object
		608	* will point at garbage.
		609	*/
		610	void
		611	object::copy_to (object *dst)
609	{	612	{
610	bool is_freed = flag [FLAG_FREED];	613	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	(object_copy )this = src;	614	(object_copy )dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	615	dst->flag [FLAG_REMOVED] = true;
617		616
618	/* Copy over key_values, if any. */	617	/* Copy over key_values, if any. */
619	if (src.key_values)	618	if (key_values)
620	{	619	{
621	key_value *tail = 0;	620	key_value *tail = 0;
622	key_values = 0;	621	dst->key_values = 0;
623		622
624	for (key_value *i = src.key_values; i; i = i->next)	623	for (key_value *i = key_values; i; i = i->next)
625	{	624	{
626	key_value *new_link = new key_value;	625	key_value *new_link = new key_value;
627		626
628	new_link->next = 0;	627	new_link->next = 0;
629	new_link->key = i->key;	628	new_link->key = i->key;
630	new_link->value = i->value;	629	new_link->value = i->value;
631		630
632	/* Try and be clever here, too. */	631	/* Try and be clever here, too. */
633	if (!key_values)	632	if (!dst->key_values)
634	{	633	{
635	key_values = new_link;	634	dst->key_values = new_link;
636	tail = new_link;	635	tail = new_link;
637	}	636	}
638	else	637	else
639	{	638	{
640	tail->next = new_link;	639	tail->next = new_link;
641	tail = new_link;	640	tail = new_link;
642	}	641	}
643	}	642	}
644	}	643	}
645	}
646
647	/*
648	* copy_to first frees everything allocated by the dst object,
649	* and then copies the contents of itself into the second
650	* object, allocating what needs to be allocated. Basically, any
651	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
652	* if the first object is freed, the pointers in the new object
653	* will point at garbage.
654	*/
655	void
656	object::copy_to (object *dst)
657	{
658	dst = this;
659		644
660	if (speed < 0)	645	if (speed < 0)
661	dst->speed_left -= rndm ();	646	dst->speed_left -= rndm ();
662		647
663	dst->set_speed (dst->speed);	648	dst->set_speed (dst->speed);
…		…
685	object *	670	object *
686	object::clone ()	671	object::clone ()
687	{	672	{
688	object *neu = create ();	673	object *neu = create ();
689	copy_to (neu);	674	copy_to (neu);
		675	neu->map = map; // not copied by copy_to
690	return neu;	676	return neu;
691	}	677	}
692		678
693	/*	679	/*
694	* If an object with the IS_TURNABLE() flag needs to be turned due	680	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	731	* UP_OBJ_FACE: only the objects face has changed.
746	*/	732	*/
747	void	733	void
748	update_object (object *op, int action)	734	update_object (object *op, int action)
749	{	735	{
750	if (op == NULL)	736	if (!op)
751	{	737	{
752	/* this should never happen */	738	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	739	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
754	return;	740	return;
755	}	741	}
756		742
757	if (op->env)	743	if (!op->is_on_map ())
758	{	744	{
759	/* Animation is currently handled by client, so nothing	745	/* Animation is currently handled by client, so nothing
760	* to do in this case.	746	* to do in this case.
761	*/	747	*/
762	return;	748	return;
763	}	749	}
764
765	/* If the map is saving, don't do anything as everything is
766	* going to get freed anyways.
767	*/
768	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
769	return;
770		750
771	/* make sure the object is within map boundaries */	751	/* make sure the object is within map boundaries */
772	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	752	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
773	{	753	{
774	LOG (llevError, "update_object() called for object out of map!\n");	754	LOG (llevError, "update_object() called for object out of map!\n");
…		…
929	* drop on that space.	909	* drop on that space.
930	*/	910	*/
931	if (!drop_to_ground	911	if (!drop_to_ground
932	\|\| !map	912	\|\| !map
933	\|\| map->in_memory != MAP_ACTIVE	913	\|\| map->in_memory != MAP_ACTIVE
934	\|\| map->nodrop	914	\|\| map->no_drop
935	\|\| ms ().move_block == MOVE_ALL)	915	\|\| ms ().move_block == MOVE_ALL)
936	{	916	{
937	while (inv)	917	while (inv)
938	{	918	{
939	inv->destroy_inv (false);	919	inv->destroy_inv (false);
…		…
964	object *op = new object;	944	object *op = new object;
965	op->link ();	945	op->link ();
966	return op;	946	return op;
967	}	947	}
968		948
		949	static struct freed_map : maptile
		950	{
		951	freed_map ()
		952	{
		953	path = "<freed objects map>";
		954	name = "/internal/freed_objects_map";
		955	width = 3;
		956	height = 3;
		957	no_drop = 1;
		958	no_reset = 1;
		959
		960	alloc ();
		961	in_memory = MAP_ACTIVE;
		962	}
		963
		964	~freed_map ()
		965	{
		966	destroy ();
		967	}
		968	} freed_map; // freed objects are moved here to avoid crashes
		969
969	void	970	void
970	object::do_destroy ()	971	object::do_destroy ()
971	{	972	{
972	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	974	remove_button_link (this);
…		…
983	unlink ();	984	unlink ();
984		985
985	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
986		987
987	// hack to ensure that freed objects still have a valid map	988	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	989	map = &freed_map;
1006	x = 1;	990	x = 1;
1007	y = 1;	991	y = 1;
1008	}
1009		992
1010	if (more)	993	if (more)
1011	{	994	{
1012	more->destroy ();	995	more->destroy ();
1013	more = 0;	996	more = 0;
…		…
1030		1013
1031	if (!is_head () && !head->destroyed ())	1014	if (!is_head () && !head->destroyed ())
1032	{	1015	{
1033	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1034	head->destroy (destroy_inventory);	1017	head->destroy (destroy_inventory);
		1018	return;
1035	}	1019	}
1036		1020
1037	destroy_inv (!destroy_inventory);	1021	destroy_inv (!destroy_inventory);
1038		1022
1039	if (is_head ())	1023	if (is_head ())
…		…
1061	if (flag [FLAG_REMOVED])	1045	if (flag [FLAG_REMOVED])
1062	return;	1046	return;
1063		1047
1064	INVOKE_OBJECT (REMOVE, this);	1048	INVOKE_OBJECT (REMOVE, this);
1065		1049
1066	if (object *pl = visible_to ())
1067	esrv_del_item (pl->contr, count);
1068
1069	flag [FLAG_REMOVED] = true;	1050	flag [FLAG_REMOVED] = true;
1070		1051
1071	if (more)	1052	if (more)
1072	more->remove ();	1053	more->remove ();
1073		1054
…		…
1075	* In this case, the object to be removed is in someones	1056	* In this case, the object to be removed is in someones
1076	* inventory.	1057	* inventory.
1077	*/	1058	*/
1078	if (env)	1059	if (env)
1079	{	1060	{
		1061	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1062	if (object *pl = visible_to ())
		1063	esrv_del_item (pl->contr, count);
		1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1065
1080	adjust_weight (env, -total_weight ());	1066	adjust_weight (env, -total_weight ());
1081
1082	*(above ? &above->below : &env->inv) = below;
1083
1084	if (below)
1085	below->above = above;
1086		1067
1087	/* we set up values so that it could be inserted into	1068	/* we set up values so that it could be inserted into
1088	* the map, but we don't actually do that - it is up	1069	* the map, but we don't actually do that - it is up
1089	* to the caller to decide what we want to do.	1070	* to the caller to decide what we want to do.
1090	*/	1071	*/
1091	map = env->map;	1072	map = env->map;
1092	x = env->x;	1073	x = env->x;
1093	y = env->y;	1074	y = env->y;
		1075
		1076	// make sure cmov optimisation is applicable
		1077	*(above ? &above->below : &env->inv) = below;
		1078	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1079
1094	above = 0;	1080	above = 0;
1095	below = 0;	1081	below = 0;
1096	env = 0;	1082	env = 0;
1097		1083
1098	/* NO_FIX_PLAYER is set when a great many changes are being	1084	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1102	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1103	otmp->update_stats ();	1089	otmp->update_stats ();
1104	}	1090	}
1105	else if (map)	1091	else if (map)
1106	{	1092	{
1107	if (type == PLAYER)
1108	{
1109	// leaving a spot always closes any open container on the ground
1110	if (container && !container->env)
1111	// this causes spurious floorbox updates, but it ensures
1112	// that the CLOSE event is being sent.
1113	close_container ();
1114
1115	--map->players;
1116	map->touch ();
1117	}
1118
1119	map->dirty = true;	1093	map->dirty = true;
1120	mapspace &ms = this->ms ();	1094	mapspace &ms = this->ms ();
1121		1095
		1096	if (object *pl = ms.player ())
		1097	{
		1098	if (type == PLAYER) // this == pl(!)
		1099	{
		1100	// leaving a spot always closes any open container on the ground
		1101	if (container && !container->env)
		1102	// this causes spurious floorbox updates, but it ensures
		1103	// that the CLOSE event is being sent.
		1104	close_container ();
		1105
		1106	--map->players;
		1107	map->touch ();
		1108	}
		1109	else if (pl->container == this)
		1110	{
		1111	// removing a container should close it
		1112	close_container ();
		1113	}
		1114
		1115	esrv_del_item (pl->contr, count);
		1116	}
		1117
1122	/* link the object above us */	1118	/* link the object above us */
1123	if (above)	1119	// re-link, make sure compiler can easily use cmove
1124	above->below = below;	1120	*(above ? &above->below : &ms.top) = below;
1125	else	1121	*(below ? &below->above : &ms.bot) = above;
1126	ms.top = below; /* we were top, set new top */
1127
1128	/* Relink the object below us, if there is one */
1129	if (below)
1130	below->above = above;
1131	else
1132	{
1133	/* Nothing below, which means we need to relink map object for this space
1134	* use translated coordinates in case some oddness with map tiling is
1135	* evident
1136	*/
1137	if (GET_MAP_OB (map, x, y) != this)
1138	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 ());
1139
1140	ms.bot = above; /* goes on above it. */
1141	}
1142		1122
1143	above = 0;	1123	above = 0;
1144	below = 0;	1124	below = 0;
1145		1125
1146	if (map->in_memory == MAP_SAVING)	1126	if (map->in_memory == MAP_SAVING)
…		…
1156	* appropriately.	1136	* appropriately.
1157	*/	1137	*/
1158	pl->close_container ();	1138	pl->close_container ();
1159		1139
1160	//TODO: the floorbox prev/next might need updating	1140	//TODO: the floorbox prev/next might need updating
1161	esrv_del_item (pl->contr, count);	1141	//esrv_del_item (pl->contr, count);
		1142	//TODO: update floorbox to preserve ordering
		1143	if (pl->contr->ns)
		1144	pl->contr->ns->floorbox_update ();
1162	}	1145	}
1163		1146
1164	for (tmp = ms.bot; tmp; tmp = tmp->above)	1147	for (tmp = ms.bot; tmp; tmp = tmp->above)
1165	{	1148	{
1166	/* No point updating the players look faces if he is the object	1149	/* No point updating the players look faces if he is the object
…		…
1258	* job preparing multi-part monsters.	1241	* job preparing multi-part monsters.
1259	*/	1242	*/
1260	object *	1243	object *
1261	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1244	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1262	{	1245	{
		1246	op->remove ();
		1247
1263	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1264	{	1249	{
1265	tmp->x = x + tmp->arch->x;	1250	tmp->x = x + tmp->arch->x;
1266	tmp->y = y + tmp->arch->y;	1251	tmp->y = y + tmp->arch->y;
1267	}	1252	}
…		…
1290	* just 'op' otherwise	1275	* just 'op' otherwise
1291	*/	1276	*/
1292	object *	1277	object *
1293	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1294	{	1279	{
1295	assert (!op->flag [FLAG_FREED]);	1280	if (op->is_on_map ())
		1281	{
		1282	LOG (llevError, "insert_ob_in_map called for object already on map");
		1283	abort ();
		1284	}
1296		1285
		1286	if (op->env)
		1287	{
		1288	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1297	op->remove ();	1289	op->remove ();
		1290	}
		1291
		1292	if (op->face && !face_info (op->face))//D TODO: remove soon
		1293	{//D
		1294	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1295	op->face = 1;//D
		1296	}//D
1298		1297
1299	/* Ideally, the caller figures this out. However, it complicates a lot	1298	/* Ideally, the caller figures this out. However, it complicates a lot
1300	* of areas of callers (eg, anything that uses find_free_spot would now	1299	* of areas of callers (eg, anything that uses find_free_spot would now
1301	* need extra work	1300	* need extra work
1302	*/	1301	*/
1303	if (!xy_normalise (m, op->x, op->y))	1302	if (!xy_normalise (m, op->x, op->y))
1304	{	1303	{
1305	op->destroy (1);	1304	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1306	return 0;	1305	return 0;
1307	}	1306	}
1308		1307
1309	if (object *more = op->more)	1308	if (object *more = op->more)
1310	if (!insert_ob_in_map (more, m, originator, flag))	1309	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1319	*/	1318	*/
1320	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
1321	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1322	if (object::can_merge (op, tmp))	1321	if (object::can_merge (op, tmp))
1323	{	1322	{
1324	// TODO: we atcually want to update tmp, not op,	1323	// TODO: we actually want to update tmp, not op,
1325	// but some caller surely breaks when we return tmp	1324	// but some caller surely breaks when we return tmp
1326	// from here :/	1325	// from here :/
1327	op->nrof += tmp->nrof;	1326	op->nrof += tmp->nrof;
1328	tmp->destroy (1);	1327	tmp->destroy (1);
1329	}	1328	}
…		…
1340	{	1339	{
1341	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1342	abort ();	1341	abort ();
1343	}	1342	}
1344		1343
		1344	if (!originator->is_on_map ())
		1345	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1346	op->debug_desc (), originator->debug_desc ());
		1347
1345	op->above = originator;	1348	op->above = originator;
1346	op->below = originator->below;	1349	op->below = originator->below;
1347
1348	if (op->below)
1349	op->below->above = op;
1350	else
1351	ms.bot = op;
1352
1353	/* since below originator, no need to update top */
1354	originator->below = op;	1350	originator->below = op;
		1351
		1352	*(op->below ? &op->below->above : &ms.bot) = op;
1355	}	1353	}
1356	else	1354	else
1357	{	1355	{
1358	object top, floor = NULL;	1356	object *floor = 0;
1359		1357	object *top = ms.top;
1360	top = ms.bot;
1361		1358
1362	/* If there are other objects, then */	1359	/* If there are other objects, then */
1363	if (top)	1360	if (top)
1364	{	1361	{
1365	object *last = 0;
1366
1367	/*	1362	/*
1368	* If there are multiple objects on this space, we do some trickier handling.	1363	* If there are multiple objects on this space, we do some trickier handling.
1369	* We've already dealt with merging if appropriate.	1364	* We've already dealt with merging if appropriate.
1370	* Generally, we want to put the new object on top. But if	1365	* Generally, we want to put the new object on top. But if
1371	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1366	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1374	* once we get to them. This reduces the need to traverse over all of	1369	* once we get to them. This reduces the need to traverse over all of
1375	* them when adding another one - this saves quite a bit of cpu time	1370	* them when adding another one - this saves quite a bit of cpu time
1376	* when lots of spells are cast in one area. Currently, it is presumed	1371	* when lots of spells are cast in one area. Currently, it is presumed
1377	* that flying non pickable objects are spell objects.	1372	* that flying non pickable objects are spell objects.
1378	*/	1373	*/
1379	for (top = ms.bot; top; top = top->above)	1374	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1380	{	1375	{
1381	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1376	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1382	floor = top;	1377	floor = tmp;
1383		1378
1384	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1379	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1385	{	1380	{
1386	/* We insert above top, so we want this object below this */	1381	/* We insert above top, so we want this object below this */
1387	top = top->below;	1382	top = tmp->below;
1388	break;	1383	break;
1389	}	1384	}
1390		1385
1391	last = top;	1386	top = tmp;
1392	}	1387	}
1393
1394	/* Don't want top to be NULL, so set it to the last valid object */
1395	top = last;
1396		1388
1397	/* We let update_position deal with figuring out what the space	1389	/* We let update_position deal with figuring out what the space
1398	* looks like instead of lots of conditions here.	1390	* looks like instead of lots of conditions here.
1399	* makes things faster, and effectively the same result.	1391	* makes things faster, and effectively the same result.
1400	*/	1392	*/
…		…
1407	*/	1399	*/
1408	if (!(flag & INS_ON_TOP)	1400	if (!(flag & INS_ON_TOP)
1409	&& ms.flags () & P_BLOCKSVIEW	1401	&& ms.flags () & P_BLOCKSVIEW
1410	&& (op->face && !faces [op->face].visibility))	1402	&& (op->face && !faces [op->face].visibility))
1411	{	1403	{
		1404	object *last;
		1405
1412	for (last = top; last != floor; last = last->below)	1406	for (last = top; last != floor; last = last->below)
1413	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1407	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1414	break;	1408	break;
1415		1409
1416	/* Check to see if we found the object that blocks view,	1410	/* Check to see if we found the object that blocks view,
…		…
1424	} /* If objects on this space */	1418	} /* If objects on this space */
1425		1419
1426	if (flag & INS_ABOVE_FLOOR_ONLY)	1420	if (flag & INS_ABOVE_FLOOR_ONLY)
1427	top = floor;	1421	top = floor;
1428		1422
1429	/* Top is the object that our object (op) is going to get inserted above.	1423	// insert object above top, or bottom-most if top = 0
1430	*/
1431
1432	/* First object on this space */
1433	if (!top)	1424	if (!top)
1434	{	1425	{
		1426	op->below = 0;
1435	op->above = ms.bot;	1427	op->above = ms.bot;
1436
1437	if (op->above)
1438	op->above->below = op;
1439
1440	op->below = 0;
1441	ms.bot = op;	1428	ms.bot = op;
		1429
		1430	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1431	}
1443	else	1432	else
1444	{ /* get inserted into the stack above top */	1433	{
1445	op->above = top->above;	1434	op->above = top->above;
1446
1447	if (op->above)
1448	op->above->below = op;	1435	top->above = op;
1449		1436
1450	op->below = top;	1437	op->below = top;
1451	top->above = op;	1438	*(op->above ? &op->above->below : &ms.top) = op;
1452	}	1439	}
1453		1440	}
1454	if (!op->above)
1455	ms.top = op;
1456	} /* else not INS_BELOW_ORIGINATOR */
1457		1441
1458	if (op->type == PLAYER)	1442	if (op->type == PLAYER)
1459	{	1443	{
1460	op->contr->do_los = 1;	1444	op->contr->do_los = 1;
1461	++op->map->players;	1445	++op->map->players;
…		…
1464		1448
1465	op->map->dirty = true;	1449	op->map->dirty = true;
1466		1450
1467	if (object *pl = ms.player ())	1451	if (object *pl = ms.player ())
1468	//TODO: the floorbox prev/next might need updating	1452	//TODO: the floorbox prev/next might need updating
1469	esrv_send_item (pl, op);	1453	//esrv_send_item (pl, op);
		1454	//TODO: update floorbox to preserve ordering
		1455	if (pl->contr->ns)
		1456	pl->contr->ns->floorbox_update ();
1470		1457
1471	/* If this object glows, it may affect lighting conditions that are	1458	/* If this object glows, it may affect lighting conditions that are
1472	* visible to others on this map. But update_all_los is really	1459	* visible to others on this map. But update_all_los is really
1473	* an inefficient way to do this, as it means los for all players	1460	* an inefficient way to do this, as it means los for all players
1474	* on the map will get recalculated. The players could very well	1461	* on the map will get recalculated. The players could very well
…		…
1594	}	1581	}
1595	else	1582	else
1596	{	1583	{
1597	decrease (nr);	1584	decrease (nr);
1598		1585
1599	object *op = object_create_clone (this);	1586	object *op = deep_clone ();
1600	op->nrof = nr;	1587	op->nrof = nr;
1601	return op;	1588	return op;
1602	}	1589	}
1603	}	1590	}
1604		1591
…		…
1825	LOG (llevError, "Present_arch called outside map.\n");	1812	LOG (llevError, "Present_arch called outside map.\n");
1826	return NULL;	1813	return NULL;
1827	}	1814	}
1828		1815
1829	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1816	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1830	if (tmp->arch == at)	1817	if (tmp->arch->archname == at->archname)
1831	return tmp;	1818	return tmp;
1832		1819
1833	return NULL;	1820	return NULL;
1834	}	1821	}
1835		1822
…		…
1899	* The first matching object is returned, or NULL if none.	1886	* The first matching object is returned, or NULL if none.
1900	*/	1887	*/
1901	object *	1888	object *
1902	present_arch_in_ob (const archetype at, const object op)	1889	present_arch_in_ob (const archetype at, const object op)
1903	{	1890	{
1904	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1891	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1905	if (tmp->arch == at)	1892	if (tmp->arch->archname == at->archname)
1906	return tmp;	1893	return tmp;
1907		1894
1908	return NULL;	1895	return NULL;
1909	}	1896	}
1910		1897
…		…
2319		2306
2320	/*	2307	/*
2321	* create clone from object to another	2308	* create clone from object to another
2322	*/	2309	*/
2323	object *	2310	object *
2324	object_create_clone (object *asrc)	2311	object::deep_clone ()
2325	{	2312	{
2326	object dst = 0, tmp, src, prev, *item;	2313	assert (("deep_clone called on non-head object", is_head ()));
2327		2314
2328	if (!asrc)	2315	object *dst = clone ();
2329	return 0;
2330		2316
2331	src = asrc->head_ ();	2317	object *prev = dst;
2332
2333	prev = 0;
2334	for (object *part = src; part; part = part->more)	2318	for (object *part = this->more; part; part = part->more)
2335	{	2319	{
2336	tmp = part->clone ();	2320	object *tmp = part->clone ();
2337	tmp->x -= src->x;
2338	tmp->y -= src->y;
2339
2340	if (!part->head)
2341	{
2342	dst = tmp;
2343	tmp->head = 0;
2344	}
2345	else
2346	tmp->head = dst;	2321	tmp->head = dst;
2347
2348	tmp->more = 0;
2349
2350	if (prev)
2351	prev->more = tmp;	2322	prev->more = tmp;
2352
2353	prev = tmp;	2323	prev = tmp;
2354	}	2324	}
2355		2325
2356	for (item = src->inv; item; item = item->below)	2326	for (object *item = inv; item; item = item->below)
2357	insert_ob_in_ob (object_create_clone (item), dst);	2327	insert_ob_in_ob (item->deep_clone (), dst);
2358		2328
2359	return dst;	2329	return dst;
2360	}	2330	}
2361		2331
2362	/* This returns the first object in who's inventory that	2332	/* This returns the first object in who's inventory that
…		…
2371	return tmp;	2341	return tmp;
2372		2342
2373	return 0;	2343	return 0;
2374	}	2344	}
2375		2345
2376	/* If ob has a field named key, return the link from the list,	2346	const shstr &
2377	* otherwise return NULL.	2347	object::kv_get (const shstr &key) const
2378	*
2379	* key must be a passed in shared string - otherwise, this won't
2380	* do the desired thing.
2381	*/
2382	key_value *
2383	get_ob_key_link (const object ob, const char key)
2384	{	2348	{
2385	for (key_value *link = ob->key_values; link; link = link->next)	2349	for (key_value *kv = key_values; kv; kv = kv->next)
2386	if (link->key == key)	2350	if (kv->key == key)
2387	return link;
2388
2389	return 0;
2390	}
2391
2392	/*
2393	* Returns the value of op has an extra_field for key, or NULL.
2394	*
2395	* The argument doesn't need to be a shared string.
2396	*
2397	* The returned string is shared.
2398	*/
2399	const char *
2400	get_ob_key_value (const object op, const char const key)
2401	{
2402	key_value *link;
2403	shstr_cmp canonical_key (key);
2404
2405	if (!canonical_key)
2406	{
2407	/* 1. There being a field named key on any object
2408	* implies there'd be a shared string to find.
2409	* 2. Since there isn't, no object has this field.
2410	* 3. Therefore, this object doesn't have this field.
2411	*/
2412	return 0;
2413	}
2414
2415	/* This is copied from get_ob_key_link() above -
2416	* only 4 lines, and saves the function call overhead.
2417	*/
2418	for (link = op->key_values; link; link = link->next)
2419	if (link->key == canonical_key)
2420	return link->value;	2351	return kv->value;
2421		2352
2422	return 0;	2353	return shstr_null;
2423	}	2354	}
2424		2355
2425	/*	2356	void
2426	* Updates the canonical_key in op to value.	2357	object::kv_set (const shstr &key, const shstr &value)
2427	*
2428	* canonical_key is a shared string (value doesn't have to be).
2429	*
2430	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2431	* keys.
2432	*
2433	* Returns TRUE on success.
2434	*/
2435	int
2436	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2437	{	2358	{
2438	key_value field = NULL, last = NULL;	2359	for (key_value *kv = key_values; kv; kv = kv->next)
2439		2360	if (kv->key == key)
2440	for (field = op->key_values; field != NULL; field = field->next)
2441	{
2442	if (field->key != canonical_key)
2443	{	2361	{
2444	last = field;	2362	kv->value = value;
2445	continue;	2363	return;
2446	}	2364	}
2447		2365
2448	if (value)	2366	key_value *kv = new key_value;
2449	field->value = value;	2367
2450	else	2368	kv->next = key_values;
		2369	kv->key = key;
		2370	kv->value = value;
		2371
		2372	key_values = kv;
		2373	}
		2374
		2375	void
		2376	object::kv_del (const shstr &key)
		2377	{
		2378	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2379	if ((*kvp)->key == key)
2451	{	2380	{
2452	/* Basically, if the archetype has this key set,	2381	key_value kv = kvp;
2453	* we need to store the null value so when we save	2382	kvp = (kvp)->next;
2454	* it, we save the empty value so that when we load,	2383	delete kv;
2455	* we get this value back again.	2384	return;
2456	*/
2457	if (get_ob_key_link (op->arch, canonical_key))
2458	field->value = 0;
2459	else
2460	{
2461	if (last)
2462	last->next = field->next;
2463	else
2464	op->key_values = field->next;
2465
2466	delete field;
2467	}
2468	}	2385	}
2469	return TRUE;
2470	}
2471	/* IF we get here, key doesn't exist */
2472
2473	/* No field, we'll have to add it. */
2474
2475	if (!add_key)
2476	return FALSE;
2477
2478	/* There isn't any good reason to store a null
2479	* value in the key/value list. If the archetype has
2480	* this key, then we should also have it, so shouldn't
2481	* be here. If user wants to store empty strings,
2482	* should pass in ""
2483	*/
2484	if (value == NULL)
2485	return TRUE;
2486
2487	field = new key_value;
2488
2489	field->key = canonical_key;
2490	field->value = value;
2491	/* Usual prepend-addition. */
2492	field->next = op->key_values;
2493	op->key_values = field;
2494
2495	return TRUE;
2496	}
2497
2498	/*
2499	* Updates the key in op to value.
2500	*
2501	* If add_key is FALSE, this will only update existing keys,
2502	* and not add new ones.
2503	* In general, should be little reason FALSE is ever passed in for add_key
2504	*
2505	* Returns TRUE on success.
2506	*/
2507	int
2508	set_ob_key_value (object op, const char key, const char *value, int add_key)
2509	{
2510	shstr key_ (key);
2511
2512	return set_ob_key_value_s (op, key_, value, add_key);
2513	}	2386	}
2514		2387
2515	object::depth_iterator::depth_iterator (object *container)	2388	object::depth_iterator::depth_iterator (object *container)
2516	: iterator_base (container)	2389	: iterator_base (container)
2517	{	2390	{
…		…
2567	{	2440	{
2568	char flagdesc[512];	2441	char flagdesc[512];
2569	char info2[256 * 4];	2442	char info2[256 * 4];
2570	char *p = info;	2443	char *p = info;
2571		2444
2572	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2445	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2573	count,	2446	count,
2574	uuid.c_str (),	2447	uuid.c_str (),
2575	&name,	2448	&name,
2576	title ? "\",title:\"" : "",	2449	title ? ",title:\"" : "",
2577	title ? (const char *)title : "",	2450	title ? (const char *)title : "",
		2451	title ? "\"" : "",
2578	flag_desc (flagdesc, 512), type);	2452	flag_desc (flagdesc, 512), type);
2579		2453
2580	if (!flag[FLAG_REMOVED] && env)	2454	if (!flag[FLAG_REMOVED] && env)
2581	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2455	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2582		2456
…		…
2615	object::open_container (object *new_container)	2489	object::open_container (object *new_container)
2616	{	2490	{
2617	if (container == new_container)	2491	if (container == new_container)
2618	return;	2492	return;
2619		2493
2620	if (object *old_container = container)	2494	object *old_container = container;
		2495
		2496	if (old_container)
2621	{	2497	{
2622	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2498	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2623	return;	2499	return;
2624		2500
2625	#if 0	2501	#if 0
…		…
2627	if (object *closer = old_container->inv)	2503	if (object *closer = old_container->inv)
2628	if (closer->type == CLOSE_CON)	2504	if (closer->type == CLOSE_CON)
2629	closer->destroy ();	2505	closer->destroy ();
2630	#endif	2506	#endif
2631		2507
		2508	// make sure the container is available
		2509	esrv_send_item (this, old_container);
		2510
2632	old_container->flag [FLAG_APPLIED] = false;	2511	old_container->flag [FLAG_APPLIED] = false;
2633	container = 0;	2512	container = 0;
2634		2513
		2514	// client needs item update to make it work, client bug requires this to be separate
2635	esrv_update_item (UPD_FLAGS, this, old_container);	2515	esrv_update_item (UPD_FLAGS, this, old_container);
		2516
2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2517	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2637	play_sound (sound_find ("chest_close"));	2518	play_sound (sound_find ("chest_close"));
2638	}	2519	}
2639		2520
2640	if (new_container)	2521	if (new_container)
…		…
2653	}	2534	}
2654	#endif	2535	#endif
2655		2536
2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2537	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2657		2538
		2539	// make sure the container is available, client bug requires this to be separate
		2540	esrv_send_item (this, new_container);
		2541
2658	new_container->flag [FLAG_APPLIED] = true;	2542	new_container->flag [FLAG_APPLIED] = true;
2659	container = new_container;	2543	container = new_container;
2660		2544
		2545	// client needs flag change
2661	esrv_update_item (UPD_FLAGS, this, new_container);	2546	esrv_update_item (UPD_FLAGS, this, new_container);
2662	esrv_send_inventory (this, new_container);	2547	esrv_send_inventory (this, new_container);
2663	play_sound (sound_find ("chest_open"));	2548	play_sound (sound_find ("chest_open"));
2664	}	2549	}
		2550	// else if (!old_container->env && contr && contr->ns)
		2551	// contr->ns->floorbox_reset ();
2665	}	2552	}
2666		2553
2667	object *	2554	object *
2668	object::force_find (const shstr name)	2555	object::force_find (const shstr name)
2669	{	2556	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs. Revision 1.245 by root, Sun May 18 19:53:07 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs.
Revision 1.245 by root, Sun May 18 19:53:07 2008 UTC