--- deliantra/server/include/object.h 2008/10/06 18:26:35 1.186 +++ deliantra/server/include/object.h 2008/11/16 03:52:12 1.188 @@ -142,8 +142,6 @@ // these are being copied struct object_copy : attachable { - typedef bitset flags_t; - sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */ @@ -157,13 +155,15 @@ shstr ACC (RW, race); /* human, goblin, dragon, etc */ shstr ACC (RW, slaying); /* Which race to do double damage to */ /* If this is an exit, this is the filename */ - shstr ACC (RW, tag); // a tag used to tracking this object - shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ - shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ - shstr ACC (RW, lore); /* Obscure information about this object, */ - /* To get put into books and the like. */ + + typedef bitset flags_t; + flags_t flag; /* various flags */ +#if FOR_PERL + bool ACC (RW, flag[NUM_FLAGS]); +#endif + shstr ACC (RW, materialname); /* specific material name */ - shstr ACC (RW, custom_name); /* Custom name assigned by player */ + shstr ACC (RW, skill); /* Name of the skill this object uses/grants */ // materialtype_t *ACC (RW, material); /* What material this object consists of */ object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */ object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */ @@ -181,15 +181,17 @@ /* This next big block is basically used for monsters and equipment */ uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */ - sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */ + uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */ uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */ uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */ uint32 ACC (RW, path_denied); /* Paths the object is denied access to */ + uint16 ACC (RW, materials); /* What materials this object consists of */ sint8 ACC (RW, magic); /* Any magical bonuses to this item */ uint8 ACC (RW, state); /* How the object was last drawn (animation) */ + sint32 ACC (RW, value); /* How much money it is worth (or contains) */ /* Note that the last_.. values are sometimes used for non obvious * meanings by some objects, eg, sp penalty, permanent exp. @@ -200,25 +202,27 @@ sint16 ACC (RW, last_eat); /* How long since we last ate */ sint16 ACC (RW, invisible); /* How much longer the object will be invis */ sint16 ACC (RW, level); /* Level of creature or object */ + uint8 ACC (RW, pick_up); /* See crossfire.doc */ - sint8 ACC (RW, item_power); /* power rating of the object */ sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */ sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */ + uint8 ACC (RW, weapontype); /* type of weapon */ + + faceidx ACC (RW, face); /* the graphical face */ + + faceidx ACC (RW, sound); /* the sound face */ + faceidx ACC (RW, sound_destroy); /* played on destroy */ + + body_slot slot [NUM_BODY_LOCATIONS]; + sint32 ACC (RW, weight); /* Attributes of the object */ sint32 ACC (RW, weight_limit);/* Weight-limit of object */ sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */ sint64 ACC (RW, perm_exp); /* Permanent exp */ - uint32 ACC (RW, weapontype); /* type of weapon */ - uint32 ACC (RW, tooltype); /* type of tool or build facility */ - body_slot slot [NUM_BODY_LOCATIONS]; - faceidx ACC (RW, face); /* the graphical face */ - faceidx ACC (RW, sound); /* the sound face */ - faceidx ACC (RW, sound_destroy); /* played on destroy */ living ACC (RO, stats); /* Str, Con, Dex, etc */ /* See the pod/objects.pod for more info about body locations */ /* Following mostly refers to fields only used for monsters */ - uint32 ACC (RW, hide); /* The object is hidden, not invisible */ /* allows different movement patterns for attackers */ sint32 ACC (RW, move_status); /* What stage in attack mode */ @@ -234,39 +238,46 @@ sint16 ACC (RW, duration); /* How long the spell lasts */ sint16 ACC (RW, casting_time);/* time left before spell goes off */ - uint16 ACC (RW, start_holding); uint8 ACC (RW, duration_modifier); /* how level modifies duration */ uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */ - sint8 ACC (RW, range); /* Range of the spell */ uint8 ACC (RW, range_modifier); /* How going up in level effects range */ + MoveType ACC (RW, move_type); /* Type of movement this object uses */ MoveType ACC (RW, move_block);/* What movement types this blocks */ - MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */ MoveType ACC (RW, move_on); /* Move types affected moving on to this space */ + MoveType ACC (RW, move_off); /* Move types affected moving off this space */ MoveType ACC (RW, move_slow); /* Movement types this slows down */ - float ACC (RW, move_slow_penalty); /* How much this slows down the object */ + sint8 ACC (RW, item_power); /* power rating of the object */ + // 8 free bits + float ACC (RW, move_slow_penalty); /* How much this slows down the object */ char *ACC (RW, spellarg); /* Following are values used by any object */ /* this objects turns into or what this object creates */ treasurelist *ACC (RW, randomitems); /* Items to be generated */ - flags_t flag; /* various flags */ -#if FOR_PERL - bool ACC (RW, flag[NUM_FLAGS]); -#endif + uint16 ACC (RW, animation_id);/* An index into the animation array */ uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ uint8 ACC (RW, last_anim); /* last sequence used to draw face */ + uint8 ACC (RW, smoothlevel); /* how to smooth this square around */ uint8 ACC (RW, will_apply); /* See crossfire.doc */ uint16 ACC (RW, cached_sp); /* cached spell points used for a spell, used by esrv_update_spells */ + uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */ uint16 ACC (RW, cached_eat); /* cached food, used by esrv_update_spells */ + + // rarely-accessed members should be at the end + shstr ACC (RW, tag); // a tag used to tracking this object + shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ + shstr ACC (RW, lore); /* Obscure information about this object, */ + /* To get put into books and the like. */ + shstr ACC (RW, custom_name); /* Custom name assigned by player */ }; struct object : zero_initialised, object_copy @@ -524,7 +535,7 @@ return !env && !flag [FLAG_REMOVED]; } - MTH bool is_in_map_or_inv () const + MTH bool is_inserted () const { return !flag [FLAG_REMOVED]; }