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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC vs.
Revision 1.256 by root, Sun Aug 31 05:47:14 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.
…		…
649	}	636	}
650		637
651	if (speed < 0)	638	if (speed < 0)
652	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
653		640
654	dst->set_speed (dst->speed);	641	dst->activate ();
655	}	642	}
656		643
657	void	644	void
658	object::instantiate ()	645	object::instantiate ()
659	{	646	{
…		…
779	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
780	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
781	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
782	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
783	/* 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
784	* to have move_allow right now.	771	* have move_allow right now.
785	*/	772	*/
786	\|\| ((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
787	\|\| 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)
788	m.flags_ = 0;	775	m.flags_ = 0;
789	}	776	}
…		…
843	{	830	{
844	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
845	if (active)	832	if (active)
846	return;	833	return;
847		834
		835	if (has_active_speed () && flag [FLAG_FREED ]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		836
848	if (has_active_speed ())	837	if (has_active_speed ())
849	actives.insert (this);	838	actives.insert (this);
850	}	839	}
851		840
852	void	841	void
…		…
915	* drop on that space.	904	* drop on that space.
916	*/	905	*/
917	if (!drop_to_ground	906	if (!drop_to_ground
918	\|\| !map	907	\|\| !map
919	\|\| map->in_memory != MAP_ACTIVE	908	\|\| map->in_memory != MAP_ACTIVE
920	\|\| map->nodrop	909	\|\| map->no_drop
921	\|\| ms ().move_block == MOVE_ALL)	910	\|\| ms ().move_block == MOVE_ALL)
922	{	911	{
923	while (inv)	912	while (inv)
924	{
925	inv->destroy_inv (false);
926	inv->destroy ();	913	inv->destroy (true);
927	}
928	}	914	}
929	else	915	else
930	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
931	while (inv)	917	while (inv)
932	{	918	{
…		…
954		940
955	static struct freed_map : maptile	941	static struct freed_map : maptile
956	{	942	{
957	freed_map ()	943	freed_map ()
958	{	944	{
959	path = "<freed objects map>";	945	path = "<freed objects map>";
960	name = "/internal/freed_objects_map";	946	name = "/internal/freed_objects_map";
961	width = 3;	947	width = 3;
962	height = 3;	948	height = 3;
963	nodrop = 1;	949	no_drop = 1;
		950	no_reset = 1;
964		951
965	alloc ();	952	alloc ();
966	in_memory = MAP_ACTIVE;	953	in_memory = MAP_ACTIVE;
		954	}
		955
		956	~freed_map ()
		957	{
		958	destroy ();
967	}	959	}
968	} freed_map; // freed objects are moved here to avoid crashes	960	} freed_map; // freed objects are moved here to avoid crashes
969		961
970	void	962	void
971	object::do_destroy ()	963	object::do_destroy ()
…		…
1062	if (object *pl = visible_to ())	1054	if (object *pl = visible_to ())
1063	esrv_del_item (pl->contr, count);	1055	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1056	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1057
1066	adjust_weight (env, -total_weight ());	1058	adjust_weight (env, -total_weight ());
1067
1068	*(above ? &above->below : &env->inv) = below;
1069
1070	if (below)
1071	below->above = above;
1072		1059
1073	/* we set up values so that it could be inserted into	1060	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up	1061	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.	1062	* to the caller to decide what we want to do.
1076	*/	1063	*/
1077	map = env->map;	1064	map = env->map;
1078	x = env->x;	1065	x = env->x;
1079	y = env->y;	1066	y = env->y;
		1067
		1068	// make sure cmov optimisation is applicable
		1069	*(above ? &above->below : &env->inv) = below;
		1070	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1071
1080	above = 0;	1072	above = 0;
1081	below = 0;	1073	below = 0;
1082	env = 0;	1074	env = 0;
1083		1075
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1076	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1114		1106
1115	esrv_del_item (pl->contr, count);	1107	esrv_del_item (pl->contr, count);
1116	}	1108	}
1117		1109
1118	/* link the object above us */	1110	/* link the object above us */
1119	if (above)	1111	// re-link, make sure compiler can easily use cmove
1120	above->below = below;	1112	*(above ? &above->below : &ms.top) = below;
1121	else	1113	*(below ? &below->above : &ms.bot) = above;
1122	ms.top = below; /* we were top, set new top */
1123
1124	/* Relink the object below us, if there is one */
1125	if (below)
1126	below->above = above;
1127	else
1128	{
1129	/* Nothing below, which means we need to relink map object for this space
1130	* use translated coordinates in case some oddness with map tiling is
1131	* evident
1132	*/
1133	if (GET_MAP_OB (map, x, y) != this)
1134	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 ());
1135
1136	ms.bot = above; /* goes on above it. */
1137	}
1138		1114
1139	above = 0;	1115	above = 0;
1140	below = 0;	1116	below = 0;
		1117
		1118	ms.flags_ = 0;
1141		1119
1142	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
1143	return;	1121	return;
1144		1122
1145	int check_walk_off = !flag [FLAG_NO_APPLY];	1123	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1178	}	1156	}
1179		1157
1180	last = tmp;	1158	last = tmp;
1181	}	1159	}
1182		1160
1183	/* last == NULL if there are no objects on this space */
1184	//TODO: this makes little sense, why only update the topmost object?
1185	if (!last)
1186	map->at (x, y).flags_ = 0;
1187	else
1188	update_object (last, UP_OBJ_REMOVE);
1189
1190	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1161	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1191	update_all_los (map, x, y);	1162	update_all_los (map, x, y);
1192	}	1163	}
1193	}	1164	}
1194		1165
…		…
1257	* job preparing multi-part monsters.	1228	* job preparing multi-part monsters.
1258	*/	1229	*/
1259	object *	1230	object *
1260	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1231	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1261	{	1232	{
		1233	op->remove ();
		1234
1262	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1235	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1263	{	1236	{
1264	tmp->x = x + tmp->arch->x;	1237	tmp->x = x + tmp->arch->x;
1265	tmp->y = y + tmp->arch->y;	1238	tmp->y = y + tmp->arch->y;
1266	}	1239	}
…		…
1289	* just 'op' otherwise	1262	* just 'op' otherwise
1290	*/	1263	*/
1291	object *	1264	object *
1292	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1265	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1293	{	1266	{
1294	assert (!op->flag [FLAG_FREED]);	1267	if (op->is_on_map ())
		1268	{
		1269	LOG (llevError, "insert_ob_in_map called for object already on map");
		1270	abort ();
		1271	}
1295		1272
		1273	if (op->env)
		1274	{
		1275	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1296	op->remove ();	1276	op->remove ();
		1277	}
		1278
		1279	if (op->face && !face_info (op->face))//D TODO: remove soon
		1280	{//D
		1281	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1282	op->face = 1;//D
		1283	}//D
1297		1284
1298	/* Ideally, the caller figures this out. However, it complicates a lot	1285	/* Ideally, the caller figures this out. However, it complicates a lot
1299	* 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
1300	* need extra work	1287	* need extra work
1301	*/	1288	*/
1302	if (!xy_normalise (m, op->x, op->y))	1289	if (!xy_normalise (m, op->x, op->y))
1303	{	1290	{
1304	op->destroy (1);	1291	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1305	return 0;	1292	return 0;
1306	}	1293	}
1307		1294
1308	if (object *more = op->more)	1295	if (object *more = op->more)
1309	if (!insert_ob_in_map (more, m, originator, flag))	1296	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1318	*/	1305	*/
1319	if (op->nrof && !(flag & INS_NO_MERGE))	1306	if (op->nrof && !(flag & INS_NO_MERGE))
1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1307	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1321	if (object::can_merge (op, tmp))	1308	if (object::can_merge (op, tmp))
1322	{	1309	{
1323	// TODO: we atcually want to update tmp, not op,	1310	// TODO: we actually want to update tmp, not op,
1324	// but some caller surely breaks when we return tmp	1311	// but some caller surely breaks when we return tmp
1325	// from here :/	1312	// from here :/
1326	op->nrof += tmp->nrof;	1313	op->nrof += tmp->nrof;
1327	tmp->destroy (1);	1314	tmp->destroy (1);
1328	}	1315	}
…		…
1339	{	1326	{
1340	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");
1341	abort ();	1328	abort ();
1342	}	1329	}
1343		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
1344	op->above = originator;	1335	op->above = originator;
1345	op->below = originator->below;	1336	op->below = originator->below;
1346
1347	if (op->below)
1348	op->below->above = op;
1349	else
1350	ms.bot = op;
1351
1352	/* since below originator, no need to update top */
1353	originator->below = op;	1337	originator->below = op;
		1338
		1339	*(op->below ? &op->below->above : &ms.bot) = op;
1354	}	1340	}
1355	else	1341	else
1356	{	1342	{
1357	object top, floor = NULL;	1343	object *floor = 0;
1358		1344	object *top = ms.top;
1359	top = ms.bot;
1360		1345
1361	/* If there are other objects, then */	1346	/* If there are other objects, then */
1362	if (top)	1347	if (top)
1363	{	1348	{
1364	object *last = 0;
1365
1366	/*	1349	/*
1367	* 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.
1368	* We've already dealt with merging if appropriate.	1351	* We've already dealt with merging if appropriate.
1369	* 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
1370	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1353	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1373	* 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
1374	* 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
1375	* 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
1376	* that flying non pickable objects are spell objects.	1359	* that flying non pickable objects are spell objects.
1377	*/	1360	*/
1378	for (top = ms.bot; top; top = top->above)	1361	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1379	{	1362	{
1380	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))
1381	floor = top;	1364	floor = tmp;
1382		1365
1383	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))
1384	{	1367	{
1385	/* We insert above top, so we want this object below this */	1368	/* We insert above top, so we want this object below this */
1386	top = top->below;	1369	top = tmp->below;
1387	break;	1370	break;
1388	}	1371	}
1389		1372
1390	last = top;	1373	top = tmp;
1391	}	1374	}
1392
1393	/* Don't want top to be NULL, so set it to the last valid object */
1394	top = last;
1395		1375
1396	/* We let update_position deal with figuring out what the space	1376	/* We let update_position deal with figuring out what the space
1397	* looks like instead of lots of conditions here.	1377	* looks like instead of lots of conditions here.
1398	* makes things faster, and effectively the same result.	1378	* makes things faster, and effectively the same result.
1399	*/	1379	*/
…		…
1406	*/	1386	*/
1407	if (!(flag & INS_ON_TOP)	1387	if (!(flag & INS_ON_TOP)
1408	&& ms.flags () & P_BLOCKSVIEW	1388	&& ms.flags () & P_BLOCKSVIEW
1409	&& (op->face && !faces [op->face].visibility))	1389	&& (op->face && !faces [op->face].visibility))
1410	{	1390	{
		1391	object *last;
		1392
1411	for (last = top; last != floor; last = last->below)	1393	for (last = top; last != floor; last = last->below)
1412	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1394	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1413	break;	1395	break;
1414		1396
1415	/* Check to see if we found the object that blocks view,	1397	/* Check to see if we found the object that blocks view,
…		…
1423	} /* If objects on this space */	1405	} /* If objects on this space */
1424		1406
1425	if (flag & INS_ABOVE_FLOOR_ONLY)	1407	if (flag & INS_ABOVE_FLOOR_ONLY)
1426	top = floor;	1408	top = floor;
1427		1409
1428	/* 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
1429	*/
1430
1431	/* First object on this space */
1432	if (!top)	1411	if (!top)
1433	{	1412	{
		1413	op->below = 0;
1434	op->above = ms.bot;	1414	op->above = ms.bot;
1435
1436	if (op->above)
1437	op->above->below = op;
1438
1439	op->below = 0;
1440	ms.bot = op;	1415	ms.bot = op;
		1416
		1417	*(op->above ? &op->above->below : &ms.top) = op;
1441	}	1418	}
1442	else	1419	else
1443	{ /* get inserted into the stack above top */	1420	{
1444	op->above = top->above;	1421	op->above = top->above;
1445
1446	if (op->above)
1447	op->above->below = op;	1422	top->above = op;
1448		1423
1449	op->below = top;	1424	op->below = top;
1450	top->above = op;	1425	*(op->above ? &op->above->below : &ms.top) = op;
1451	}	1426	}
1452		1427	}
1453	if (!op->above)
1454	ms.top = op;
1455	} /* else not INS_BELOW_ORIGINATOR */
1456		1428
1457	if (op->type == PLAYER)	1429	if (op->type == PLAYER)
1458	{	1430	{
1459	op->contr->do_los = 1;	1431	op->contr->do_los = 1;
1460	++op->map->players;	1432	++op->map->players;
…		…
1556	if (!nr)	1528	if (!nr)
1557	return true;	1529	return true;
1558		1530
1559	nr = min (nr, nrof);	1531	nr = min (nr, nrof);
1560		1532
		1533	if (nrof > nr)
		1534	{
1561	nrof -= nr;	1535	nrof -= nr;
1562
1563	if (nrof)
1564	{
1565	adjust_weight (env, -weight * nr); // carrying == 0	1536	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1566		1537
1567	if (object *pl = visible_to ())	1538	if (object *pl = visible_to ())
1568	esrv_update_item (UPD_NROF, pl, this);	1539	esrv_update_item (UPD_NROF, pl, this);
1569		1540
1570	return true;	1541	return true;
1571	}	1542	}
1572	else	1543	else
1573	{	1544	{
1574	destroy (1);	1545	destroy ();
1575	return false;	1546	return false;
1576	}	1547	}
1577	}	1548	}
1578		1549
1579	/*	1550	/*
…		…
1596	}	1567	}
1597	else	1568	else
1598	{	1569	{
1599	decrease (nr);	1570	decrease (nr);
1600		1571
1601	object *op = object_create_clone (this);	1572	object *op = deep_clone ();
1602	op->nrof = nr;	1573	op->nrof = nr;
1603	return op;	1574	return op;
1604	}	1575	}
1605	}	1576	}
1606		1577
…		…
1827	LOG (llevError, "Present_arch called outside map.\n");	1798	LOG (llevError, "Present_arch called outside map.\n");
1828	return NULL;	1799	return NULL;
1829	}	1800	}
1830		1801
1831	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)
1832	if (tmp->arch == at)	1803	if (tmp->arch->archname == at->archname)
1833	return tmp;	1804	return tmp;
1834		1805
1835	return NULL;	1806	return NULL;
1836	}	1807	}
1837		1808
…		…
1901	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1902	*/	1873	*/
1903	object *	1874	object *
1904	present_arch_in_ob (const archetype at, const object op)	1875	present_arch_in_ob (const archetype at, const object op)
1905	{	1876	{
1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1877	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1907	if (tmp->arch == at)	1878	if (tmp->arch->archname == at->archname)
1908	return tmp;	1879	return tmp;
1909		1880
1910	return NULL;	1881	return NULL;
1911	}	1882	}
1912		1883
…		…
2321		2292
2322	/*	2293	/*
2323	* create clone from object to another	2294	* create clone from object to another
2324	*/	2295	*/
2325	object *	2296	object *
2326	object_create_clone (object *asrc)	2297	object::deep_clone ()
2327	{	2298	{
		2299	assert (("deep_clone called on non-head object", is_head ()));
		2300
2328	object *dst = 0;	2301	object *dst = clone ();
2329		2302
2330	if (!asrc)
2331	return 0;
2332
2333	object *src = asrc->head_ ();
2334
2335	object *prev = 0;	2303	object *prev = dst;
2336	for (object *part = src; part; part = part->more)	2304	for (object *part = this->more; part; part = part->more)
2337	{	2305	{
2338	object *tmp = part->clone ();	2306	object *tmp = part->clone ();
2339
2340	tmp->x -= src->x;
2341	tmp->y -= src->y;
2342
2343	if (!part->head)
2344	{
2345	dst = tmp;
2346	tmp->head = 0;
2347	}
2348	else
2349	tmp->head = dst;	2307	tmp->head = dst;
2350
2351	tmp->more = 0;
2352
2353	if (prev)
2354	prev->more = tmp;	2308	prev->more = tmp;
2355
2356	prev = tmp;	2309	prev = tmp;
2357	}	2310	}
2358		2311
2359	for (object *item = src->inv; item; item = item->below)	2312	for (object *item = inv; item; item = item->below)
2360	insert_ob_in_ob (object_create_clone (item), dst);	2313	insert_ob_in_ob (item->deep_clone (), dst);
2361		2314
2362	return dst;	2315	return dst;
2363	}	2316	}
2364		2317
2365	/* This returns the first object in who's inventory that	2318	/* This returns the first object in who's inventory that
…		…
2374	return tmp;	2327	return tmp;
2375		2328
2376	return 0;	2329	return 0;
2377	}	2330	}
2378		2331
2379	/* If ob has a field named key, return the link from the list,	2332	const shstr &
2380	* otherwise return NULL.	2333	object::kv_get (const shstr &key) const
2381	*
2382	* key must be a passed in shared string - otherwise, this won't
2383	* do the desired thing.
2384	*/
2385	key_value *
2386	get_ob_key_link (const object ob, const char key)
2387	{	2334	{
2388	for (key_value *link = ob->key_values; link; link = link->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2389	if (link->key == key)	2336	if (kv->key == key)
2390	return link;
2391
2392	return 0;
2393	}
2394
2395	/*
2396	* Returns the value of op has an extra_field for key, or NULL.
2397	*
2398	* The argument doesn't need to be a shared string.
2399	*
2400	* The returned string is shared.
2401	*/
2402	const char *
2403	get_ob_key_value (const object op, const char const key)
2404	{
2405	key_value *link;
2406	shstr_cmp canonical_key (key);
2407
2408	if (!canonical_key)
2409	{
2410	/* 1. There being a field named key on any object
2411	* implies there'd be a shared string to find.
2412	* 2. Since there isn't, no object has this field.
2413	* 3. Therefore, this object doesn't have this field.
2414	*/
2415	return 0;
2416	}
2417
2418	/* This is copied from get_ob_key_link() above -
2419	* only 4 lines, and saves the function call overhead.
2420	*/
2421	for (link = op->key_values; link; link = link->next)
2422	if (link->key == canonical_key)
2423	return link->value;	2337	return kv->value;
2424		2338
2425	return 0;	2339	return shstr_null;
2426	}	2340	}
2427		2341
2428	/*	2342	void
2429	* Updates the canonical_key in op to value.	2343	object::kv_set (const shstr &key, const shstr &value)
2430	*
2431	* canonical_key is a shared string (value doesn't have to be).
2432	*
2433	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2434	* keys.
2435	*
2436	* Returns TRUE on success.
2437	*/
2438	int
2439	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2440	{	2344	{
2441	key_value field = NULL, last = NULL;	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2442		2346	if (kv->key == key)
2443	for (field = op->key_values; field != NULL; field = field->next)
2444	{
2445	if (field->key != canonical_key)
2446	{	2347	{
2447	last = field;	2348	kv->value = value;
2448	continue;	2349	return;
2449	}	2350	}
2450		2351
2451	if (value)	2352	key_value *kv = new key_value;
2452	field->value = value;	2353
2453	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)
2454	{	2366	{
2455	/* Basically, if the archetype has this key set,	2367	key_value kv = kvp;
2456	* we need to store the null value so when we save	2368	kvp = (kvp)->next;
2457	* it, we save the empty value so that when we load,	2369	delete kv;
2458	* we get this value back again.	2370	return;
2459	*/
2460	if (get_ob_key_link (op->arch, canonical_key))
2461	field->value = 0;
2462	else
2463	{
2464	if (last)
2465	last->next = field->next;
2466	else
2467	op->key_values = field->next;
2468
2469	delete field;
2470	}
2471	}	2371	}
2472	return TRUE;
2473	}
2474	/* IF we get here, key doesn't exist */
2475
2476	/* No field, we'll have to add it. */
2477
2478	if (!add_key)
2479	return FALSE;
2480
2481	/* There isn't any good reason to store a null
2482	* value in the key/value list. If the archetype has
2483	* this key, then we should also have it, so shouldn't
2484	* be here. If user wants to store empty strings,
2485	* should pass in ""
2486	*/
2487	if (value == NULL)
2488	return TRUE;
2489
2490	field = new key_value;
2491
2492	field->key = canonical_key;
2493	field->value = value;
2494	/* Usual prepend-addition. */
2495	field->next = op->key_values;
2496	op->key_values = field;
2497
2498	return TRUE;
2499	}
2500
2501	/*
2502	* Updates the key in op to value.
2503	*
2504	* If add_key is FALSE, this will only update existing keys,
2505	* and not add new ones.
2506	* In general, should be little reason FALSE is ever passed in for add_key
2507	*
2508	* Returns TRUE on success.
2509	*/
2510	int
2511	set_ob_key_value (object op, const char key, const char *value, int add_key)
2512	{
2513	shstr key_ (key);
2514
2515	return set_ob_key_value_s (op, key_, value, add_key);
2516	}	2372	}
2517		2373
2518	object::depth_iterator::depth_iterator (object *container)	2374	object::depth_iterator::depth_iterator (object *container)
2519	: iterator_base (container)	2375	: iterator_base (container)
2520	{	2376	{
…		…
2570	{	2426	{
2571	char flagdesc[512];	2427	char flagdesc[512];
2572	char info2[256 * 4];	2428	char info2[256 * 4];
2573	char *p = info;	2429	char *p = info;
2574		2430
2575	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}",
2576	count,	2432	count,
2577	uuid.c_str (),	2433	uuid.c_str (),
2578	&name,	2434	&name,
2579	title ? "\",title:\"" : "",	2435	title ? ",title:\"" : "",
2580	title ? (const char *)title : "",	2436	title ? (const char *)title : "",
		2437	title ? "\"" : "",
2581	flag_desc (flagdesc, 512), type);	2438	flag_desc (flagdesc, 512), type);
2582		2439
2583	if (!flag[FLAG_REMOVED] && env)	2440	if (!flag[FLAG_REMOVED] && env)
2584	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2441	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2585		2442

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC vs. Revision 1.256 by root, Sun Aug 31 05:47:14 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC vs.
Revision 1.256 by root, Sun Aug 31 05:47:14 2008 UTC