--- deliantra/server/include/object.h 2007/05/28 21:15:56 1.128 +++ deliantra/server/include/object.h 2007/11/08 19:43:24 1.153 @@ -1,25 +1,24 @@ /* - * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 (at your option) - * any later version. + * Deliantra 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 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 GNU General Public License - * for more details. + * 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 + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License along - * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . * - * The authors can be reached via e-mail to + * The authors can be reached via e-mail to */ #ifndef OBJECT_H @@ -134,6 +133,7 @@ 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, */ @@ -187,7 +187,9 @@ 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); /* Face with colors */ + 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 */ @@ -248,10 +250,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 */ @@ -271,12 +273,13 @@ 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 + MTH 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 (); + const mapxy &operator =(const mapxy &pos); object &operator =(const object &src); MTH void copy_to (object *dst); MTH object *clone (); // create + copy_to @@ -287,6 +290,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 () { @@ -294,6 +299,15 @@ do_remove (); } + MTH bool blocked (maptile *m, int x, int y) const; + + void move_to (const mapxy &pos) + { + remove (); + *this = pos; + insert_at (this, this); + } + static bool can_merge_slow (object *op1, object *op2); // this is often used in time-critical code, so optimise @@ -315,6 +329,9 @@ 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) { @@ -379,7 +396,7 @@ // contr => is a player // head => only save head of a multitile object // owner => can not reference owner yet - MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; } + MTH bool can_map_save () const { return !head && (!owner || owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; } /* This return true if object has still randomitems which * could be expanded. @@ -402,6 +419,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); @@ -418,6 +440,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 (); @@ -483,10 +506,16 @@ MTH struct region *region () const; -protected: - friend struct archetype; + void statusmsg (const char *msg, int color = NDI_BLACK); + void failmsg (const char *msg, int color = NDI_RED); + + const char *query_inventory (object *who = 0, const char *indent = ""); + + MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference + static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible - void link (); +protected: + void link (); void unlink (); object (); @@ -512,20 +541,6 @@ return ob; } -typedef object_vector objectvec; -typedef object_vector activevec; - -extern objectvec objects; -extern activevec actives; - -#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]) - typedef struct oblnk { /* Used to link together several objects */ object_ptr ob; @@ -553,31 +568,56 @@ */ 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; static archetype *read (object_thawer &f); - 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 + MTH static archetype *get (const_utf8_string name); // find or create + MTH static archetype *find (const_utf8_string name); + + MTH void link (); + MTH 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 () */ - 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. - */ + MTH object *instance (); + + 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 + + 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. */ @@ -603,9 +643,6 @@ * beneath the player, but not actually above it. Note - the * map and x,y coordinates for the object to be inserted must * match the originator. - * INS_MAP_LOAD: disable lots of checkings done at insertion to - * speed up map loading process, as we assume the ordering in - * loaded map is correct. * * Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY * are mutually exclusive. The behaviour for passing more than one @@ -618,12 +655,8 @@ #define INS_NO_WALK_ON 0x0004 #define INS_ON_TOP 0x0008 #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