--- deliantra/server/include/object.h 2006/12/18 03:00:02 1.57 +++ deliantra/server/include/object.h 2006/12/23 06:41:39 1.66 @@ -90,43 +90,12 @@ * e.g. ->copy_to () */ -typedef refptr object_ptr; -typedef refptr arch_ptr; - -// these are not being copied ACC_CLASS (object) -struct object_keep : refcounted -{ - /* These variables are not changed by ->copy_to */ - - tag_t ACC (RW, count); /* Generation count for this object */ - UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. - - player *ACC (RW, contr); /* Pointer to the player which control this object */ - object *ACC (RW, next); /* Pointer to the next object in the free/used list */ - object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */ - object *ACC (RW, active_next);/* Next & previous object in the 'active' */ - object *ACC (RW, active_prev);/* List. This is used in process_events */ - /* so that the entire object list does not */ - /* need to be gone through. */ - object *ACC (RW, below); /* Pointer to the object stacked below this one */ - object *ACC (RW, above); /* Pointer to the object stacked above this one */ - /* Note: stacked in the *same* environment */ - object *inv; /* Pointer to the first object in the inventory */ - object *ACC (RW, container); /* Current container being used. I think this - * is only used by the player right now. - */ - object *ACC (RW, env); /* Pointer to the object which is the environment. - * This is typically the container that the object is in. - */ - object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ - object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different - maptile *ACC (RW, map); /* Pointer to the map in which this object is present */ -}; - // these are being copied -struct object_copy : attachable +struct object_copy { + typedef bitset flags_t; + shstr ACC (RW, name); /* The name of the object, obviously... */ shstr ACC (RW, name_pl); /* The plural name of the object */ shstr ACC (RW, title); /* Of foo, etc */ @@ -146,11 +115,9 @@ object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */ object_ptr ACC (RW, spell); /* Spell that was being cast */ object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */ -}; + arch_ptr ACC (RW, arch); /* Pointer to archetype */ + arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ -// these are being copied and also cleared -struct object_pod -{ New_Face *ACC (RW, face); /* Face with colors */ sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */ float ACC (RW, speed); /* The overall speed of this object */ @@ -222,10 +189,8 @@ /* Following are values used by any object */ /* this objects turns into or what this object creates */ treasurelist *ACC (RW, randomitems); /* Items to be generated */ - arch_ptr ACC (RW, arch); /* Pointer to archetype */ - arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ key_value *key_values; /* Fields not explictly known by the loader. */ - std::bitset flags; /* various flags */ + flags_t flag; /* various flags */ 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 */ @@ -242,10 +207,37 @@ float ACC (RW, move_slow_penalty); /* How much this slows down the object */ }; -struct object : zero_initialised, object_keep, object_copy, object_pod +struct object : zero_initialised, refcounted, attachable, object_copy { typedef unordered_vector vector; + // These variables are not changed by ->copy_to + + tag_t ACC (RW, count); /* Generation count for this object */ + UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. + + player_ptr ACC (RW, contr); /* Pointer to the player which control this object */ + object *ACC (RW, next); /* Pointer to the next object in the free/used list */ + object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */ + object *ACC (RW, active_next);/* Next & previous object in the 'active' */ + object *ACC (RW, active_prev);/* List. This is used in process_events */ + /* so that the entire object list does not */ + /* need to be gone through. */ + object *ACC (RW, below); /* Pointer to the object stacked below this one */ + object *ACC (RW, above); /* Pointer to the object stacked above this one */ + /* Note: stacked in the *same* environment */ + object *inv; /* Pointer to the first object in the inventory */ + object *ACC (RW, container); /* Current container being used. I think this + * is only used by the player right now. + */ + object *ACC (RW, env); /* Pointer to the object which is the environment. + * This is typically the container that the object is in. + */ + object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ + object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different + maptile *ACC (RW, map); /* Pointer to the map in which this object is present */ + client_container *seen_by; // seen by which player/container currently? + static vector mortals; static vector active; // active objects, not yet used static vector objects; // not used yet, use first->next->... @@ -269,8 +261,6 @@ && can_merge_slow (op1, op2); } - void clear (); - bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); } void set_owner (object *owner); @@ -283,6 +273,16 @@ attachable::instantiate (); } + // recalculate all stats + void update_stats (); + void roll_stats (); + void swap_stats (int a, int b); + void add_statbonus (); + void remove_statbonus (); + void drain_stat (); + void drain_specific_stat (int deplete_stats); + void change_luck (int value); + // info must hold 256 * 3 bytes currently const char *debug_desc (char *info) const; const char *debug_desc () const; @@ -292,9 +292,9 @@ || type == CLOAK || type == BOOTS || type == GLOVES || type == BRACERS || type == GIRDLE; } bool is_alive () const { return (type == PLAYER - || flags [FLAG_MONSTER] - || (flags [FLAG_ALIVE] && !flags [FLAG_GENERATOR] && type != DOOR)) - && !flags [FLAG_IS_A_TEMPLATE]; } + || flag [FLAG_MONSTER] + || (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR)) + && !flag [FLAG_IS_A_TEMPLATE]; } bool is_arrow () const { return type == ARROW || (type == SPELL_EFFECT && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); } @@ -302,7 +302,20 @@ /* This return true if object has still randomitems which * could be expanded. */ - bool has_random_items () const { return randomitems && flags [FLAG_IS_A_TEMPLATE]; } + bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } + + // returns the player that has this object in his inventory, or 0 + object *in_player () const + { + for (object *op = env; op; op = op->env) + if (op->type == PLAYER) + return op; + + return 0; + } + + // returns the mapspace this object is in + mapspace &ms () const; // fully recursive iterator struct iterator_base @@ -401,7 +414,7 @@ /* This returns TRUE if the object is something that * should be displayed in the look window */ -#define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER && ob->type!=EVENT_CONNECTOR) +#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR) /* Used by update_object to know if the object being passed is * being added or removed.