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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC vs.
Revision 1.249 by root, Tue Jul 15 20:41:58 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
…		…
334		321
335	// find player who can see this object	322	// find player who can see this object
336	object *	323	object *
337	object::visible_to () const	324	object::visible_to () const
338	{	325	{
339	if (!flag [FLAG_REMOVED])	326	if (client_visible () && !flag [FLAG_REMOVED])
340	{	327	{
341	// see if we are in a container of sorts	328	// see if we are in a container of sorts
342	if (env)	329	if (env)
343	{	330	{
344	// the player inventory itself is always visible	331	// the player inventory itself is always visible
…		…
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)
		351	\|\| this == pl->container)
363	return pl;	352	return pl;
364	}	353	}
365	}	354	}
366		355
367	return 0;	356	return 0;
368	}	357	}
369		358
370	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
371	static sint32	360	static sint32
372	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
373	{	362	{
374	return op->type == CONTAINER	363	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	365	: weight;
377	}	366	}
…		…
383	static void	372	static void
384	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
385	{	374	{
386	while (op)	375	while (op)
387	{	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
388	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
389		381
390	if (!weight)	382	if (!weight)
391	return;	383	return;
392		384
393	op->carrying += weight;	385	op->carrying += weight;
…		…
416	op->update_weight ();	408	op->update_weight ();
417		409
418	sum += op->total_weight ();	410	sum += op->total_weight ();
419	}	411	}
420		412
421	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
422		414
423	if (sum != carrying)	415	if (sum != carrying)
424	{	416	{
425	carrying = sum;	417	carrying = sum;
426		418
…		…
488	*/	480	*/
489	object *	481	object *
490	find_object_name (const char *str)	482	find_object_name (const char *str)
491	{	483	{
492	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
493	object *op;
494		485
		486	if (str_)
495	for_all_objects (op)	487	for_all_objects (op)
496	if (op->name == str_)	488	if (op->name == str_)
497	break;	489	return op;
498		490
499	return op;	491	return 0;
500	}	492	}
501		493
502	/*	494	/*
503	* 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
504	* skill and experience objects.	496	* skill and experience objects.
…		…
602	}	594	}
603		595
604	op->key_values = 0;	596	op->key_values = 0;
605	}	597	}
606		598
607	object &	599	/*
608	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)
609	{	609	{
610	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	(object_copy )this = src;	611	(object_copy )dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
617		613
618	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
619	if (src.key_values)	615	if (key_values)
620	{	616	{
621	key_value *tail = 0;	617	key_value *tail = 0;
622	key_values = 0;	618	dst->key_values = 0;
623		619
624	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
625	{	621	{
626	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
627		623
628	new_link->next = 0;	624	new_link->next = 0;
629	new_link->key = i->key;	625	new_link->key = i->key;
630	new_link->value = i->value;	626	new_link->value = i->value;
631		627
632	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
633	if (!key_values)	629	if (!dst->key_values)
634	{	630	{
635	key_values = new_link;	631	dst->key_values = new_link;
636	tail = new_link;	632	tail = new_link;
637	}	633	}
638	else	634	else
639	{	635	{
640	tail->next = new_link;	636	tail->next = new_link;
641	tail = new_link;	637	tail = new_link;
642	}	638	}
643	}	639	}
644	}	640	}
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		641
660	if (speed < 0)	642	if (speed < 0)
661	dst->speed_left -= rndm ();	643	dst->speed_left -= rndm ();
662		644
663	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
…		…
685	object *	667	object *
686	object::clone ()	668	object::clone ()
687	{	669	{
688	object *neu = create ();	670	object *neu = create ();
689	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
690	return neu;	673	return neu;
691	}	674	}
692		675
693	/*	676	/*
694	* 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
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
746	*/	729	*/
747	void	730	void
748	update_object (object *op, int action)	731	update_object (object *op, int action)
749	{	732	{
750	if (op == NULL)	733	if (!op)
751	{	734	{
752	/* this should never happen */	735	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
754	return;	737	return;
755	}	738	}
756		739
757	if (op->env)	740	if (!op->is_on_map ())
758	{	741	{
759	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
760	* to do in this case.	743	* to do in this case.
761	*/	744	*/
762	return;	745	return;
763	}	746	}
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		747
771	/* make sure the object is within map boundaries */	748	/* 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)	749	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
773	{	750	{
774	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
929	* drop on that space.	906	* drop on that space.
930	*/	907	*/
931	if (!drop_to_ground	908	if (!drop_to_ground
932	\|\| !map	909	\|\| !map
933	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
934	\|\| map->nodrop	911	\|\| map->no_drop
935	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
936	{	913	{
937	while (inv)	914	while (inv)
938	{	915	{
939	inv->destroy_inv (false);	916	inv->destroy_inv (false);
…		…
964	object *op = new object;	941	object *op = new object;
965	op->link ();	942	op->link ();
966	return op;	943	return op;
967	}	944	}
968		945
		946	static struct freed_map : maptile
		947	{
		948	freed_map ()
		949	{
		950	path = "<freed objects map>";
		951	name = "/internal/freed_objects_map";
		952	width = 3;
		953	height = 3;
		954	no_drop = 1;
		955	no_reset = 1;
		956
		957	alloc ();
		958	in_memory = MAP_ACTIVE;
		959	}
		960
		961	~freed_map ()
		962	{
		963	destroy ();
		964	}
		965	} freed_map; // freed objects are moved here to avoid crashes
		966
969	void	967	void
970	object::do_destroy ()	968	object::do_destroy ()
971	{	969	{
972	if (flag [FLAG_IS_LINKED])	970	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	971	remove_button_link (this);
…		…
983	unlink ();	981	unlink ();
984		982
985	flag [FLAG_FREED] = 1;	983	flag [FLAG_FREED] = 1;
986		984
987	// hack to ensure that freed objects still have a valid map	985	// 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;	986	map = &freed_map;
1006	x = 1;	987	x = 1;
1007	y = 1;	988	y = 1;
1008	}
1009		989
1010	if (more)	990	if (more)
1011	{	991	{
1012	more->destroy ();	992	more->destroy ();
1013	more = 0;	993	more = 0;
…		…
1025	void	1005	void
1026	object::destroy (bool destroy_inventory)	1006	object::destroy (bool destroy_inventory)
1027	{	1007	{
1028	if (destroyed ())	1008	if (destroyed ())
1029	return;	1009	return;
		1010
		1011	if (!is_head () && !head->destroyed ())
		1012	{
		1013	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1014	head->destroy (destroy_inventory);
		1015	return;
		1016	}
1030		1017
1031	destroy_inv (!destroy_inventory);	1018	destroy_inv (!destroy_inventory);
1032		1019
1033	if (is_head ())	1020	if (is_head ())
1034	if (sound_destroy)	1021	if (sound_destroy)
…		…
1055	if (flag [FLAG_REMOVED])	1042	if (flag [FLAG_REMOVED])
1056	return;	1043	return;
1057		1044
1058	INVOKE_OBJECT (REMOVE, this);	1045	INVOKE_OBJECT (REMOVE, this);
1059		1046
1060	if (object *pl = visible_to ())
1061	esrv_del_item (pl->contr, count);
1062
1063	flag [FLAG_REMOVED] = true;	1047	flag [FLAG_REMOVED] = true;
1064		1048
1065	if (more)	1049	if (more)
1066	more->remove ();	1050	more->remove ();
1067		1051
…		…
1069	* In this case, the object to be removed is in someones	1053	* In this case, the object to be removed is in someones
1070	* inventory.	1054	* inventory.
1071	*/	1055	*/
1072	if (env)	1056	if (env)
1073	{	1057	{
		1058	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1059	if (object *pl = visible_to ())
		1060	esrv_del_item (pl->contr, count);
		1061	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1062
1074	adjust_weight (env, -total_weight ());	1063	adjust_weight (env, -total_weight ());
1075
1076	*(above ? &above->below : &env->inv) = below;
1077
1078	if (below)
1079	below->above = above;
1080		1064
1081	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1082	* the map, but we don't actually do that - it is up	1066	* the map, but we don't actually do that - it is up
1083	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1084	*/	1068	*/
1085	map = env->map;	1069	map = env->map;
1086	x = env->x;	1070	x = env->x;
1087	y = env->y;	1071	y = env->y;
		1072
		1073	// make sure cmov optimisation is applicable
		1074	*(above ? &above->below : &env->inv) = below;
		1075	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1076
1088	above = 0;	1077	above = 0;
1089	below = 0;	1078	below = 0;
1090	env = 0;	1079	env = 0;
1091		1080
1092	/* NO_FIX_PLAYER is set when a great many changes are being	1081	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1096	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1085	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1097	otmp->update_stats ();	1086	otmp->update_stats ();
1098	}	1087	}
1099	else if (map)	1088	else if (map)
1100	{	1089	{
1101	if (type == PLAYER)
1102	{
1103	// leaving a spot always closes any open container on the ground
1104	if (container && !container->env)
1105	// this causes spurious floorbox updates, but it ensures
1106	// that the CLOSE event is being sent.
1107	close_container ();
1108
1109	--map->players;
1110	map->touch ();
1111	}
1112
1113	map->dirty = true;	1090	map->dirty = true;
1114	mapspace &ms = this->ms ();	1091	mapspace &ms = this->ms ();
1115		1092
		1093	if (object *pl = ms.player ())
		1094	{
		1095	if (type == PLAYER) // this == pl(!)
		1096	{
		1097	// leaving a spot always closes any open container on the ground
		1098	if (container && !container->env)
		1099	// this causes spurious floorbox updates, but it ensures
		1100	// that the CLOSE event is being sent.
		1101	close_container ();
		1102
		1103	--map->players;
		1104	map->touch ();
		1105	}
		1106	else if (pl->container == this)
		1107	{
		1108	// removing a container should close it
		1109	close_container ();
		1110	}
		1111
		1112	esrv_del_item (pl->contr, count);
		1113	}
		1114
1116	/* link the object above us */	1115	/* link the object above us */
1117	if (above)	1116	// re-link, make sure compiler can easily use cmove
1118	above->below = below;	1117	*(above ? &above->below : &ms.top) = below;
1119	else	1118	*(below ? &below->above : &ms.bot) = above;
1120	ms.top = below; /* we were top, set new top */
1121
1122	/* Relink the object below us, if there is one */
1123	if (below)
1124	below->above = above;
1125	else
1126	{
1127	/* Nothing below, which means we need to relink map object for this space
1128	* use translated coordinates in case some oddness with map tiling is
1129	* evident
1130	*/
1131	if (GET_MAP_OB (map, x, y) != this)
1132	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 ());
1133
1134	ms.bot = above; /* goes on above it. */
1135	}
1136		1119
1137	above = 0;	1120	above = 0;
1138	below = 0;	1121	below = 0;
1139		1122
1140	if (map->in_memory == MAP_SAVING)	1123	if (map->in_memory == MAP_SAVING)
…		…
1150	* appropriately.	1133	* appropriately.
1151	*/	1134	*/
1152	pl->close_container ();	1135	pl->close_container ();
1153		1136
1154	//TODO: the floorbox prev/next might need updating	1137	//TODO: the floorbox prev/next might need updating
1155	esrv_del_item (pl->contr, count);	1138	//esrv_del_item (pl->contr, count);
		1139	//TODO: update floorbox to preserve ordering
		1140	if (pl->contr->ns)
		1141	pl->contr->ns->floorbox_update ();
1156	}	1142	}
1157		1143
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1144	for (tmp = ms.bot; tmp; tmp = tmp->above)
1159	{	1145	{
1160	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
…		…
1252	* job preparing multi-part monsters.	1238	* job preparing multi-part monsters.
1253	*/	1239	*/
1254	object *	1240	object *
1255	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1241	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1256	{	1242	{
		1243	op->remove ();
		1244
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1245	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1246	{
1259	tmp->x = x + tmp->arch->x;	1247	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1248	tmp->y = y + tmp->arch->y;
1261	}	1249	}
…		…
1284	* just 'op' otherwise	1272	* just 'op' otherwise
1285	*/	1273	*/
1286	object *	1274	object *
1287	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1275	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1288	{	1276	{
1289	assert (!op->flag [FLAG_FREED]);	1277	if (op->is_on_map ())
		1278	{
		1279	LOG (llevError, "insert_ob_in_map called for object already on map");
		1280	abort ();
		1281	}
1290		1282
		1283	if (op->env)
		1284	{
		1285	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1291	op->remove ();	1286	op->remove ();
		1287	}
		1288
		1289	if (op->face && !face_info (op->face))//D TODO: remove soon
		1290	{//D
		1291	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1292	op->face = 1;//D
		1293	}//D
1292		1294
1293	/* Ideally, the caller figures this out. However, it complicates a lot	1295	/* Ideally, the caller figures this out. However, it complicates a lot
1294	* of areas of callers (eg, anything that uses find_free_spot would now	1296	* of areas of callers (eg, anything that uses find_free_spot would now
1295	* need extra work	1297	* need extra work
1296	*/	1298	*/
1297	if (!xy_normalise (m, op->x, op->y))	1299	if (!xy_normalise (m, op->x, op->y))
1298	{	1300	{
1299	op->destroy (1);	1301	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1300	return 0;	1302	return 0;
1301	}	1303	}
1302		1304
1303	if (object *more = op->more)	1305	if (object *more = op->more)
1304	if (!insert_ob_in_map (more, m, originator, flag))	1306	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1313	*/	1315	*/
1314	if (op->nrof && !(flag & INS_NO_MERGE))	1316	if (op->nrof && !(flag & INS_NO_MERGE))
1315	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1316	if (object::can_merge (op, tmp))	1318	if (object::can_merge (op, tmp))
1317	{	1319	{
1318	// TODO: we atcually want to update tmp, not op,	1320	// TODO: we actually want to update tmp, not op,
1319	// but some caller surely breaks when we return tmp	1321	// but some caller surely breaks when we return tmp
1320	// from here :/	1322	// from here :/
1321	op->nrof += tmp->nrof;	1323	op->nrof += tmp->nrof;
1322	tmp->destroy (1);	1324	tmp->destroy (1);
1323	}	1325	}
…		…
1334	{	1336	{
1335	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1337	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1336	abort ();	1338	abort ();
1337	}	1339	}
1338		1340
		1341	if (!originator->is_on_map ())
		1342	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1343	op->debug_desc (), originator->debug_desc ());
		1344
1339	op->above = originator;	1345	op->above = originator;
1340	op->below = originator->below;	1346	op->below = originator->below;
1341
1342	if (op->below)
1343	op->below->above = op;
1344	else
1345	ms.bot = op;
1346
1347	/* since below originator, no need to update top */
1348	originator->below = op;	1347	originator->below = op;
		1348
		1349	*(op->below ? &op->below->above : &ms.bot) = op;
1349	}	1350	}
1350	else	1351	else
1351	{	1352	{
1352	object top, floor = NULL;	1353	object *floor = 0;
1353		1354	object *top = ms.top;
1354	top = ms.bot;
1355		1355
1356	/* If there are other objects, then */	1356	/* If there are other objects, then */
1357	if (top)	1357	if (top)
1358	{	1358	{
1359	object *last = 0;
1360
1361	/*	1359	/*
1362	* If there are multiple objects on this space, we do some trickier handling.	1360	* If there are multiple objects on this space, we do some trickier handling.
1363	* We've already dealt with merging if appropriate.	1361	* We've already dealt with merging if appropriate.
1364	* Generally, we want to put the new object on top. But if	1362	* Generally, we want to put the new object on top. But if
1365	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1363	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1368	* once we get to them. This reduces the need to traverse over all of	1366	* once we get to them. This reduces the need to traverse over all of
1369	* them when adding another one - this saves quite a bit of cpu time	1367	* them when adding another one - this saves quite a bit of cpu time
1370	* when lots of spells are cast in one area. Currently, it is presumed	1368	* when lots of spells are cast in one area. Currently, it is presumed
1371	* that flying non pickable objects are spell objects.	1369	* that flying non pickable objects are spell objects.
1372	*/	1370	*/
1373	for (top = ms.bot; top; top = top->above)	1371	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1374	{	1372	{
1375	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1373	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1376	floor = top;	1374	floor = tmp;
1377		1375
1378	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1376	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1379	{	1377	{
1380	/* We insert above top, so we want this object below this */	1378	/* We insert above top, so we want this object below this */
1381	top = top->below;	1379	top = tmp->below;
1382	break;	1380	break;
1383	}	1381	}
1384		1382
1385	last = top;	1383	top = tmp;
1386	}	1384	}
1387
1388	/* Don't want top to be NULL, so set it to the last valid object */
1389	top = last;
1390		1385
1391	/* We let update_position deal with figuring out what the space	1386	/* We let update_position deal with figuring out what the space
1392	* looks like instead of lots of conditions here.	1387	* looks like instead of lots of conditions here.
1393	* makes things faster, and effectively the same result.	1388	* makes things faster, and effectively the same result.
1394	*/	1389	*/
…		…
1401	*/	1396	*/
1402	if (!(flag & INS_ON_TOP)	1397	if (!(flag & INS_ON_TOP)
1403	&& ms.flags () & P_BLOCKSVIEW	1398	&& ms.flags () & P_BLOCKSVIEW
1404	&& (op->face && !faces [op->face].visibility))	1399	&& (op->face && !faces [op->face].visibility))
1405	{	1400	{
		1401	object *last;
		1402
1406	for (last = top; last != floor; last = last->below)	1403	for (last = top; last != floor; last = last->below)
1407	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1408	break;	1405	break;
1409		1406
1410	/* Check to see if we found the object that blocks view,	1407	/* Check to see if we found the object that blocks view,
…		…
1418	} /* If objects on this space */	1415	} /* If objects on this space */
1419		1416
1420	if (flag & INS_ABOVE_FLOOR_ONLY)	1417	if (flag & INS_ABOVE_FLOOR_ONLY)
1421	top = floor;	1418	top = floor;
1422		1419
1423	/* Top is the object that our object (op) is going to get inserted above.	1420	// insert object above top, or bottom-most if top = 0
1424	*/
1425
1426	/* First object on this space */
1427	if (!top)	1421	if (!top)
1428	{	1422	{
		1423	op->below = 0;
1429	op->above = ms.bot;	1424	op->above = ms.bot;
1430
1431	if (op->above)
1432	op->above->below = op;
1433
1434	op->below = 0;
1435	ms.bot = op;	1425	ms.bot = op;
		1426
		1427	*(op->above ? &op->above->below : &ms.top) = op;
1436	}	1428	}
1437	else	1429	else
1438	{ /* get inserted into the stack above top */	1430	{
1439	op->above = top->above;	1431	op->above = top->above;
1440
1441	if (op->above)
1442	op->above->below = op;	1432	top->above = op;
1443		1433
1444	op->below = top;	1434	op->below = top;
1445	top->above = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1446	}	1436	}
1447		1437	}
1448	if (!op->above)
1449	ms.top = op;
1450	} /* else not INS_BELOW_ORIGINATOR */
1451		1438
1452	if (op->type == PLAYER)	1439	if (op->type == PLAYER)
1453	{	1440	{
1454	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
1455	++op->map->players;	1442	++op->map->players;
…		…
1458		1445
1459	op->map->dirty = true;	1446	op->map->dirty = true;
1460		1447
1461	if (object *pl = ms.player ())	1448	if (object *pl = ms.player ())
1462	//TODO: the floorbox prev/next might need updating	1449	//TODO: the floorbox prev/next might need updating
1463	esrv_send_item (pl, op);	1450	//esrv_send_item (pl, op);
		1451	//TODO: update floorbox to preserve ordering
		1452	if (pl->contr->ns)
		1453	pl->contr->ns->floorbox_update ();
1464		1454
1465	/* If this object glows, it may affect lighting conditions that are	1455	/* If this object glows, it may affect lighting conditions that are
1466	* visible to others on this map. But update_all_los is really	1456	* visible to others on this map. But update_all_los is really
1467	* an inefficient way to do this, as it means los for all players	1457	* an inefficient way to do this, as it means los for all players
1468	* on the map will get recalculated. The players could very well	1458	* on the map will get recalculated. The players could very well
…		…
1552		1542
1553	nrof -= nr;	1543	nrof -= nr;
1554		1544
1555	if (nrof)	1545	if (nrof)
1556	{	1546	{
1557	adjust_weight (env, -weight * nr); // carrying == 0	1547	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1558		1548
1559	if (object *pl = visible_to ())	1549	if (object *pl = visible_to ())
1560	esrv_update_item (UPD_NROF, pl, this);	1550	esrv_update_item (UPD_NROF, pl, this);
1561		1551
1562	return true;	1552	return true;
1563	}	1553	}
1564	else	1554	else
1565	{	1555	{
1566	destroy (1);	1556	destroy ();
1567	return false;	1557	return false;
1568	}	1558	}
1569	}	1559	}
1570		1560
1571	/*	1561	/*
…		…
1588	}	1578	}
1589	else	1579	else
1590	{	1580	{
1591	decrease (nr);	1581	decrease (nr);
1592		1582
1593	object *op = object_create_clone (this);	1583	object *op = deep_clone ();
1594	op->nrof = nr;	1584	op->nrof = nr;
1595	return op;	1585	return op;
1596	}	1586	}
1597	}	1587	}
1598		1588
…		…
1819	LOG (llevError, "Present_arch called outside map.\n");	1809	LOG (llevError, "Present_arch called outside map.\n");
1820	return NULL;	1810	return NULL;
1821	}	1811	}
1822		1812
1823	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1813	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1824	if (tmp->arch == at)	1814	if (tmp->arch->archname == at->archname)
1825	return tmp;	1815	return tmp;
1826		1816
1827	return NULL;	1817	return NULL;
1828	}	1818	}
1829		1819
…		…
1893	* The first matching object is returned, or NULL if none.	1883	* The first matching object is returned, or NULL if none.
1894	*/	1884	*/
1895	object *	1885	object *
1896	present_arch_in_ob (const archetype at, const object op)	1886	present_arch_in_ob (const archetype at, const object op)
1897	{	1887	{
1898	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1888	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	if (tmp->arch == at)	1889	if (tmp->arch->archname == at->archname)
1900	return tmp;	1890	return tmp;
1901		1891
1902	return NULL;	1892	return NULL;
1903	}	1893	}
1904		1894
…		…
2313		2303
2314	/*	2304	/*
2315	* create clone from object to another	2305	* create clone from object to another
2316	*/	2306	*/
2317	object *	2307	object *
2318	object_create_clone (object *asrc)	2308	object::deep_clone ()
2319	{	2309	{
2320	object dst = 0, tmp, src, prev, *item;	2310	assert (("deep_clone called on non-head object", is_head ()));
2321		2311
2322	if (!asrc)	2312	object *dst = clone ();
2323	return 0;
2324		2313
2325	src = asrc->head_ ();	2314	object *prev = dst;
2326
2327	prev = 0;
2328	for (object *part = src; part; part = part->more)	2315	for (object *part = this->more; part; part = part->more)
2329	{	2316	{
2330	tmp = part->clone ();	2317	object *tmp = part->clone ();
2331	tmp->x -= src->x;
2332	tmp->y -= src->y;
2333
2334	if (!part->head)
2335	{
2336	dst = tmp;
2337	tmp->head = 0;
2338	}
2339	else
2340	tmp->head = dst;	2318	tmp->head = dst;
2341
2342	tmp->more = 0;
2343
2344	if (prev)
2345	prev->more = tmp;	2319	prev->more = tmp;
2346
2347	prev = tmp;	2320	prev = tmp;
2348	}	2321	}
2349		2322
2350	for (item = src->inv; item; item = item->below)	2323	for (object *item = inv; item; item = item->below)
2351	insert_ob_in_ob (object_create_clone (item), dst);	2324	insert_ob_in_ob (item->deep_clone (), dst);
2352		2325
2353	return dst;	2326	return dst;
2354	}	2327	}
2355		2328
2356	/* This returns the first object in who's inventory that	2329	/* This returns the first object in who's inventory that
…		…
2365	return tmp;	2338	return tmp;
2366		2339
2367	return 0;	2340	return 0;
2368	}	2341	}
2369		2342
2370	/* If ob has a field named key, return the link from the list,	2343	const shstr &
2371	* otherwise return NULL.	2344	object::kv_get (const shstr &key) const
2372	*
2373	* key must be a passed in shared string - otherwise, this won't
2374	* do the desired thing.
2375	*/
2376	key_value *
2377	get_ob_key_link (const object ob, const char key)
2378	{	2345	{
2379	for (key_value *link = ob->key_values; link; link = link->next)	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2380	if (link->key == key)	2347	if (kv->key == key)
2381	return link;
2382
2383	return 0;
2384	}
2385
2386	/*
2387	* Returns the value of op has an extra_field for key, or NULL.
2388	*
2389	* The argument doesn't need to be a shared string.
2390	*
2391	* The returned string is shared.
2392	*/
2393	const char *
2394	get_ob_key_value (const object op, const char const key)
2395	{
2396	key_value *link;
2397	shstr_cmp canonical_key (key);
2398
2399	if (!canonical_key)
2400	{
2401	/* 1. There being a field named key on any object
2402	* implies there'd be a shared string to find.
2403	* 2. Since there isn't, no object has this field.
2404	* 3. Therefore, this object doesn't have this field.
2405	*/
2406	return 0;
2407	}
2408
2409	/* This is copied from get_ob_key_link() above -
2410	* only 4 lines, and saves the function call overhead.
2411	*/
2412	for (link = op->key_values; link; link = link->next)
2413	if (link->key == canonical_key)
2414	return link->value;	2348	return kv->value;
2415		2349
2416	return 0;	2350	return shstr_null;
2417	}	2351	}
2418		2352
2419	/*	2353	void
2420	* Updates the canonical_key in op to value.	2354	object::kv_set (const shstr &key, const shstr &value)
2421	*
2422	* canonical_key is a shared string (value doesn't have to be).
2423	*
2424	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2425	* keys.
2426	*
2427	* Returns TRUE on success.
2428	*/
2429	int
2430	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2431	{	2355	{
2432	key_value field = NULL, last = NULL;	2356	for (key_value *kv = key_values; kv; kv = kv->next)
2433		2357	if (kv->key == key)
2434	for (field = op->key_values; field != NULL; field = field->next)
2435	{
2436	if (field->key != canonical_key)
2437	{	2358	{
2438	last = field;	2359	kv->value = value;
2439	continue;	2360	return;
2440	}	2361	}
2441		2362
2442	if (value)	2363	key_value *kv = new key_value;
2443	field->value = value;	2364
2444	else	2365	kv->next = key_values;
		2366	kv->key = key;
		2367	kv->value = value;
		2368
		2369	key_values = kv;
		2370	}
		2371
		2372	void
		2373	object::kv_del (const shstr &key)
		2374	{
		2375	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2376	if ((*kvp)->key == key)
2445	{	2377	{
2446	/* Basically, if the archetype has this key set,	2378	key_value kv = kvp;
2447	* we need to store the null value so when we save	2379	kvp = (kvp)->next;
2448	* it, we save the empty value so that when we load,	2380	delete kv;
2449	* we get this value back again.	2381	return;
2450	*/
2451	if (get_ob_key_link (op->arch, canonical_key))
2452	field->value = 0;
2453	else
2454	{
2455	if (last)
2456	last->next = field->next;
2457	else
2458	op->key_values = field->next;
2459
2460	delete field;
2461	}
2462	}	2382	}
2463	return TRUE;
2464	}
2465	/* IF we get here, key doesn't exist */
2466
2467	/* No field, we'll have to add it. */
2468
2469	if (!add_key)
2470	return FALSE;
2471
2472	/* There isn't any good reason to store a null
2473	* value in the key/value list. If the archetype has
2474	* this key, then we should also have it, so shouldn't
2475	* be here. If user wants to store empty strings,
2476	* should pass in ""
2477	*/
2478	if (value == NULL)
2479	return TRUE;
2480
2481	field = new key_value;
2482
2483	field->key = canonical_key;
2484	field->value = value;
2485	/* Usual prepend-addition. */
2486	field->next = op->key_values;
2487	op->key_values = field;
2488
2489	return TRUE;
2490	}
2491
2492	/*
2493	* Updates the key in op to value.
2494	*
2495	* If add_key is FALSE, this will only update existing keys,
2496	* and not add new ones.
2497	* In general, should be little reason FALSE is ever passed in for add_key
2498	*
2499	* Returns TRUE on success.
2500	*/
2501	int
2502	set_ob_key_value (object op, const char key, const char *value, int add_key)
2503	{
2504	shstr key_ (key);
2505
2506	return set_ob_key_value_s (op, key_, value, add_key);
2507	}	2383	}
2508		2384
2509	object::depth_iterator::depth_iterator (object *container)	2385	object::depth_iterator::depth_iterator (object *container)
2510	: iterator_base (container)	2386	: iterator_base (container)
2511	{	2387	{
…		…
2561	{	2437	{
2562	char flagdesc[512];	2438	char flagdesc[512];
2563	char info2[256 * 4];	2439	char info2[256 * 4];
2564	char *p = info;	2440	char *p = info;
2565		2441
2566	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2442	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2567	count,	2443	count,
2568	uuid.c_str (),	2444	uuid.c_str (),
2569	&name,	2445	&name,
2570	title ? "\",title:\"" : "",	2446	title ? ",title:\"" : "",
2571	title ? (const char *)title : "",	2447	title ? (const char *)title : "",
		2448	title ? "\"" : "",
2572	flag_desc (flagdesc, 512), type);	2449	flag_desc (flagdesc, 512), type);
2573		2450
2574	if (!flag[FLAG_REMOVED] && env)	2451	if (!flag[FLAG_REMOVED] && env)
2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2452	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2576		2453
…		…
2609	object::open_container (object *new_container)	2486	object::open_container (object *new_container)
2610	{	2487	{
2611	if (container == new_container)	2488	if (container == new_container)
2612	return;	2489	return;
2613		2490
2614	if (object *old_container = container)	2491	object *old_container = container;
		2492
		2493	if (old_container)
2615	{	2494	{
2616	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2495	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2617	return;	2496	return;
2618		2497
2619	#if 0	2498	#if 0
…		…
2621	if (object *closer = old_container->inv)	2500	if (object *closer = old_container->inv)
2622	if (closer->type == CLOSE_CON)	2501	if (closer->type == CLOSE_CON)
2623	closer->destroy ();	2502	closer->destroy ();
2624	#endif	2503	#endif
2625		2504
		2505	// make sure the container is available
		2506	esrv_send_item (this, old_container);
		2507
2626	old_container->flag [FLAG_APPLIED] = false;	2508	old_container->flag [FLAG_APPLIED] = false;
2627	container = 0;	2509	container = 0;
2628		2510
		2511	// client needs item update to make it work, client bug requires this to be separate
2629	esrv_update_item (UPD_FLAGS, this, old_container);	2512	esrv_update_item (UPD_FLAGS, this, old_container);
		2513
2630	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2514	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2631	play_sound (sound_find ("chest_close"));	2515	play_sound (sound_find ("chest_close"));
2632	}	2516	}
2633		2517
2634	if (new_container)	2518	if (new_container)
…		…
2647	}	2531	}
2648	#endif	2532	#endif
2649		2533
2650	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2534	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2651		2535
		2536	// make sure the container is available, client bug requires this to be separate
		2537	esrv_send_item (this, new_container);
		2538
2652	new_container->flag [FLAG_APPLIED] = true;	2539	new_container->flag [FLAG_APPLIED] = true;
2653	container = new_container;	2540	container = new_container;
2654		2541
		2542	// client needs flag change
2655	esrv_update_item (UPD_FLAGS, this, new_container);	2543	esrv_update_item (UPD_FLAGS, this, new_container);
2656	esrv_send_inventory (this, new_container);	2544	esrv_send_inventory (this, new_container);
2657	play_sound (sound_find ("chest_open"));	2545	play_sound (sound_find ("chest_open"));
2658	}	2546	}
		2547	// else if (!old_container->env && contr && contr->ns)
		2548	// contr->ns->floorbox_reset ();
2659	}	2549	}
2660		2550
2661	object *	2551	object *
2662	object::force_find (const shstr name)	2552	object::force_find (const shstr name)
2663	{	2553	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC vs. Revision 1.249 by root, Tue Jul 15 20:41:58 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC vs.
Revision 1.249 by root, Tue Jul 15 20:41:58 2008 UTC