--- deliantra/server/include/object.h 2007/05/03 09:26:45 1.114 +++ deliantra/server/include/object.h 2007/08/15 05:01:25 1.142 @@ -1,25 +1,24 @@ /* - * CrossFire, A Multiplayer Online RPG - * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2001 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen - * - * This program is free software; you can redistribute it and/or modify + * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. + * + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 Frank Tore Johansen + * + * Crossfire TRT is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * The authors can be reached via e-mail at crossfire@schmorp.de + * along with this program. If not, see . + * + * The authors can be reached via e-mail to */ #ifndef OBJECT_H @@ -32,14 +31,36 @@ typedef int tag_t; -#define NUM_BODY_LOCATIONS 12 -#define BODY_ARMS 1 +enum { + body_skill, + body_combat, + body_range, + body_shield, + body_arm, + body_torso, + body_head, + body_neck, + body_finger, + body_shoulder, + body_foot, + body_hand, + body_wrist, + body_waist, + NUM_BODY_LOCATIONS +}; + +enum slottype_t +{ + slot_none, + slot_combat, + slot_ranged, +}; /* See common/item.c */ typedef struct Body_Locations { - const char *save_name; /* Name used to load/save it to disk */ + keyword save_name; /* Name used to load/save it to disk */ const char *use_name; /* Name used when describing an item we can use */ const char *nonuse_name; /* Name to describe objects we can't use */ } Body_Locations; @@ -87,10 +108,11 @@ #define WILL_APPLY_DOOR 0x08 #define WILL_APPLY_FOOD 0x10 -/* However, if you're keeping a pointer of some sort, you probably - * don't just want it copied, so you'll need to add to common/object.C, - * e.g. ->copy_to () - */ +struct body_slot +{ + signed char info:4; /* body info as loaded from the file */ + signed char used:4; /* Calculated value based on items equipped */ +}; INTERFACE_CLASS (object) // these are being copied @@ -99,8 +121,12 @@ 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 */ + uint8 ACC (RW, subtype); /* subtype of object */ sint8 ACC (RW, direction); /* Means the object is moving that way. */ sint8 ACC (RW, facing); /* Object is oriented/facing that way. */ + 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 */ @@ -129,9 +155,8 @@ uint32 ACC (RW, nrof); /* How many of the objects */ /* This next big block are basically used for monsters and equipment */ - uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */ - uint8 ACC (RW, subtype); /* subtype of object */ 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 */ @@ -160,9 +185,10 @@ sint64 ACC (RW, perm_exp); /* Permanent exp */ uint32 ACC (RW, weapontype); /* type of weapon */ uint32 ACC (RW, tooltype); /* type of tool or build facility */ - sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]); /* body info as loaded from the file */ - sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]); /* Calculated value based on items equipped */ - faceidx ACC (RW, face); /* Face with colors */ + 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 */ @@ -182,18 +208,21 @@ */ 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 */ char *ACC (RW, spellarg); @@ -220,10 +249,10 @@ UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. int ACC (RO, count); - int ACC (RO, index); // index into objects - int ACC (RO, active); // index into actives + object_vector_index ACC (RO, index); // index into objects + object_vector_index ACC (RO, active); // index into actives - player_ptr ACC (RW, contr); /* Pointer to the player which control this object */ + player_ptr ACC (RW, contr); /* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */ object *ACC (RW, below); /* Pointer to the object stacked below this one */ object *ACC (RW, above); /* Pointer to the object stacked above this one */ @@ -243,9 +272,11 @@ key_value *key_values; /* Fields not explictly known by the loader. */ bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all + void post_load_check (); // do some adjustments after parsing static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go. bool write (object_freezer &f); + MTH int slottype () const; MTH static object *create (); object &operator =(const object &src); MTH void copy_to (object *dst); @@ -257,6 +288,8 @@ // recursively destroy all objects in inventory, optionally dropping them to the ground instead MTH void destroy_inv (bool drop_to_ground = false); MTH object *insert (object *item); // insert into inventory + MTH void play_sound (faceidx sound) const; + void do_remove (); MTH void remove () { @@ -276,6 +309,8 @@ MTH void set_owner (object *owner); MTH void set_speed (float speed); + MTH bool change_weapon (object *ob); + MTH bool change_skill (object *ob); MTH void open_container (object *new_container); MTH void close_container () @@ -283,6 +318,15 @@ open_container (0); } + MTH object *force_find (const shstr name); + MTH void force_add (const shstr name, int duration = 0); + + // overwrite the attachable should_invoke function with a version that also checks ev_want_type + bool should_invoke (event_type event) + { + return ev_want_event [event] || ev_want_type [type] || cb; + } + MTH void instantiate (); // recalculate all stats @@ -364,6 +408,11 @@ return head ? head : this; } + MTH bool is_head () + { + return head_ () == this; + } + MTH std::string long_desc (object *who = 0); MTH std::string describe_monster (object *who = 0); MTH std::string describe_item (object *who = 0); @@ -380,6 +429,7 @@ // insert object at same map position as 'where' // handles both inventory and map "positions" MTH object *insert_at (object *where, object *originator = 0, int flags = 0); + MTH void drop_unpaid_items (); MTH void activate (); MTH void deactivate (); @@ -446,28 +496,31 @@ MTH struct region *region () const; protected: - friend struct archetype; - - void link (); + void link (); void unlink (); object (); ~object (); }; -typedef object_vector objectvec; -typedef object_vector activevec; +// move this object to the top of its env's inventory to speed up +// searches for it. +static object * +splay (object *ob) +{ + if (ob->env && ob->env->inv != ob) + { + if (ob->above) ob->above->below = ob->below; + if (ob->below) ob->below->above = ob->above; -extern objectvec objects; -extern activevec actives; + ob->above = 0; + ob->below = ob->env->inv; + ob->below->above = ob; + ob->env->inv = ob; + } -#define for_all_objects(var) \ - for (unsigned _i = 0; _i < objects.size (); ++_i) \ - declvar (object *, var, objects [_i]) - -#define for_all_actives(var) \ - for (unsigned _i = 0; _i < actives.size (); ++_i) \ - declvar (object *, var, actives [_i]) + return ob; +} typedef struct oblnk { /* Used to link together several objects */ @@ -482,6 +535,10 @@ struct oblinkpt *next; } oblinkpt; +object *find_skill_by_name (object *who, const char *name); +object *find_skill_by_name (object *who, const shstr &sh); +object *find_skill_by_number (object *who, int skillno); + /* * The archetype structure is a set of rules on how to generate and manipulate * objects which point to archetypes. @@ -492,9 +549,9 @@ */ INTERFACE_CLASS (archetype) -struct archetype : zero_initialised, attachable +struct archetype : object { - archetype (); + archetype (const char *name); ~archetype (); void gather_callbacks (AV *&callbacks, event_type event) const; @@ -502,21 +559,44 @@ static archetype *get (const char *name); // find or create static archetype *find (const char *name); - void hash_add (); // add to hashtable - void hash_del (); // remove from hashtable + void link (); + void unlink (); - shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ - struct archetype *ACC (RW, next); /* Next archetype in a linked list */ - struct archetype *ACC (RW, head); /* The main part of a linked object */ - struct archetype *ACC (RW, more); /* Next part of a linked object */ - object ACC (RO, clone); /* An object from which to do ->copy_to () */ + object_vector_index ACC (RW, archid); // index in archvector + shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ + bool ACC (RW, stub); // if true, this is an invalid archetype uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ - bool ACC (RW, linked); // linked into list of heads - sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is - * in comparison to the head. - */ + + sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ + sint8 ACC (RW, max_x), ACC (RW, max_y); }; +inline void +object_freezer::put (keyword k, archetype *v) +{ + put (k, v ? &v->archname : (const char *)0); +} + +typedef object_vector objectvec; +typedef object_vector activevec; +typedef object_vector archvec; + +extern objectvec objects; +extern activevec actives; +extern archvec archetypes; + +#define for_all_objects(var) \ + for (unsigned _i = 0; _i < objects.size (); ++_i) \ + statementvar (object *, var, objects [_i]) + +#define for_all_actives(var) \ + for (unsigned _i = 0; _i < actives.size (); ++_i) \ + statementvar (object *, var, actives [_i]) + +#define for_all_archetypes(var) \ + for (unsigned _i = 0; _i < archetypes.size (); ++_i) \ + statementvar (archetype *, var, archetypes [_i]) + /* Used by update_object to know if the object being passed is * being added or removed. */ @@ -559,10 +639,7 @@ #define INS_BELOW_ORIGINATOR 0x0010 #define INS_MAP_LOAD 0x0020 -#define ARCH_SINGULARITY "singularity" -#define ARCH_DETECT_MAGIC "detect_magic" #define ARCH_DEPLETION "depletion" -#define ARCH_SYMPTOM "symptom" #endif