[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.253 by root, Sun Aug 17 22:46:26 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
…		…
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)
363	if (!pl->container \|\| this == pl->container)	351	\|\| this == pl->container)
364	return pl;	352	return pl;
365	}	353	}
366	}	354	}
367		355
368	return 0;	356	return 0;
369	}	357	}
370		358
371	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
372	static sint32	360	static sint32
373	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
374	{	362	{
375	return op->type == CONTAINER	363	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	365	: weight;
378	}	366	}
…		…
384	static void	372	static void
385	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
386	{	374	{
387	while (op)	375	while (op)
388	{	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
389	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
390		381
391	if (!weight)	382	if (!weight)
392	return;	383	return;
393		384
394	op->carrying += weight;	385	op->carrying += weight;
…		…
417	op->update_weight ();	408	op->update_weight ();
418		409
419	sum += op->total_weight ();	410	sum += op->total_weight ();
420	}	411	}
421		412
422	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
423		414
424	if (sum != carrying)	415	if (sum != carrying)
425	{	416	{
426	carrying = sum;	417	carrying = sum;
427		418
…		…
489	*/	480	*/
490	object *	481	object *
491	find_object_name (const char *str)	482	find_object_name (const char *str)
492	{	483	{
493	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
494	object *op;
495		485
		486	if (str_)
496	for_all_objects (op)	487	for_all_objects (op)
497	if (op->name == str_)	488	if (op->name == str_)
498	break;	489	return op;
499		490
500	return op;	491	return 0;
501	}	492	}
502		493
503	/*	494	/*
504	* 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
505	* skill and experience objects.	496	* skill and experience objects.
…		…
779	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	770	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
780	\|\| (m.move_on \| op->move_on ) != m.move_on	771	\|\| (m.move_on \| op->move_on ) != m.move_on
781	\|\| (m.move_off \| op->move_off ) != m.move_off	772	\|\| (m.move_off \| op->move_off ) != m.move_off
782	\|\| (m.move_slow \| op->move_slow) != m.move_slow	773	\|\| (m.move_slow \| op->move_slow) != m.move_slow
783	/* This isn't perfect, but I don't expect a lot of objects to	774	/* This isn't perfect, but I don't expect a lot of objects to
784	* to have move_allow right now.	775	* have move_allow right now.
785	*/	776	*/
786	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	777	\|\| ((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)	778	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
788	m.flags_ = 0;	779	m.flags_ = 0;
789	}	780	}
…		…
915	* drop on that space.	906	* drop on that space.
916	*/	907	*/
917	if (!drop_to_ground	908	if (!drop_to_ground
918	\|\| !map	909	\|\| !map
919	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
920	\|\| map->nodrop	911	\|\| map->no_drop
921	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
922	{	913	{
923	while (inv)	914	while (inv)
924	{
925	inv->destroy_inv (false);
926	inv->destroy ();	915	inv->destroy (true);
927	}
928	}	916	}
929	else	917	else
930	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
931	while (inv)	919	while (inv)
932	{	920	{
…		…
954		942
955	static struct freed_map : maptile	943	static struct freed_map : maptile
956	{	944	{
957	freed_map ()	945	freed_map ()
958	{	946	{
959	path = "<freed objects map>";	947	path = "<freed objects map>";
960	name = "/internal/freed_objects_map";	948	name = "/internal/freed_objects_map";
961	width = 3;	949	width = 3;
962	height = 3;	950	height = 3;
963	nodrop = 1;	951	no_drop = 1;
		952	no_reset = 1;
964		953
965	alloc ();	954	alloc ();
966	in_memory = MAP_ACTIVE;	955	in_memory = MAP_ACTIVE;
		956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
967	}	961	}
968	} freed_map; // freed objects are moved here to avoid crashes	962	} freed_map; // freed objects are moved here to avoid crashes
969		963
970	void	964	void
971	object::do_destroy ()	965	object::do_destroy ()
…		…
1062	if (object *pl = visible_to ())	1056	if (object *pl = visible_to ())
1063	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1059
1066	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1067
1068	*(above ? &above->below : &env->inv) = below;
1069
1070	if (below)
1071	below->above = above;
1072		1061
1073	/* we set up values so that it could be inserted into	1062	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up	1063	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.	1064	* to the caller to decide what we want to do.
1076	*/	1065	*/
1077	map = env->map;	1066	map = env->map;
1078	x = env->x;	1067	x = env->x;
1079	y = env->y;	1068	y = env->y;
		1069
		1070	// make sure cmov optimisation is applicable
		1071	*(above ? &above->below : &env->inv) = below;
		1072	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1073
1080	above = 0;	1074	above = 0;
1081	below = 0;	1075	below = 0;
1082	env = 0;	1076	env = 0;
1083		1077
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1078	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1114		1108
1115	esrv_del_item (pl->contr, count);	1109	esrv_del_item (pl->contr, count);
1116	}	1110	}
1117		1111
1118	/* link the object above us */	1112	/* link the object above us */
1119	if (above)	1113	// re-link, make sure compiler can easily use cmove
1120	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
1121	else	1115	*(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		1116
1139	above = 0;	1117	above = 0;
1140	below = 0;	1118	below = 0;
		1119
		1120	ms.flags_ = 0;
1141		1121
1142	if (map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
1143	return;	1123	return;
1144		1124
1145	int check_walk_off = !flag [FLAG_NO_APPLY];	1125	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1178	}	1158	}
1179		1159
1180	last = tmp;	1160	last = tmp;
1181	}	1161	}
1182		1162
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)	1163	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1191	update_all_los (map, x, y);	1164	update_all_los (map, x, y);
1192	}	1165	}
1193	}	1166	}
1194		1167
…		…
1257	* job preparing multi-part monsters.	1230	* job preparing multi-part monsters.
1258	*/	1231	*/
1259	object *	1232	object *
1260	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1233	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1261	{	1234	{
		1235	op->remove ();
		1236
1262	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1237	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1263	{	1238	{
1264	tmp->x = x + tmp->arch->x;	1239	tmp->x = x + tmp->arch->x;
1265	tmp->y = y + tmp->arch->y;	1240	tmp->y = y + tmp->arch->y;
1266	}	1241	}
…		…
1289	* just 'op' otherwise	1264	* just 'op' otherwise
1290	*/	1265	*/
1291	object *	1266	object *
1292	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1267	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1293	{	1268	{
1294	assert (!op->flag [FLAG_FREED]);	1269	if (op->is_on_map ())
		1270	{
		1271	LOG (llevError, "insert_ob_in_map called for object already on map");
		1272	abort ();
		1273	}
1295		1274
		1275	if (op->env)
		1276	{
		1277	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1296	op->remove ();	1278	op->remove ();
		1279	}
		1280
		1281	if (op->face && !face_info (op->face))//D TODO: remove soon
		1282	{//D
		1283	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1284	op->face = 1;//D
		1285	}//D
1297		1286
1298	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* 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	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1300	* need extra work	1289	* need extra work
1301	*/	1290	*/
1302	if (!xy_normalise (m, op->x, op->y))	1291	if (!xy_normalise (m, op->x, op->y))
1303	{	1292	{
1304	op->destroy (1);	1293	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1305	return 0;	1294	return 0;
1306	}	1295	}
1307		1296
1308	if (object *more = op->more)	1297	if (object *more = op->more)
1309	if (!insert_ob_in_map (more, m, originator, flag))	1298	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1318	*/	1307	*/
1319	if (op->nrof && !(flag & INS_NO_MERGE))	1308	if (op->nrof && !(flag & INS_NO_MERGE))
1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1309	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1321	if (object::can_merge (op, tmp))	1310	if (object::can_merge (op, tmp))
1322	{	1311	{
1323	// TODO: we atcually want to update tmp, not op,	1312	// TODO: we actually want to update tmp, not op,
1324	// but some caller surely breaks when we return tmp	1313	// but some caller surely breaks when we return tmp
1325	// from here :/	1314	// from here :/
1326	op->nrof += tmp->nrof;	1315	op->nrof += tmp->nrof;
1327	tmp->destroy (1);	1316	tmp->destroy (1);
1328	}	1317	}
…		…
1339	{	1328	{
1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1329	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1341	abort ();	1330	abort ();
1342	}	1331	}
1343		1332
		1333	if (!originator->is_on_map ())
		1334	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1335	op->debug_desc (), originator->debug_desc ());
		1336
1344	op->above = originator;	1337	op->above = originator;
1345	op->below = originator->below;	1338	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;	1339	originator->below = op;
		1340
		1341	*(op->below ? &op->below->above : &ms.bot) = op;
1354	}	1342	}
1355	else	1343	else
1356	{	1344	{
1357	object top, floor = NULL;	1345	object *floor = 0;
1358		1346	object *top = ms.top;
1359	top = ms.bot;
1360		1347
1361	/* If there are other objects, then */	1348	/* If there are other objects, then */
1362	if (top)	1349	if (top)
1363	{	1350	{
1364	object *last = 0;
1365
1366	/*	1351	/*
1367	* If there are multiple objects on this space, we do some trickier handling.	1352	* If there are multiple objects on this space, we do some trickier handling.
1368	* We've already dealt with merging if appropriate.	1353	* We've already dealt with merging if appropriate.
1369	* Generally, we want to put the new object on top. But if	1354	* Generally, we want to put the new object on top. But if
1370	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1355	* 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	1358	* 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	1359	* 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	1360	* when lots of spells are cast in one area. Currently, it is presumed
1376	* that flying non pickable objects are spell objects.	1361	* that flying non pickable objects are spell objects.
1377	*/	1362	*/
1378	for (top = ms.bot; top; top = top->above)	1363	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1379	{	1364	{
1380	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1365	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1381	floor = top;	1366	floor = tmp;
1382		1367
1383	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1368	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1384	{	1369	{
1385	/* We insert above top, so we want this object below this */	1370	/* We insert above top, so we want this object below this */
1386	top = top->below;	1371	top = tmp->below;
1387	break;	1372	break;
1388	}	1373	}
1389		1374
1390	last = top;	1375	top = tmp;
1391	}	1376	}
1392
1393	/* Don't want top to be NULL, so set it to the last valid object */
1394	top = last;
1395		1377
1396	/* We let update_position deal with figuring out what the space	1378	/* We let update_position deal with figuring out what the space
1397	* looks like instead of lots of conditions here.	1379	* looks like instead of lots of conditions here.
1398	* makes things faster, and effectively the same result.	1380	* makes things faster, and effectively the same result.
1399	*/	1381	*/
…		…
1406	*/	1388	*/
1407	if (!(flag & INS_ON_TOP)	1389	if (!(flag & INS_ON_TOP)
1408	&& ms.flags () & P_BLOCKSVIEW	1390	&& ms.flags () & P_BLOCKSVIEW
1409	&& (op->face && !faces [op->face].visibility))	1391	&& (op->face && !faces [op->face].visibility))
1410	{	1392	{
		1393	object *last;
		1394
1411	for (last = top; last != floor; last = last->below)	1395	for (last = top; last != floor; last = last->below)
1412	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1396	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1413	break;	1397	break;
1414		1398
1415	/* Check to see if we found the object that blocks view,	1399	/* Check to see if we found the object that blocks view,
…		…
1423	} /* If objects on this space */	1407	} /* If objects on this space */
1424		1408
1425	if (flag & INS_ABOVE_FLOOR_ONLY)	1409	if (flag & INS_ABOVE_FLOOR_ONLY)
1426	top = floor;	1410	top = floor;
1427		1411
1428	/* Top is the object that our object (op) is going to get inserted above.	1412	// insert object above top, or bottom-most if top = 0
1429	*/
1430
1431	/* First object on this space */
1432	if (!top)	1413	if (!top)
1433	{	1414	{
		1415	op->below = 0;
1434	op->above = ms.bot;	1416	op->above = ms.bot;
1435
1436	if (op->above)
1437	op->above->below = op;
1438
1439	op->below = 0;
1440	ms.bot = op;	1417	ms.bot = op;
		1418
		1419	*(op->above ? &op->above->below : &ms.top) = op;
1441	}	1420	}
1442	else	1421	else
1443	{ /* get inserted into the stack above top */	1422	{
1444	op->above = top->above;	1423	op->above = top->above;
1445
1446	if (op->above)
1447	op->above->below = op;	1424	top->above = op;
1448		1425
1449	op->below = top;	1426	op->below = top;
1450	top->above = op;	1427	*(op->above ? &op->above->below : &ms.top) = op;
1451	}	1428	}
1452		1429	}
1453	if (!op->above)
1454	ms.top = op;
1455	} /* else not INS_BELOW_ORIGINATOR */
1456		1430
1457	if (op->type == PLAYER)	1431	if (op->type == PLAYER)
1458	{	1432	{
1459	op->contr->do_los = 1;	1433	op->contr->do_los = 1;
1460	++op->map->players;	1434	++op->map->players;
…		…
1556	if (!nr)	1530	if (!nr)
1557	return true;	1531	return true;
1558		1532
1559	nr = min (nr, nrof);	1533	nr = min (nr, nrof);
1560		1534
		1535	if (nrof > nr)
		1536	{
1561	nrof -= nr;	1537	nrof -= nr;
1562
1563	if (nrof)
1564	{
1565	adjust_weight (env, -weight * nr); // carrying == 0	1538	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1566		1539
1567	if (object *pl = visible_to ())	1540	if (object *pl = visible_to ())
1568	esrv_update_item (UPD_NROF, pl, this);	1541	esrv_update_item (UPD_NROF, pl, this);
1569		1542
1570	return true;	1543	return true;
1571	}	1544	}
1572	else	1545	else
1573	{	1546	{
1574	destroy (1);	1547	destroy ();
1575	return false;	1548	return false;
1576	}	1549	}
1577	}	1550	}
1578		1551
1579	/*	1552	/*
…		…
1596	}	1569	}
1597	else	1570	else
1598	{	1571	{
1599	decrease (nr);	1572	decrease (nr);
1600		1573
1601	object *op = object_create_clone (this);	1574	object *op = deep_clone ();
1602	op->nrof = nr;	1575	op->nrof = nr;
1603	return op;	1576	return op;
1604	}	1577	}
1605	}	1578	}
1606		1579
…		…
1827	LOG (llevError, "Present_arch called outside map.\n");	1800	LOG (llevError, "Present_arch called outside map.\n");
1828	return NULL;	1801	return NULL;
1829	}	1802	}
1830		1803
1831	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1804	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1832	if (tmp->arch == at)	1805	if (tmp->arch->archname == at->archname)
1833	return tmp;	1806	return tmp;
1834		1807
1835	return NULL;	1808	return NULL;
1836	}	1809	}
1837		1810
…		…
1901	* The first matching object is returned, or NULL if none.	1874	* The first matching object is returned, or NULL if none.
1902	*/	1875	*/
1903	object *	1876	object *
1904	present_arch_in_ob (const archetype at, const object op)	1877	present_arch_in_ob (const archetype at, const object op)
1905	{	1878	{
1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1879	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1907	if (tmp->arch == at)	1880	if (tmp->arch->archname == at->archname)
1908	return tmp;	1881	return tmp;
1909		1882
1910	return NULL;	1883	return NULL;
1911	}	1884	}
1912		1885
…		…
2321		2294
2322	/*	2295	/*
2323	* create clone from object to another	2296	* create clone from object to another
2324	*/	2297	*/
2325	object *	2298	object *
2326	object_create_clone (object *asrc)	2299	object::deep_clone ()
2327	{	2300	{
		2301	assert (("deep_clone called on non-head object", is_head ()));
		2302
2328	object *dst = 0;	2303	object *dst = clone ();
2329		2304
2330	if (!asrc)
2331	return 0;
2332
2333	object *src = asrc->head_ ();
2334
2335	object *prev = 0;	2305	object *prev = dst;
2336	for (object *part = src; part; part = part->more)	2306	for (object *part = this->more; part; part = part->more)
2337	{	2307	{
2338	object *tmp = part->clone ();	2308	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;	2309	tmp->head = dst;
2350
2351	tmp->more = 0;
2352
2353	if (prev)
2354	prev->more = tmp;	2310	prev->more = tmp;
2355
2356	prev = tmp;	2311	prev = tmp;
2357	}	2312	}
2358		2313
2359	for (object *item = src->inv; item; item = item->below)	2314	for (object *item = inv; item; item = item->below)
2360	insert_ob_in_ob (object_create_clone (item), dst);	2315	insert_ob_in_ob (item->deep_clone (), dst);
2361		2316
2362	return dst;	2317	return dst;
2363	}	2318	}
2364		2319
2365	/* This returns the first object in who's inventory that	2320	/* This returns the first object in who's inventory that
…		…
2374	return tmp;	2329	return tmp;
2375		2330
2376	return 0;	2331	return 0;
2377	}	2332	}
2378		2333
2379	/* If ob has a field named key, return the link from the list,	2334	const shstr &
2380	* otherwise return NULL.	2335	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	{	2336	{
2388	for (key_value *link = ob->key_values; link; link = link->next)	2337	for (key_value *kv = key_values; kv; kv = kv->next)
2389	if (link->key == key)	2338	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;	2339	return kv->value;
2424		2340
2425	return 0;	2341	return shstr_null;
2426	}	2342	}
2427		2343
2428	/*	2344	void
2429	* Updates the canonical_key in op to value.	2345	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	{	2346	{
2441	key_value field = NULL, last = NULL;	2347	for (key_value *kv = key_values; kv; kv = kv->next)
2442		2348	if (kv->key == key)
2443	for (field = op->key_values; field != NULL; field = field->next)
2444	{
2445	if (field->key != canonical_key)
2446	{	2349	{
2447	last = field;	2350	kv->value = value;
2448	continue;	2351	return;
2449	}	2352	}
2450		2353
2451	if (value)	2354	key_value *kv = new key_value;
2452	field->value = value;	2355
2453	else	2356	kv->next = key_values;
		2357	kv->key = key;
		2358	kv->value = value;
		2359
		2360	key_values = kv;
		2361	}
		2362
		2363	void
		2364	object::kv_del (const shstr &key)
		2365	{
		2366	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2367	if ((*kvp)->key == key)
2454	{	2368	{
2455	/* Basically, if the archetype has this key set,	2369	key_value kv = kvp;
2456	* we need to store the null value so when we save	2370	kvp = (kvp)->next;
2457	* it, we save the empty value so that when we load,	2371	delete kv;
2458	* we get this value back again.	2372	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	}	2373	}
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	}	2374	}
2517		2375
2518	object::depth_iterator::depth_iterator (object *container)	2376	object::depth_iterator::depth_iterator (object *container)
2519	: iterator_base (container)	2377	: iterator_base (container)
2520	{	2378	{
…		…
2570	{	2428	{
2571	char flagdesc[512];	2429	char flagdesc[512];
2572	char info2[256 * 4];	2430	char info2[256 * 4];
2573	char *p = info;	2431	char *p = info;
2574		2432
2575	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2433	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2576	count,	2434	count,
2577	uuid.c_str (),	2435	uuid.c_str (),
2578	&name,	2436	&name,
2579	title ? "\",title:\"" : "",	2437	title ? ",title:\"" : "",
2580	title ? (const char *)title : "",	2438	title ? (const char *)title : "",
		2439	title ? "\"" : "",
2581	flag_desc (flagdesc, 512), type);	2440	flag_desc (flagdesc, 512), type);
2582		2441
2583	if (!flag[FLAG_REMOVED] && env)	2442	if (!flag[FLAG_REMOVED] && env)
2584	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2443	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2585		2444

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.253 by root, Sun Aug 17 22:46:26 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.253 by root, Sun Aug 17 22:46:26 2008 UTC