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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.23 by root, Sat Sep 9 21:48:28 2006 UTC vs.
Revision 1.24 by root, Sun Sep 10 00:51:23 2006 UTC

… …
241 241
242struct object : zero_initialised, object_keep, object_copy, object_pod 242struct object : zero_initialised, object_keep, object_copy, object_pod
243{ 243{
244 static object *create (); 244 static object *create ();
245 void free (bool free_inventory = false); 245 void free (bool free_inventory = false);
246 void mortalise ();
247 246
248 static void free_mortals (); 247 static void free_mortals ();
249 static bool can_merge (object *op1, object *op2); 248 static bool can_merge (object *op1, object *op2);
250 249
251 void clear (); 250 void clear ();
252 void clone (object *destination); 251 void clone (object *destination);
253 252
254protected: 253protected:
255 friend struct archetype; 254 friend struct archetype;
255
256 void link ();
257 void unlink ();
256 258
257 object (); 259 object ();
258 ~object (); 260 ~object ();
259}; 261};
260 262

Diff Legend

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