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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.226 by root, Sat May 3 08:50:30 2008 UTC vs.
Revision 1.247 by root, Mon Jul 14 18:36:43 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
…		…
368	return 0;	355	return 0;
369	}	356	}
370		357
371	// adjust weight per container type ("of holding")	358	// adjust weight per container type ("of holding")
372	static sint32	359	static sint32
373	weight_adjust (object *op, sint32 weight)	360	weight_adjust_for (object *op, sint32 weight)
374	{	361	{
375	return op->type == CONTAINER	362	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	363	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	364	: weight;
378	}	365	}
…		…
384	static void	371	static void
385	adjust_weight (object *op, sint32 weight)	372	adjust_weight (object *op, sint32 weight)
386	{	373	{
387	while (op)	374	while (op)
388	{	375	{
		376	// adjust by actual difference to account for rounding errors
		377	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	378	weight = weight_adjust_for (op, op->carrying)
		379	- weight_adjust_for (op, op->carrying - weight);
390		380
391	if (!weight)	381	if (!weight)
392	return;	382	return;
393		383
394	op->carrying += weight;	384	op->carrying += weight;
…		…
417	op->update_weight ();	407	op->update_weight ();
418		408
419	sum += op->total_weight ();	409	sum += op->total_weight ();
420	}	410	}
421		411
422	sum = weight_adjust (this, sum);	412	sum = weight_adjust_for (this, sum);
423		413
424	if (sum != carrying)	414	if (sum != carrying)
425	{	415	{
426	carrying = sum;	416	carrying = sum;
427		417
…		…
489	*/	479	*/
490	object *	480	object *
491	find_object_name (const char *str)	481	find_object_name (const char *str)
492	{	482	{
493	shstr_cmp str_ (str);	483	shstr_cmp str_ (str);
494	object *op;
495		484
		485	if (str_)
496	for_all_objects (op)	486	for_all_objects (op)
497	if (op->name == str_)	487	if (op->name == str_)
498	break;	488	return op;
499		489
500	return op;	490	return 0;
501	}	491	}
502		492
503	/*	493	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	494	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	495	* skill and experience objects.
…		…
603	}	593	}
604		594
605	op->key_values = 0;	595	op->key_values = 0;
606	}	596	}
607		597
608	object &	598	/*
609	object::operator =(const object &src)	599	* copy_to first frees everything allocated by the dst object,
		600	* and then copies the contents of itself into the second
		601	* object, allocating what needs to be allocated. Basically, any
		602	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		603	* if the first object is freed, the pointers in the new object
		604	* will point at garbage.
		605	*/
		606	void
		607	object::copy_to (object *dst)
610	{	608	{
611	remove ();	609	dst->remove ();
612
613	(object_copy )this = src;	610	(object_copy )dst = *this;
614
615	flag [FLAG_REMOVED] = true;	611	dst->flag [FLAG_REMOVED] = true;
616		612
617	/* Copy over key_values, if any. */	613	/* Copy over key_values, if any. */
618	if (src.key_values)	614	if (key_values)
619	{	615	{
620	key_value *tail = 0;	616	key_value *tail = 0;
621	key_values = 0;	617	dst->key_values = 0;
622		618
623	for (key_value *i = src.key_values; i; i = i->next)	619	for (key_value *i = key_values; i; i = i->next)
624	{	620	{
625	key_value *new_link = new key_value;	621	key_value *new_link = new key_value;
626		622
627	new_link->next = 0;	623	new_link->next = 0;
628	new_link->key = i->key;	624	new_link->key = i->key;
629	new_link->value = i->value;	625	new_link->value = i->value;
630		626
631	/* Try and be clever here, too. */	627	/* Try and be clever here, too. */
632	if (!key_values)	628	if (!dst->key_values)
633	{	629	{
634	key_values = new_link;	630	dst->key_values = new_link;
635	tail = new_link;	631	tail = new_link;
636	}	632	}
637	else	633	else
638	{	634	{
639	tail->next = new_link;	635	tail->next = new_link;
640	tail = new_link;	636	tail = new_link;
641	}	637	}
642	}	638	}
643	}	639	}
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		640
659	if (speed < 0)	641	if (speed < 0)
660	dst->speed_left -= rndm ();	642	dst->speed_left -= rndm ();
661		643
662	dst->set_speed (dst->speed);	644	dst->set_speed (dst->speed);
…		…
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	{	914	{
933	inv->destroy_inv (false);	915	inv->destroy_inv (false);
…		…
962		944
963	static struct freed_map : maptile	945	static struct freed_map : maptile
964	{	946	{
965	freed_map ()	947	freed_map ()
966	{	948	{
967	path = "<freed objects map>";	949	path = "<freed objects map>";
968	name = "/internal/freed_objects_map";	950	name = "/internal/freed_objects_map";
969	width = 3;	951	width = 3;
970	height = 3;	952	height = 3;
971	nodrop = 1;	953	no_drop = 1;
		954	no_reset = 1;
972		955
973	alloc ();	956	alloc ();
974	in_memory = MAP_ACTIVE;	957	in_memory = MAP_ACTIVE;
		958	}
		959
		960	~freed_map ()
		961	{
		962	destroy ();
975	}	963	}
976	} freed_map; // freed objects are moved here to avoid crashes	964	} freed_map; // freed objects are moved here to avoid crashes
977		965
978	void	966	void
979	object::do_destroy ()	967	object::do_destroy ()
…		…
1070	if (object *pl = visible_to ())	1058	if (object *pl = visible_to ())
1071	esrv_del_item (pl->contr, count);	1059	esrv_del_item (pl->contr, count);
1072	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1073		1061
1074	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
1075
1076	*(above ? &above->below : &env->inv) = below;
1077
1078	if (below)
1079	below->above = above;
1080		1063
1081	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1082	* the map, but we don't actually do that - it is up	1065	* the map, but we don't actually do that - it is up
1083	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1084	*/	1067	*/
1085	map = env->map;	1068	map = env->map;
1086	x = env->x;	1069	x = env->x;
1087	y = env->y;	1070	y = env->y;
		1071
		1072	// make sure cmov optimisation is applicable
		1073	*(above ? &above->below : &env->inv) = below;
		1074	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1075
1088	above = 0;	1076	above = 0;
1089	below = 0;	1077	below = 0;
1090	env = 0;	1078	env = 0;
1091		1079
1092	/* NO_FIX_PLAYER is set when a great many changes are being	1080	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1122		1110
1123	esrv_del_item (pl->contr, count);	1111	esrv_del_item (pl->contr, count);
1124	}	1112	}
1125		1113
1126	/* link the object above us */	1114	/* link the object above us */
1127	if (above)	1115	// re-link, make sure compiler can easily use cmove
1128	above->below = below;	1116	*(above ? &above->below : &ms.top) = below;
1129	else	1117	*(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		1118
1147	above = 0;	1119	above = 0;
1148	below = 0;	1120	below = 0;
1149		1121
1150	if (map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
…		…
1265	* job preparing multi-part monsters.	1237	* job preparing multi-part monsters.
1266	*/	1238	*/
1267	object *	1239	object *
1268	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1240	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1269	{	1241	{
		1242	op->remove ();
		1243
1270	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1244	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271	{	1245	{
1272	tmp->x = x + tmp->arch->x;	1246	tmp->x = x + tmp->arch->x;
1273	tmp->y = y + tmp->arch->y;	1247	tmp->y = y + tmp->arch->y;
1274	}	1248	}
…		…
1297	* just 'op' otherwise	1271	* just 'op' otherwise
1298	*/	1272	*/
1299	object *	1273	object *
1300	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1274	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1301	{	1275	{
1302	assert (!op->flag [FLAG_FREED]);	1276	if (op->is_on_map ())
		1277	{
		1278	LOG (llevError, "insert_ob_in_map called for object already on map");
		1279	abort ();
		1280	}
1303		1281
		1282	if (op->env)
		1283	{
		1284	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1304	op->remove ();	1285	op->remove ();
		1286	}
		1287
		1288	if (op->face && !face_info (op->face))//D TODO: remove soon
		1289	{//D
		1290	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1291	op->face = 1;//D
		1292	}//D
1305		1293
1306	/* Ideally, the caller figures this out. However, it complicates a lot	1294	/* Ideally, the caller figures this out. However, it complicates a lot
1307	* of areas of callers (eg, anything that uses find_free_spot would now	1295	* of areas of callers (eg, anything that uses find_free_spot would now
1308	* need extra work	1296	* need extra work
1309	*/	1297	*/
1310	if (!xy_normalise (m, op->x, op->y))	1298	if (!xy_normalise (m, op->x, op->y))
1311	{	1299	{
1312	op->destroy (1);	1300	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1313	return 0;	1301	return 0;
1314	}	1302	}
1315		1303
1316	if (object *more = op->more)	1304	if (object *more = op->more)
1317	if (!insert_ob_in_map (more, m, originator, flag))	1305	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1326	*/	1314	*/
1327	if (op->nrof && !(flag & INS_NO_MERGE))	1315	if (op->nrof && !(flag & INS_NO_MERGE))
1328	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1316	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329	if (object::can_merge (op, tmp))	1317	if (object::can_merge (op, tmp))
1330	{	1318	{
1331	// TODO: we atcually want to update tmp, not op,	1319	// TODO: we actually want to update tmp, not op,
1332	// but some caller surely breaks when we return tmp	1320	// but some caller surely breaks when we return tmp
1333	// from here :/	1321	// from here :/
1334	op->nrof += tmp->nrof;	1322	op->nrof += tmp->nrof;
1335	tmp->destroy (1);	1323	tmp->destroy (1);
1336	}	1324	}
…		…
1347	{	1335	{
1348	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1336	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1349	abort ();	1337	abort ();
1350	}	1338	}
1351		1339
		1340	if (!originator->is_on_map ())
		1341	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1342	op->debug_desc (), originator->debug_desc ());
		1343
1352	op->above = originator;	1344	op->above = originator;
1353	op->below = originator->below;	1345	op->below = originator->below;
1354
1355	if (op->below)
1356	op->below->above = op;
1357	else
1358	ms.bot = op;
1359
1360	/* since below originator, no need to update top */
1361	originator->below = op;	1346	originator->below = op;
		1347
		1348	*(op->below ? &op->below->above : &ms.bot) = op;
1362	}	1349	}
1363	else	1350	else
1364	{	1351	{
1365	object top, floor = NULL;	1352	object *floor = 0;
1366		1353	object *top = ms.top;
1367	top = ms.bot;
1368		1354
1369	/* If there are other objects, then */	1355	/* If there are other objects, then */
1370	if (top)	1356	if (top)
1371	{	1357	{
1372	object *last = 0;
1373
1374	/*	1358	/*
1375	* If there are multiple objects on this space, we do some trickier handling.	1359	* If there are multiple objects on this space, we do some trickier handling.
1376	* We've already dealt with merging if appropriate.	1360	* We've already dealt with merging if appropriate.
1377	* Generally, we want to put the new object on top. But if	1361	* Generally, we want to put the new object on top. But if
1378	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1381	* once we get to them. This reduces the need to traverse over all of	1365	* once we get to them. This reduces the need to traverse over all of
1382	* them when adding another one - this saves quite a bit of cpu time	1366	* them when adding another one - this saves quite a bit of cpu time
1383	* when lots of spells are cast in one area. Currently, it is presumed	1367	* when lots of spells are cast in one area. Currently, it is presumed
1384	* that flying non pickable objects are spell objects.	1368	* that flying non pickable objects are spell objects.
1385	*/	1369	*/
1386	for (top = ms.bot; top; top = top->above)	1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1387	{	1371	{
1388	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1372	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1389	floor = top;	1373	floor = tmp;
1390		1374
1391	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1375	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1392	{	1376	{
1393	/* We insert above top, so we want this object below this */	1377	/* We insert above top, so we want this object below this */
1394	top = top->below;	1378	top = tmp->below;
1395	break;	1379	break;
1396	}	1380	}
1397		1381
1398	last = top;	1382	top = tmp;
1399	}	1383	}
1400
1401	/* Don't want top to be NULL, so set it to the last valid object */
1402	top = last;
1403		1384
1404	/* We let update_position deal with figuring out what the space	1385	/* We let update_position deal with figuring out what the space
1405	* looks like instead of lots of conditions here.	1386	* looks like instead of lots of conditions here.
1406	* makes things faster, and effectively the same result.	1387	* makes things faster, and effectively the same result.
1407	*/	1388	*/
…		…
1414	*/	1395	*/
1415	if (!(flag & INS_ON_TOP)	1396	if (!(flag & INS_ON_TOP)
1416	&& ms.flags () & P_BLOCKSVIEW	1397	&& ms.flags () & P_BLOCKSVIEW
1417	&& (op->face && !faces [op->face].visibility))	1398	&& (op->face && !faces [op->face].visibility))
1418	{	1399	{
		1400	object *last;
		1401
1419	for (last = top; last != floor; last = last->below)	1402	for (last = top; last != floor; last = last->below)
1420	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1421	break;	1404	break;
1422		1405
1423	/* Check to see if we found the object that blocks view,	1406	/* Check to see if we found the object that blocks view,
…		…
1431	} /* If objects on this space */	1414	} /* If objects on this space */
1432		1415
1433	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1434	top = floor;	1417	top = floor;
1435		1418
1436	/* Top is the object that our object (op) is going to get inserted above.	1419	// insert object above top, or bottom-most if top = 0
1437	*/
1438
1439	/* First object on this space */
1440	if (!top)	1420	if (!top)
1441	{	1421	{
		1422	op->below = 0;
1442	op->above = ms.bot;	1423	op->above = ms.bot;
1443
1444	if (op->above)
1445	op->above->below = op;
1446
1447	op->below = 0;
1448	ms.bot = op;	1424	ms.bot = op;
		1425
		1426	*(op->above ? &op->above->below : &ms.top) = op;
1449	}	1427	}
1450	else	1428	else
1451	{ /* get inserted into the stack above top */	1429	{
1452	op->above = top->above;	1430	op->above = top->above;
1453
1454	if (op->above)
1455	op->above->below = op;	1431	top->above = op;
1456		1432
1457	op->below = top;	1433	op->below = top;
1458	top->above = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1459	}	1435	}
1460		1436	}
1461	if (!op->above)
1462	ms.top = op;
1463	} /* else not INS_BELOW_ORIGINATOR */
1464		1437
1465	if (op->type == PLAYER)	1438	if (op->type == PLAYER)
1466	{	1439	{
1467	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1468	++op->map->players;	1441	++op->map->players;
…		…
1568		1541
1569	nrof -= nr;	1542	nrof -= nr;
1570		1543
1571	if (nrof)	1544	if (nrof)
1572	{	1545	{
1573	adjust_weight (env, -weight * nr); // carrying == 0	1546	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1574		1547
1575	if (object *pl = visible_to ())	1548	if (object *pl = visible_to ())
1576	esrv_update_item (UPD_NROF, pl, this);	1549	esrv_update_item (UPD_NROF, pl, this);
1577		1550
1578	return true;	1551	return true;
…		…
1604	}	1577	}
1605	else	1578	else
1606	{	1579	{
1607	decrease (nr);	1580	decrease (nr);
1608		1581
1609	object *op = object_create_clone (this);	1582	object *op = deep_clone ();
1610	op->nrof = nr;	1583	op->nrof = nr;
1611	return op;	1584	return op;
1612	}	1585	}
1613	}	1586	}
1614		1587
…		…
1835	LOG (llevError, "Present_arch called outside map.\n");	1808	LOG (llevError, "Present_arch called outside map.\n");
1836	return NULL;	1809	return NULL;
1837	}	1810	}
1838		1811
1839	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1812	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1840	if (tmp->arch == at)	1813	if (tmp->arch->archname == at->archname)
1841	return tmp;	1814	return tmp;
1842		1815
1843	return NULL;	1816	return NULL;
1844	}	1817	}
1845		1818
…		…
1909	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
1910	*/	1883	*/
1911	object *	1884	object *
1912	present_arch_in_ob (const archetype at, const object op)	1885	present_arch_in_ob (const archetype at, const object op)
1913	{	1886	{
1914	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1887	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1915	if (tmp->arch == at)	1888	if (tmp->arch->archname == at->archname)
1916	return tmp;	1889	return tmp;
1917		1890
1918	return NULL;	1891	return NULL;
1919	}	1892	}
1920		1893
…		…
2329		2302
2330	/*	2303	/*
2331	* create clone from object to another	2304	* create clone from object to another
2332	*/	2305	*/
2333	object *	2306	object *
2334	object_create_clone (object *asrc)	2307	object::deep_clone ()
2335	{	2308	{
		2309	assert (("deep_clone called on non-head object", is_head ()));
		2310
2336	object *dst = 0;	2311	object *dst = clone ();
2337		2312
2338	if (!asrc)
2339	return 0;
2340
2341	object *src = asrc->head_ ();
2342
2343	object *prev = 0;	2313	object *prev = dst;
2344	for (object *part = src; part; part = part->more)	2314	for (object *part = this->more; part; part = part->more)
2345	{	2315	{
2346	object *tmp = part->clone ();	2316	object *tmp = part->clone ();
2347
2348	tmp->x -= src->x;
2349	tmp->y -= src->y;
2350
2351	if (!part->head)
2352	{
2353	dst = tmp;
2354	tmp->head = 0;
2355	}
2356	else
2357	tmp->head = dst;	2317	tmp->head = dst;
2358
2359	tmp->more = 0;
2360
2361	if (prev)
2362	prev->more = tmp;	2318	prev->more = tmp;
2363
2364	prev = tmp;	2319	prev = tmp;
2365	}	2320	}
2366		2321
2367	for (object *item = src->inv; item; item = item->below)	2322	for (object *item = inv; item; item = item->below)
2368	insert_ob_in_ob (object_create_clone (item), dst);	2323	insert_ob_in_ob (item->deep_clone (), dst);
2369		2324
2370	return dst;	2325	return dst;
2371	}	2326	}
2372		2327
2373	/* This returns the first object in who's inventory that	2328	/* This returns the first object in who's inventory that
…		…
2382	return tmp;	2337	return tmp;
2383		2338
2384	return 0;	2339	return 0;
2385	}	2340	}
2386		2341
2387	/* If ob has a field named key, return the link from the list,	2342	const shstr &
2388	* otherwise return NULL.	2343	object::kv_get (const shstr &key) const
2389	*
2390	* key must be a passed in shared string - otherwise, this won't
2391	* do the desired thing.
2392	*/
2393	key_value *
2394	get_ob_key_link (const object ob, const char key)
2395	{	2344	{
2396	for (key_value *link = ob->key_values; link; link = link->next)	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2397	if (link->key == key)	2346	if (kv->key == key)
2398	return link;
2399
2400	return 0;
2401	}
2402
2403	/*
2404	* Returns the value of op has an extra_field for key, or NULL.
2405	*
2406	* The argument doesn't need to be a shared string.
2407	*
2408	* The returned string is shared.
2409	*/
2410	const char *
2411	get_ob_key_value (const object op, const char const key)
2412	{
2413	key_value *link;
2414	shstr_cmp canonical_key (key);
2415
2416	if (!canonical_key)
2417	{
2418	/* 1. There being a field named key on any object
2419	* implies there'd be a shared string to find.
2420	* 2. Since there isn't, no object has this field.
2421	* 3. Therefore, this object doesn't have this field.
2422	*/
2423	return 0;
2424	}
2425
2426	/* This is copied from get_ob_key_link() above -
2427	* only 4 lines, and saves the function call overhead.
2428	*/
2429	for (link = op->key_values; link; link = link->next)
2430	if (link->key == canonical_key)
2431	return link->value;	2347	return kv->value;
2432		2348
2433	return 0;	2349	return shstr_null;
2434	}	2350	}
2435		2351
2436	/*	2352	void
2437	* Updates the canonical_key in op to value.	2353	object::kv_set (const shstr &key, const shstr &value)
2438	*
2439	* canonical_key is a shared string (value doesn't have to be).
2440	*
2441	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2442	* keys.
2443	*
2444	* Returns TRUE on success.
2445	*/
2446	int
2447	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2448	{	2354	{
2449	key_value field = NULL, last = NULL;	2355	for (key_value *kv = key_values; kv; kv = kv->next)
2450		2356	if (kv->key == key)
2451	for (field = op->key_values; field != NULL; field = field->next)
2452	{
2453	if (field->key != canonical_key)
2454	{	2357	{
2455	last = field;	2358	kv->value = value;
2456	continue;	2359	return;
2457	}	2360	}
2458		2361
2459	if (value)	2362	key_value *kv = new key_value;
2460	field->value = value;	2363
2461	else	2364	kv->next = key_values;
		2365	kv->key = key;
		2366	kv->value = value;
		2367
		2368	key_values = kv;
		2369	}
		2370
		2371	void
		2372	object::kv_del (const shstr &key)
		2373	{
		2374	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2375	if ((*kvp)->key == key)
2462	{	2376	{
2463	/* Basically, if the archetype has this key set,	2377	key_value kv = kvp;
2464	* we need to store the null value so when we save	2378	kvp = (kvp)->next;
2465	* it, we save the empty value so that when we load,	2379	delete kv;
2466	* we get this value back again.	2380	return;
2467	*/
2468	if (get_ob_key_link (op->arch, canonical_key))
2469	field->value = 0;
2470	else
2471	{
2472	if (last)
2473	last->next = field->next;
2474	else
2475	op->key_values = field->next;
2476
2477	delete field;
2478	}
2479	}	2381	}
2480	return TRUE;
2481	}
2482	/* IF we get here, key doesn't exist */
2483
2484	/* No field, we'll have to add it. */
2485
2486	if (!add_key)
2487	return FALSE;
2488
2489	/* There isn't any good reason to store a null
2490	* value in the key/value list. If the archetype has
2491	* this key, then we should also have it, so shouldn't
2492	* be here. If user wants to store empty strings,
2493	* should pass in ""
2494	*/
2495	if (value == NULL)
2496	return TRUE;
2497
2498	field = new key_value;
2499
2500	field->key = canonical_key;
2501	field->value = value;
2502	/* Usual prepend-addition. */
2503	field->next = op->key_values;
2504	op->key_values = field;
2505
2506	return TRUE;
2507	}
2508
2509	/*
2510	* Updates the key in op to value.
2511	*
2512	* If add_key is FALSE, this will only update existing keys,
2513	* and not add new ones.
2514	* In general, should be little reason FALSE is ever passed in for add_key
2515	*
2516	* Returns TRUE on success.
2517	*/
2518	int
2519	set_ob_key_value (object op, const char key, const char *value, int add_key)
2520	{
2521	shstr key_ (key);
2522
2523	return set_ob_key_value_s (op, key_, value, add_key);
2524	}	2382	}
2525		2383
2526	object::depth_iterator::depth_iterator (object *container)	2384	object::depth_iterator::depth_iterator (object *container)
2527	: iterator_base (container)	2385	: iterator_base (container)
2528	{	2386	{
…		…
2578	{	2436	{
2579	char flagdesc[512];	2437	char flagdesc[512];
2580	char info2[256 * 4];	2438	char info2[256 * 4];
2581	char *p = info;	2439	char *p = info;
2582		2440
2583	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2441	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2584	count,	2442	count,
2585	uuid.c_str (),	2443	uuid.c_str (),
2586	&name,	2444	&name,
2587	title ? "\",title:\"" : "",	2445	title ? ",title:\"" : "",
2588	title ? (const char *)title : "",	2446	title ? (const char *)title : "",
		2447	title ? "\"" : "",
2589	flag_desc (flagdesc, 512), type);	2448	flag_desc (flagdesc, 512), type);
2590		2449
2591	if (!flag[FLAG_REMOVED] && env)	2450	if (!flag[FLAG_REMOVED] && env)
2592	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2451	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2593		2452

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.226 by root, Sat May 3 08:50:30 2008 UTC vs. Revision 1.247 by root, Mon Jul 14 18:36:43 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.226 by root, Sat May 3 08:50:30 2008 UTC vs.
Revision 1.247 by root, Mon Jul 14 18:36:43 2008 UTC