--- deliantra/server/include/map.h 2007/02/07 02:04:46 1.65 +++ deliantra/server/include/map.h 2007/05/28 21:15:56 1.76 @@ -1,25 +1,25 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team - * Copyright (C) 1992 Frank Tore Johansen + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992,2007 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. + * 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. * - * 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 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 + * 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 + * + * The authors can be reached via e-mail to */ /* @@ -67,7 +67,6 @@ #define GET_MAP_LIGHT(M,X,Y) (M)->at((X),(Y)).light #define GET_MAP_OB(M,X,Y) (M)->at((X),(Y)).bot #define GET_MAP_TOP(M,X,Y) (M)->at((X),(Y)).top -#define GET_MAP_FACE(M,X,Y,L) (M)->at((X),(Y)).faces[L] #define GET_MAP_FACE_OBJ(M,X,Y,L) (M)->at((X),(Y)).faces_obj[L] #define GET_MAP_MOVE_BLOCK(M,X,Y) (M)->at((X),(Y)).move_block #define GET_MAP_MOVE_SLOW(M,X,Y) (M)->at((X),(Y)).move_slow @@ -120,7 +119,6 @@ struct mapspace { object *bot, *top; /* lowest/highest object on this space */ - facetile *faces[MAP_LAYERS]; /* faces for the 3 layers */ object *faces_obj[MAP_LAYERS];/* face objects for the 3 layers */ uint8 flags_; /* flags about this space (see the P_ values above) */ sint8 light; /* How much light this space provides */ @@ -156,46 +154,10 @@ return 0; } - // return the item volume on this mapspace in kg/m³ - uint64 volume (); -}; - -/* - * Each map is in a given region of the game world and links to a region definiton, so - * they have to appear here in the headers, before the mapdef - */ -INTERFACE_CLASS (region) -struct region : zero_initialised -{ - shstr ACC (RW, name); /* Shortend name of the region as maps refer to it */ - region *ACC (RW, parent); /* - * Pointer to the region that is a parent of the current - * region, if a value isn't defined in the current region - * we traverse this series of pointers until it is. - */ - shstr ACC (RW, longname); /* Official title of the region, this might be defined - * to be the same as name*/ - shstr ACC (RW, msg); /* the description of the region */ - shstr ACC (RW, jailmap); /*where a player that is arrested in this region should be imprisoned. */ - int ACC (RW, index); - uint32 ACC (RW, counter); /* A generic counter for holding temporary data. */ - sint16 ACC (RW, jailx), ACC (RW, jaily); /* The coodinates in jailmap to which the player should be sent. */ - bool ACC (RW, fallback); /* whether, in the event of a region not existing, - * this should be the one we fall back on as the default */ - - static region *default_region (); - static region *find (const char *name); - static region *find_fuzzy (const char *name); + // return the item volume on this mapspace in cm³ + uint64 volume () const; }; -typedef object_vector regionvec; - -extern regionvec regions; - -#define for_all_regions(var) \ - for (int _i = 0; _i < regions.size (); ++_i) \ - declvar (region *, var, regions [_i]) - struct shopitems : zero_initialised { const char *name; /* name of the item in question, null if it is the default item */ @@ -251,6 +213,7 @@ sint16 players; /* How many players are on this map right now */ uint16 ACC (RW, difficulty); /* What level the player should be to play here */ + bool ACC (RW, active); // wether this map is active or not bool ACC (RW, per_player); bool ACC (RW, per_party); bool ACC (RW, outdoor); /* True if an outdoor map */ @@ -277,6 +240,8 @@ shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ shstr ACC (RW, path); /* Filename of the map */ + int ACC (RW, max_nrof); // maximum nrof of any single item on a mapspace + uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace MTH void activate (); MTH void deactivate (); @@ -354,9 +319,10 @@ void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); bool generate_random_map (random_map_params *RP); - static maptile *find_sync (const char *path, maptile *original = 0);//PERL - // async prefetch static maptile *find_async (const char *path, maptile *original = 0);//PERL + static maptile *find_sync (const char *path, maptile *original = 0);//PERL + static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL + MTH object *pick_random_object () const; mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } mapspace &at (uint32 x, uint32 y) { return spaces [x * height + y]; }