ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.322 by root, Sun Apr 11 00:34:05 2010 UTC vs.
Revision 1.323 by root, Sun Apr 11 23:56:09 2010 UTC

1149 else if (pl->container_ () == this) 1149 else if (pl->container_ () == this)
1150 { 1150 {
1151 // removing a container should close it 1151 // removing a container should close it
1152 close_container (); 1152 close_container ();
1153 } 1153 }
1154 1154 else
1155 esrv_del_item (pl->contr, count); 1155 esrv_del_item (pl->contr, count);
1156 } 1156 }
1157 1157
1158 /* link the object above us */ 1158 /* link the object above us */
1159 // re-link, make sure compiler can easily use cmove 1159 // re-link, make sure compiler can easily use cmove
1160 *(above ? &above->below : &ms.top) = below; 1160 *(above ? &above->below : &ms.top) = below;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines