[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.22 by root, Sun Dec 3 00:59:58 2006 UTC vs.
Revision 1.23 by root, Mon Dec 11 23:35:37 2006 UTC

…		…
670		670
671	if (QUERY_FLAG (tmp, FLAG_APPLIED))	671	if (QUERY_FLAG (tmp, FLAG_APPLIED))
672	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	672	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))
673	return; /* can't unapply it */	673	return; /* can't unapply it */
674		674
675	/* We are only dropping some of the items. We split the current objec	675	/* We are only dropping some of the items. We split the current object
676	* off	676	* off
677	*/	677	*/
678	if (nrof && tmp->nrof != nrof)	678	if (nrof && tmp->nrof != nrof)
679	{	679	{
680	object *tmp2 = tmp;	680	object *tmp2 = tmp;

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