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.302 by root, Tue Nov 10 00:01:31 2009 UTC vs.
Revision 1.303 by root, Tue Nov 10 04:38:45 2009 UTC

… …
286 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
287 || ob1->value != ob2->value 287 || ob1->value != ob2->value
288 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
289 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 289 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
290 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
291 || ob1->materialname != ob2->materialname 291 || ob1->material != ob2->material
292 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
293 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
294 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
295 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
296 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
… …
844object::object () 844object::object ()
845{ 845{
846 SET_FLAG (this, FLAG_REMOVED); 846 SET_FLAG (this, FLAG_REMOVED);
847 847
848 //expmul = 1.0; declared const for the time being 848 //expmul = 1.0; declared const for the time being
849 face = blank_face; 849 face = blank_face;
850 material = &material_null;
850} 851}
851 852
852object::~object () 853object::~object ()
853{ 854{
854 unlink (); 855 unlink ();

Diff Legend

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