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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.225 by root, Fri May 2 20:28:44 2008 UTC vs.
Revision 1.258 by root, Mon Sep 29 09:04:50 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	remove ();	606	dst->remove ();
612
613	(object_copy )this = src;	607	(object_copy )dst = *this;
614
615	flag [FLAG_REMOVED] = true;	608	dst->flag [FLAG_REMOVED] = true;
616		609
617	/* Copy over key_values, if any. */	610	/* Copy over key_values, if any. */
618	if (src.key_values)	611	if (key_values)
619	{	612	{
620	key_value *tail = 0;	613	key_value *tail = 0;
621	key_values = 0;	614	dst->key_values = 0;
622		615
623	for (key_value *i = src.key_values; i; i = i->next)	616	for (key_value *i = key_values; i; i = i->next)
624	{	617	{
625	key_value *new_link = new key_value;	618	key_value *new_link = new key_value;
626		619
627	new_link->next = 0;	620	new_link->next = 0;
628	new_link->key = i->key;	621	new_link->key = i->key;
629	new_link->value = i->value;	622	new_link->value = i->value;
630		623
631	/* Try and be clever here, too. */	624	/* Try and be clever here, too. */
632	if (!key_values)	625	if (!dst->key_values)
633	{	626	{
634	key_values = new_link;	627	dst->key_values = new_link;
635	tail = new_link;	628	tail = new_link;
636	}	629	}
637	else	630	else
638	{	631	{
639	tail->next = new_link;	632	tail->next = new_link;
640	tail = new_link;	633	tail = new_link;
641	}	634	}
642	}	635	}
643	}	636	}
644	}
645
646	/*
647	* copy_to first frees everything allocated by the dst object,
648	* and then copies the contents of itself into the second
649	* object, allocating what needs to be allocated. Basically, any
650	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
651	* if the first object is freed, the pointers in the new object
652	* will point at garbage.
653	*/
654	void
655	object::copy_to (object *dst)
656	{
657	dst = this;
658		637
659	if (speed < 0)	638	if (speed < 0)
660	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
661		640
662	dst->set_speed (dst->speed);	641	dst->activate ();
663	}	642	}
664		643
665	void	644	void
666	object::instantiate ()	645	object::instantiate ()
667	{	646	{
…		…
787	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
789	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
790	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
791	/* 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
792	* to have move_allow right now.	771	* have move_allow right now.
793	*/	772	*/
794	\|\| ((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
795	\|\| 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)
796	m.flags_ = 0;	775	m.flags_ = 0;
797	}	776	}
…		…
851	{	830	{
852	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
853	if (active)	832	if (active)
854	return;	833	return;
855		834
		835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
		837
856	if (has_active_speed ())	838	if (has_active_speed ())
857	actives.insert (this);	839	actives.insert (this);
858	}	840	}
859		841
860	void	842	void
…		…
923	* drop on that space.	905	* drop on that space.
924	*/	906	*/
925	if (!drop_to_ground	907	if (!drop_to_ground
926	\|\| !map	908	\|\| !map
927	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
928	\|\| map->nodrop	910	\|\| map->no_drop
929	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
930	{	912	{
931	while (inv)	913	while (inv)
932	{
933	inv->destroy_inv (false);
934	inv->destroy ();	914	inv->destroy (true);
935	}
936	}	915	}
937	else	916	else
938	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
939	while (inv)	918	while (inv)
940	{	919	{
…		…
962		941
963	static struct freed_map : maptile	942	static struct freed_map : maptile
964	{	943	{
965	freed_map ()	944	freed_map ()
966	{	945	{
967	path = "<freed objects map>";	946	path = "<freed objects map>";
968	name = "/internal/freed_objects_map";	947	name = "/internal/freed_objects_map";
969	width = 3;	948	width = 3;
970	height = 3;	949	height = 3;
971	nodrop = 1;	950	no_drop = 1;
		951	no_reset = 1;
972		952
973	alloc ();	953	alloc ();
974	in_memory = MAP_ACTIVE;	954	in_memory = MAP_ACTIVE;
		955	}
		956
		957	~freed_map ()
		958	{
		959	destroy ();
975	}	960	}
976	} freed_map; // freed objects are moved here to avoid crashes	961	} freed_map; // freed objects are moved here to avoid crashes
977		962
978	void	963	void
979	object::do_destroy ()	964	object::do_destroy ()
…		…
998	x = 1;	983	x = 1;
999	y = 1;	984	y = 1;
1000		985
1001	if (more)	986	if (more)
1002	{	987	{
1003	more->destroy ();	988	more->destroy (true);
1004	more = 0;	989	more = 0;
1005	}	990	}
1006		991
1007	head = 0;	992	head = 0;
1008		993
…		…
1070	if (object *pl = visible_to ())	1055	if (object *pl = visible_to ())
1071	esrv_del_item (pl->contr, count);	1056	esrv_del_item (pl->contr, count);
1072	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1073		1058
1074	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
1075
1076	*(above ? &above->below : &env->inv) = below;
1077
1078	if (below)
1079	below->above = above;
1080		1060
1081	/* we set up values so that it could be inserted into	1061	/* we set up values so that it could be inserted into
1082	* the map, but we don't actually do that - it is up	1062	* the map, but we don't actually do that - it is up
1083	* to the caller to decide what we want to do.	1063	* to the caller to decide what we want to do.
1084	*/	1064	*/
1085	map = env->map;	1065	map = env->map;
1086	x = env->x;	1066	x = env->x;
1087	y = env->y;	1067	y = env->y;
		1068
		1069	// make sure cmov optimisation is applicable
		1070	*(above ? &above->below : &env->inv) = below;
		1071	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1072
1088	above = 0;	1073	above = 0;
1089	below = 0;	1074	below = 0;
1090	env = 0;	1075	env = 0;
1091		1076
1092	/* NO_FIX_PLAYER is set when a great many changes are being	1077	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1122		1107
1123	esrv_del_item (pl->contr, count);	1108	esrv_del_item (pl->contr, count);
1124	}	1109	}
1125		1110
1126	/* link the object above us */	1111	/* link the object above us */
1127	if (above)	1112	// re-link, make sure compiler can easily use cmove
1128	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1129	else	1114	*(below ? &below->above : &ms.bot) = above;
1130	ms.top = below; /* we were top, set new top */
1131
1132	/* Relink the object below us, if there is one */
1133	if (below)
1134	below->above = above;
1135	else
1136	{
1137	/* Nothing below, which means we need to relink map object for this space
1138	* use translated coordinates in case some oddness with map tiling is
1139	* evident
1140	*/
1141	if (GET_MAP_OB (map, x, y) != this)
1142	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 ());
1143
1144	ms.bot = above; /* goes on above it. */
1145	}
1146		1115
1147	above = 0;	1116	above = 0;
1148	below = 0;	1117	below = 0;
		1118
		1119	ms.flags_ = 0;
1149		1120
1150	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
1151	return;	1122	return;
1152		1123
1153	int check_walk_off = !flag [FLAG_NO_APPLY];	1124	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1160	* appropriately.	1131	* appropriately.
1161	*/	1132	*/
1162	pl->close_container ();	1133	pl->close_container ();
1163		1134
1164	//TODO: the floorbox prev/next might need updating	1135	//TODO: the floorbox prev/next might need updating
1165	esrv_del_item (pl->contr, count);	1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
		1139	pl->contr->ns->floorbox_update ();
1166	}	1140	}
1167		1141
1168	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1169	{	1143	{
1170	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
…		…
1183	}	1157	}
1184		1158
1185	last = tmp;	1159	last = tmp;
1186	}	1160	}
1187		1161
1188	/* last == NULL if there are no objects on this space */
1189	//TODO: this makes little sense, why only update the topmost object?
1190	if (!last)
1191	map->at (x, y).flags_ = 0;
1192	else
1193	update_object (last, UP_OBJ_REMOVE);
1194
1195	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1196	update_all_los (map, x, y);	1163	update_all_los (map, x, y);
1197	}	1164	}
1198	}	1165	}
1199		1166
…		…
1224	esrv_update_item (UPD_NROF, pl, top);	1191	esrv_update_item (UPD_NROF, pl, top);
1225		1192
1226	op->weight = 0; // cancel the addition above	1193	op->weight = 0; // cancel the addition above
1227	op->carrying = 0; // must be 0 already	1194	op->carrying = 0; // must be 0 already
1228		1195
1229	op->destroy (1);	1196	op->destroy (true);
1230		1197
1231	return top;	1198	return top;
1232	}	1199	}
1233		1200
1234	return 0;	1201	return 0;
…		…
1262	* job preparing multi-part monsters.	1229	* job preparing multi-part monsters.
1263	*/	1230	*/
1264	object *	1231	object *
1265	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1232	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1266	{	1233	{
		1234	op->remove ();
		1235
1267	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1236	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1268	{	1237	{
1269	tmp->x = x + tmp->arch->x;	1238	tmp->x = x + tmp->arch->x;
1270	tmp->y = y + tmp->arch->y;	1239	tmp->y = y + tmp->arch->y;
1271	}	1240	}
…		…
1294	* just 'op' otherwise	1263	* just 'op' otherwise
1295	*/	1264	*/
1296	object *	1265	object *
1297	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1266	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1298	{	1267	{
1299	assert (!op->flag [FLAG_FREED]);	1268	if (op->is_on_map ())
		1269	{
		1270	LOG (llevError, "insert_ob_in_map called for object already on map");
		1271	abort ();
		1272	}
1300		1273
		1274	if (op->env)
		1275	{
		1276	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1301	op->remove ();	1277	op->remove ();
		1278	}
		1279
		1280	if (m == &freed_map)//D TODO: remove soon
		1281	{//D
		1282	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1283	}//D
1302		1284
1303	/* Ideally, the caller figures this out. However, it complicates a lot	1285	/* Ideally, the caller figures this out. However, it complicates a lot
1304	* of areas of callers (eg, anything that uses find_free_spot would now	1286	* of areas of callers (eg, anything that uses find_free_spot would now
1305	* need extra work	1287	* need extra work
1306	*/	1288	*/
1307	if (!xy_normalise (m, op->x, op->y))	1289	if (!xy_normalise (m, op->x, op->y))
1308	{	1290	{
1309	op->destroy (1);	1291	op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found
1310	return 0;	1292	return 0;
1311	}	1293	}
1312		1294
1313	if (object *more = op->more)	1295	if (object *more = op->more)
1314	if (!insert_ob_in_map (more, m, originator, flag))	1296	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1323	*/	1305	*/
1324	if (op->nrof && !(flag & INS_NO_MERGE))	1306	if (op->nrof && !(flag & INS_NO_MERGE))
1325	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1307	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1326	if (object::can_merge (op, tmp))	1308	if (object::can_merge (op, tmp))
1327	{	1309	{
1328	// TODO: we atcually want to update tmp, not op,	1310	// TODO: we actually want to update tmp, not op,
1329	// but some caller surely breaks when we return tmp	1311	// but some caller surely breaks when we return tmp
1330	// from here :/	1312	// from here :/
1331	op->nrof += tmp->nrof;	1313	op->nrof += tmp->nrof;
1332	tmp->destroy (1);	1314	tmp->destroy (true);
1333	}	1315	}
1334		1316
1335	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1317	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1336	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1337		1319
…		…
1344	{	1326	{
1345	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1327	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1346	abort ();	1328	abort ();
1347	}	1329	}
1348		1330
		1331	if (!originator->is_on_map ())
		1332	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1333	op->debug_desc (), originator->debug_desc ());
		1334
1349	op->above = originator;	1335	op->above = originator;
1350	op->below = originator->below;	1336	op->below = originator->below;
1351
1352	if (op->below)
1353	op->below->above = op;
1354	else
1355	ms.bot = op;
1356
1357	/* since below originator, no need to update top */
1358	originator->below = op;	1337	originator->below = op;
		1338
		1339	*(op->below ? &op->below->above : &ms.bot) = op;
1359	}	1340	}
1360	else	1341	else
1361	{	1342	{
1362	object top, floor = NULL;	1343	object *floor = 0;
1363		1344	object *top = ms.top;
1364	top = ms.bot;
1365		1345
1366	/* If there are other objects, then */	1346	/* If there are other objects, then */
1367	if (top)	1347	if (top)
1368	{	1348	{
1369	object *last = 0;
1370
1371	/*	1349	/*
1372	* If there are multiple objects on this space, we do some trickier handling.	1350	* If there are multiple objects on this space, we do some trickier handling.
1373	* We've already dealt with merging if appropriate.	1351	* We've already dealt with merging if appropriate.
1374	* Generally, we want to put the new object on top. But if	1352	* Generally, we want to put the new object on top. But if
1375	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1353	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1378	* once we get to them. This reduces the need to traverse over all of	1356	* once we get to them. This reduces the need to traverse over all of
1379	* them when adding another one - this saves quite a bit of cpu time	1357	* them when adding another one - this saves quite a bit of cpu time
1380	* when lots of spells are cast in one area. Currently, it is presumed	1358	* when lots of spells are cast in one area. Currently, it is presumed
1381	* that flying non pickable objects are spell objects.	1359	* that flying non pickable objects are spell objects.
1382	*/	1360	*/
1383	for (top = ms.bot; top; top = top->above)	1361	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1384	{	1362	{
1385	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1363	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1386	floor = top;	1364	floor = tmp;
1387		1365
1388	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1366	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1389	{	1367	{
1390	/* We insert above top, so we want this object below this */	1368	/* We insert above top, so we want this object below this */
1391	top = top->below;	1369	top = tmp->below;
1392	break;	1370	break;
1393	}	1371	}
1394		1372
1395	last = top;	1373	top = tmp;
1396	}	1374	}
1397
1398	/* Don't want top to be NULL, so set it to the last valid object */
1399	top = last;
1400		1375
1401	/* We let update_position deal with figuring out what the space	1376	/* We let update_position deal with figuring out what the space
1402	* looks like instead of lots of conditions here.	1377	* looks like instead of lots of conditions here.
1403	* makes things faster, and effectively the same result.	1378	* makes things faster, and effectively the same result.
1404	*/	1379	*/
…		…
1411	*/	1386	*/
1412	if (!(flag & INS_ON_TOP)	1387	if (!(flag & INS_ON_TOP)
1413	&& ms.flags () & P_BLOCKSVIEW	1388	&& ms.flags () & P_BLOCKSVIEW
1414	&& (op->face && !faces [op->face].visibility))	1389	&& (op->face && !faces [op->face].visibility))
1415	{	1390	{
		1391	object *last;
		1392
1416	for (last = top; last != floor; last = last->below)	1393	for (last = top; last != floor; last = last->below)
1417	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1394	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418	break;	1395	break;
1419		1396
1420	/* Check to see if we found the object that blocks view,	1397	/* Check to see if we found the object that blocks view,
…		…
1428	} /* If objects on this space */	1405	} /* If objects on this space */
1429		1406
1430	if (flag & INS_ABOVE_FLOOR_ONLY)	1407	if (flag & INS_ABOVE_FLOOR_ONLY)
1431	top = floor;	1408	top = floor;
1432		1409
1433	/* Top is the object that our object (op) is going to get inserted above.	1410	// insert object above top, or bottom-most if top = 0
1434	*/
1435
1436	/* First object on this space */
1437	if (!top)	1411	if (!top)
1438	{	1412	{
		1413	op->below = 0;
1439	op->above = ms.bot;	1414	op->above = ms.bot;
1440
1441	if (op->above)
1442	op->above->below = op;
1443
1444	op->below = 0;
1445	ms.bot = op;	1415	ms.bot = op;
		1416
		1417	*(op->above ? &op->above->below : &ms.top) = op;
1446	}	1418	}
1447	else	1419	else
1448	{ /* get inserted into the stack above top */	1420	{
1449	op->above = top->above;	1421	op->above = top->above;
1450
1451	if (op->above)
1452	op->above->below = op;	1422	top->above = op;
1453		1423
1454	op->below = top;	1424	op->below = top;
1455	top->above = op;	1425	*(op->above ? &op->above->below : &ms.top) = op;
1456	}	1426	}
1457		1427	}
1458	if (!op->above)
1459	ms.top = op;
1460	} /* else not INS_BELOW_ORIGINATOR */
1461		1428
1462	if (op->type == PLAYER)	1429	if (op->type == PLAYER)
1463	{	1430	{
1464	op->contr->do_los = 1;	1431	op->contr->do_los = 1;
1465	++op->map->players;	1432	++op->map->players;
…		…
1468		1435
1469	op->map->dirty = true;	1436	op->map->dirty = true;
1470		1437
1471	if (object *pl = ms.player ())	1438	if (object *pl = ms.player ())
1472	//TODO: the floorbox prev/next might need updating	1439	//TODO: the floorbox prev/next might need updating
1473	esrv_send_item (pl, op);	1440	//esrv_send_item (pl, op);
		1441	//TODO: update floorbox to preserve ordering
		1442	if (pl->contr->ns)
		1443	pl->contr->ns->floorbox_update ();
1474		1444
1475	/* If this object glows, it may affect lighting conditions that are	1445	/* If this object glows, it may affect lighting conditions that are
1476	* visible to others on this map. But update_all_los is really	1446	* visible to others on this map. But update_all_los is really
1477	* an inefficient way to do this, as it means los for all players	1447	* an inefficient way to do this, as it means los for all players
1478	* on the map will get recalculated. The players could very well	1448	* on the map will get recalculated. The players could very well
…		…
1524	{	1494	{
1525	/* first search for itself and remove any old instances */	1495	/* first search for itself and remove any old instances */
1526		1496
1527	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1497	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1528	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1498	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1529	tmp->destroy (1);	1499	tmp->destroy (true);
1530		1500
1531	object *tmp = arch_to_object (archetype::find (arch_string));	1501	object *tmp = arch_to_object (archetype::find (arch_string));
1532		1502
1533	tmp->x = op->x;	1503	tmp->x = op->x;
1534	tmp->y = op->y;	1504	tmp->y = op->y;
…		…
1558	if (!nr)	1528	if (!nr)
1559	return true;	1529	return true;
1560		1530
1561	nr = min (nr, nrof);	1531	nr = min (nr, nrof);
1562		1532
		1533	if (nrof > nr)
		1534	{
1563	nrof -= nr;	1535	nrof -= nr;
1564
1565	if (nrof)
1566	{
1567	adjust_weight (env, -weight * nr); // carrying == 0	1536	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1568		1537
1569	if (object *pl = visible_to ())	1538	if (object *pl = visible_to ())
1570	esrv_update_item (UPD_NROF, pl, this);	1539	esrv_update_item (UPD_NROF, pl, this);
1571		1540
1572	return true;	1541	return true;
1573	}	1542	}
1574	else	1543	else
1575	{	1544	{
1576	destroy (1);	1545	destroy ();
1577	return false;	1546	return false;
1578	}	1547	}
1579	}	1548	}
1580		1549
1581	/*	1550	/*
…		…
1598	}	1567	}
1599	else	1568	else
1600	{	1569	{
1601	decrease (nr);	1570	decrease (nr);
1602		1571
1603	object *op = object_create_clone (this);	1572	object *op = deep_clone ();
1604	op->nrof = nr;	1573	op->nrof = nr;
1605	return op;	1574	return op;
1606	}	1575	}
1607	}	1576	}
1608		1577
…		…
1658	if (object *pl = tmp->visible_to ())	1627	if (object *pl = tmp->visible_to ())
1659	esrv_update_item (UPD_NROF, pl, tmp);	1628	esrv_update_item (UPD_NROF, pl, tmp);
1660		1629
1661	adjust_weight (this, op->total_weight ());	1630	adjust_weight (this, op->total_weight ());
1662		1631
1663	op->destroy (1);	1632	op->destroy (true);
1664	op = tmp;	1633	op = tmp;
1665	goto inserted;	1634	goto inserted;
1666	}	1635	}
1667		1636
1668	op->owner = 0; // it's his/hers now. period.	1637	op->owner = 0; // it's his/hers now. period.
…		…
1829	LOG (llevError, "Present_arch called outside map.\n");	1798	LOG (llevError, "Present_arch called outside map.\n");
1830	return NULL;	1799	return NULL;
1831	}	1800	}
1832		1801
1833	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1802	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1834	if (tmp->arch == at)	1803	if (tmp->arch->archname == at->archname)
1835	return tmp;	1804	return tmp;
1836		1805
1837	return NULL;	1806	return NULL;
1838	}	1807	}
1839		1808
…		…
1903	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1904	*/	1873	*/
1905	object *	1874	object *
1906	present_arch_in_ob (const archetype at, const object op)	1875	present_arch_in_ob (const archetype at, const object op)
1907	{	1876	{
1908	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1877	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1909	if (tmp->arch == at)	1878	if (tmp->arch->archname == at->archname)
1910	return tmp;	1879	return tmp;
1911		1880
1912	return NULL;	1881	return NULL;
1913	}	1882	}
1914		1883
…		…
2323		2292
2324	/*	2293	/*
2325	* create clone from object to another	2294	* create clone from object to another
2326	*/	2295	*/
2327	object *	2296	object *
2328	object_create_clone (object *asrc)	2297	object::deep_clone ()
2329	{	2298	{
		2299	assert (("deep_clone called on non-head object", is_head ()));
		2300
2330	object *dst = 0;	2301	object *dst = clone ();
2331		2302
2332	if (!asrc)
2333	return 0;
2334
2335	object *src = asrc->head_ ();
2336
2337	object *prev = 0;	2303	object *prev = dst;
2338	for (object *part = src; part; part = part->more)	2304	for (object *part = this->more; part; part = part->more)
2339	{	2305	{
2340	object *tmp = part->clone ();	2306	object *tmp = part->clone ();
2341
2342	tmp->x -= src->x;
2343	tmp->y -= src->y;
2344
2345	if (!part->head)
2346	{
2347	dst = tmp;
2348	tmp->head = 0;
2349	}
2350	else
2351	tmp->head = dst;	2307	tmp->head = dst;
2352
2353	tmp->more = 0;
2354
2355	if (prev)
2356	prev->more = tmp;	2308	prev->more = tmp;
2357
2358	prev = tmp;	2309	prev = tmp;
2359	}	2310	}
2360		2311
2361	for (object *item = src->inv; item; item = item->below)	2312	for (object *item = inv; item; item = item->below)
2362	insert_ob_in_ob (object_create_clone (item), dst);	2313	insert_ob_in_ob (item->deep_clone (), dst);
2363		2314
2364	return dst;	2315	return dst;
2365	}	2316	}
2366		2317
2367	/* This returns the first object in who's inventory that	2318	/* This returns the first object in who's inventory that
…		…
2376	return tmp;	2327	return tmp;
2377		2328
2378	return 0;	2329	return 0;
2379	}	2330	}
2380		2331
2381	/* If ob has a field named key, return the link from the list,	2332	const shstr &
2382	* otherwise return NULL.	2333	object::kv_get (const shstr &key) const
2383	*
2384	* key must be a passed in shared string - otherwise, this won't
2385	* do the desired thing.
2386	*/
2387	key_value *
2388	get_ob_key_link (const object ob, const char key)
2389	{	2334	{
2390	for (key_value *link = ob->key_values; link; link = link->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2391	if (link->key == key)	2336	if (kv->key == key)
2392	return link;
2393
2394	return 0;
2395	}
2396
2397	/*
2398	* Returns the value of op has an extra_field for key, or NULL.
2399	*
2400	* The argument doesn't need to be a shared string.
2401	*
2402	* The returned string is shared.
2403	*/
2404	const char *
2405	get_ob_key_value (const object op, const char const key)
2406	{
2407	key_value *link;
2408	shstr_cmp canonical_key (key);
2409
2410	if (!canonical_key)
2411	{
2412	/* 1. There being a field named key on any object
2413	* implies there'd be a shared string to find.
2414	* 2. Since there isn't, no object has this field.
2415	* 3. Therefore, this object doesn't have this field.
2416	*/
2417	return 0;
2418	}
2419
2420	/* This is copied from get_ob_key_link() above -
2421	* only 4 lines, and saves the function call overhead.
2422	*/
2423	for (link = op->key_values; link; link = link->next)
2424	if (link->key == canonical_key)
2425	return link->value;	2337	return kv->value;
2426		2338
2427	return 0;	2339	return shstr_null;
2428	}	2340	}
2429		2341
2430	/*	2342	void
2431	* Updates the canonical_key in op to value.	2343	object::kv_set (const shstr &key, const shstr &value)
2432	*
2433	* canonical_key is a shared string (value doesn't have to be).
2434	*
2435	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2436	* keys.
2437	*
2438	* Returns TRUE on success.
2439	*/
2440	int
2441	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2442	{	2344	{
2443	key_value field = NULL, last = NULL;	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2444		2346	if (kv->key == key)
2445	for (field = op->key_values; field != NULL; field = field->next)
2446	{
2447	if (field->key != canonical_key)
2448	{	2347	{
2449	last = field;	2348	kv->value = value;
2450	continue;	2349	return;
2451	}	2350	}
2452		2351
2453	if (value)	2352	key_value *kv = new key_value;
2454	field->value = value;	2353
2455	else	2354	kv->next = key_values;
		2355	kv->key = key;
		2356	kv->value = value;
		2357
		2358	key_values = kv;
		2359	}
		2360
		2361	void
		2362	object::kv_del (const shstr &key)
		2363	{
		2364	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2365	if ((*kvp)->key == key)
2456	{	2366	{
2457	/* Basically, if the archetype has this key set,	2367	key_value kv = kvp;
2458	* we need to store the null value so when we save	2368	kvp = (kvp)->next;
2459	* it, we save the empty value so that when we load,	2369	delete kv;
2460	* we get this value back again.	2370	return;
2461	*/
2462	if (get_ob_key_link (op->arch, canonical_key))
2463	field->value = 0;
2464	else
2465	{
2466	if (last)
2467	last->next = field->next;
2468	else
2469	op->key_values = field->next;
2470
2471	delete field;
2472	}
2473	}	2371	}
2474	return TRUE;
2475	}
2476	/* IF we get here, key doesn't exist */
2477
2478	/* No field, we'll have to add it. */
2479
2480	if (!add_key)
2481	return FALSE;
2482
2483	/* There isn't any good reason to store a null
2484	* value in the key/value list. If the archetype has
2485	* this key, then we should also have it, so shouldn't
2486	* be here. If user wants to store empty strings,
2487	* should pass in ""
2488	*/
2489	if (value == NULL)
2490	return TRUE;
2491
2492	field = new key_value;
2493
2494	field->key = canonical_key;
2495	field->value = value;
2496	/* Usual prepend-addition. */
2497	field->next = op->key_values;
2498	op->key_values = field;
2499
2500	return TRUE;
2501	}
2502
2503	/*
2504	* Updates the key in op to value.
2505	*
2506	* If add_key is FALSE, this will only update existing keys,
2507	* and not add new ones.
2508	* In general, should be little reason FALSE is ever passed in for add_key
2509	*
2510	* Returns TRUE on success.
2511	*/
2512	int
2513	set_ob_key_value (object op, const char key, const char *value, int add_key)
2514	{
2515	shstr key_ (key);
2516
2517	return set_ob_key_value_s (op, key_, value, add_key);
2518	}	2372	}
2519		2373
2520	object::depth_iterator::depth_iterator (object *container)	2374	object::depth_iterator::depth_iterator (object *container)
2521	: iterator_base (container)	2375	: iterator_base (container)
2522	{	2376	{
…		…
2572	{	2426	{
2573	char flagdesc[512];	2427	char flagdesc[512];
2574	char info2[256 * 4];	2428	char info2[256 * 4];
2575	char *p = info;	2429	char *p = info;
2576		2430
2577	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2431	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2578	count,	2432	count,
2579	uuid.c_str (),	2433	uuid.c_str (),
2580	&name,	2434	&name,
2581	title ? "\",title:\"" : "",	2435	title ? ",title:\"" : "",
2582	title ? (const char *)title : "",	2436	title ? (const char *)title : "",
		2437	title ? "\"" : "",
2583	flag_desc (flagdesc, 512), type);	2438	flag_desc (flagdesc, 512), type);
2584		2439
2585	if (!flag[FLAG_REMOVED] && env)	2440	if (!flag[FLAG_REMOVED] && env)
2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2441	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2587		2442
…		…
2631		2486
2632	#if 0	2487	#if 0
2633	// remove the "Close old_container" object.	2488	// remove the "Close old_container" object.
2634	if (object *closer = old_container->inv)	2489	if (object *closer = old_container->inv)
2635	if (closer->type == CLOSE_CON)	2490	if (closer->type == CLOSE_CON)
2636	closer->destroy ();	2491	closer->destroy (true);
2637	#endif	2492	#endif
2638		2493
2639	// make sure the container is available	2494	// make sure the container is available
2640	esrv_send_item (this, old_container);	2495	esrv_send_item (this, old_container);
2641		2496
…		…
2697		2552
2698	void	2553	void
2699	object::force_add (const shstr name, int duration)	2554	object::force_add (const shstr name, int duration)
2700	{	2555	{
2701	if (object *force = force_find (name))	2556	if (object *force = force_find (name))
2702	force->destroy ();	2557	force->destroy (true);
2703		2558
2704	object *force = get_archetype (FORCE_NAME);	2559	object *force = get_archetype (FORCE_NAME);
2705		2560
2706	force->slaying = name;	2561	force->slaying = name;
2707	force->stats.food = 1;	2562	force->stats.food = 1;

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.225 by root, Fri May 2 20:28:44 2008 UTC vs. Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.225 by root, Fri May 2 20:28:44 2008 UTC vs.
Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC