--- deliantra/server/include/object.h 2007/01/07 02:39:14 1.81 +++ deliantra/server/include/object.h 2007/01/23 01:05:18 1.91 @@ -1,26 +1,26 @@ -/* - CrossFire, A Multiplayer game for X-windows - - 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 - 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. - - 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 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 -*/ +/*-999 + * 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 + * 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. + * + * 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 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 + */ #ifndef OBJECT_H #define OBJECT_H @@ -122,7 +122,7 @@ arch_ptr ACC (RW, arch); /* Pointer to archetype */ arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ - New_Face *ACC (RW, face); /* Face with colors */ + facetile *ACC (RW, face); /* Face with colors */ float ACC (RW, speed); /* The overall speed of this object */ float ACC (RW, speed_left); /* How much speed is left to spend this round */ uint32 ACC (RW, nrof); /* How many of the objects */ @@ -218,7 +218,8 @@ maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */ UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. - int ACC (RO, count); // index into objects + int ACC (RO, count); + int ACC (RO, index); // index into objects int ACC (RO, active); // index into actives player_ptr ACC (RW, contr); /* Pointer to the player which control this object */ @@ -227,6 +228,8 @@ 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 */ + + //TODO: container must move into client object *ACC (RW, container); /* Current container being used. I think this * is only used by the player right now. */ @@ -237,10 +240,6 @@ object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different client_container *seen_by; // seen by which player/container currently? - //static vector active_list; // active objects, not yet used - //static vector object_list; // not used yet, use first->next->... - static object *first; // will be replaced by "objects" - MTH static object *create (); MTH void copy_to (object *dst); MTH object *clone (); // create + copy_to @@ -250,8 +249,13 @@ // recursively destroy all objects in inventory, optionally dropping them to the ground instead MTH void destroy_inv (bool drop_to_ground = false); - MTH void remove (); MTH object *insert (object *item); // insert into inventory + void remove_slow (); + MTH void remove () + { + if (!flag [FLAG_REMOVED]) + remove_slow (); + } static bool can_merge_slow (object *op1, object *op2); @@ -287,6 +291,7 @@ // info must hold 256 * 3 bytes currently const char *debug_desc (char *info) const; MTH const char *debug_desc () const; + const char *debug_desc2 () const; // another debug_desc, pure convinience function const char *flag_desc (char *desc, int len) const; MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; } @@ -307,7 +312,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; } + MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; } /* This return true if object has still randomitems which * could be expanded. @@ -388,6 +393,14 @@ return this; } + /* This returns TRUE if the object is something that + * should be displayed in the floorbox/inventory window + */ + MTH bool client_visible () const + { + return !invisible && type != PLAYER; + } + protected: friend struct archetype; @@ -398,7 +411,7 @@ ~object (); }; -typedef object_vector objectvec; +typedef object_vector objectvec; typedef object_vector activevec; extern objectvec objects; @@ -457,11 +470,6 @@ */ }; -/* This returns TRUE if the object is something that - * should be displayed in the floorbox window - */ -#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. */