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.216 by root, Sun Nov 8 20:55:39 2009 UTC vs.
Revision 1.217 by root, Sun Nov 8 22:28:10 2009 UTC

139#define WILL_APPLY_DOOR 0x08 139#define WILL_APPLY_DOOR 0x08
140#define WILL_APPLY_FOOD 0x10 140#define WILL_APPLY_FOOD 0x10
141 141
142struct body_slot 142struct body_slot
143{ 143{
144 signed char used:4; /* Calculated value based on items equipped */
144 signed char info:4; /* body info as loaded from the file */ 145 signed char info:4; /* body info as loaded from the file */
145 signed char used:4; /* Calculated value based on items equipped */
146}; 146};
147 147
148typedef struct oblnk 148typedef struct oblnk
149{ /* Used to link together several objects */ 149{ /* Used to link together several objects */
150 object_ptr ob; 150 object_ptr ob;
227 uint8 ACC (RW, pick_up); /* See crossfire.doc */ 227 uint8 ACC (RW, pick_up); /* See crossfire.doc */
228 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */ 228 sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
229 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ 229 sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
230 uint8 ACC (RW, weapontype); /* type of weapon */ 230 uint8 ACC (RW, weapontype); /* type of weapon */
231 231
232 body_slot slot [NUM_BODY_LOCATIONS];
233
232 faceidx ACC (RW, face); /* the graphical face */ 234 faceidx ACC (RW, face); /* the graphical face */
233 235
234 faceidx ACC (RW, sound); /* the sound face */ 236 faceidx ACC (RW, sound); /* the sound face */
235 faceidx ACC (RW, sound_destroy); /* played on destroy */ 237 faceidx ACC (RW, sound_destroy); /* played on destroy */
236
237 body_slot slot [NUM_BODY_LOCATIONS];
238 238
239 sint32 ACC (RW, weight); /* Attributes of the object */ 239 sint32 ACC (RW, weight); /* Attributes of the object */
240 sint32 ACC (RW, weight_limit);/* Weight-limit of object */ 240 sint32 ACC (RW, weight_limit);/* Weight-limit of object */
241 241
242 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */ 242 sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */
813 MTH void link (); 813 MTH void link ();
814 MTH void unlink (); 814 MTH void unlink ();
815 815
816 MTH static object *get (const char *name); // (find() || singularity)->instance() 816 MTH static object *get (const char *name); // (find() || singularity)->instance()
817 MTH object *instance (); 817 MTH object *instance ();
818
819 MTH void post_load_check (); // do some adjustments after parsing
818 820
819 object_vector_index ACC (RW, archid); // index in archvector 821 object_vector_index ACC (RW, archid); // index in archvector
820 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 822 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
821 823
822 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 824 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines