--- deliantra/server/include/map.h 2009/11/08 15:11:23 1.117 +++ deliantra/server/include/map.h 2017/09/16 22:17:42 1.155 @@ -1,24 +1,24 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. - * - * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team - * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team - * Copyright (©) 1992,2007 Frank Tore Johansen - * + * + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team + * Copyright (©) 1992 Frank Tore Johansen + * * Deliantra is free software: you can redistribute it and/or modify it under * the terms of the Affero 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. - * + * * You should have received a copy of the Affero GNU General Public License * and the GNU General Public License along with this program. If not, see * . - * + * * The authors can be reached via e-mail to */ @@ -50,23 +50,28 @@ #define MAGIC_MAP_SIZE 50 #define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 -#define MAP_LAYERS 3 +#define MAP_LAYERS 3 -// tile map index -enum { - TILE_UP = 0, - TILE_RIGHT = 1, - TILE_DOWN = 2, - TILE_LEFT = 3, +// tile map index - toggling the lowest bit reverses direction +enum +{ + TILE_NORTH, + TILE_SOUTH, + TILE_WEST, + TILE_EAST, + TILE_UP, + TILE_DOWN, + TILE_NUM }; -/* Values for in_memory below */ -enum { - MAP_ACTIVE, - MAP_INACTIVE, // not used atm. - MAP_SWAPPED, - MAP_LOADING, - MAP_SAVING, +#define REVERSE_TILE_DIR(dir) ((dir) ^ 1) + +/* Values for state below */ +enum +{ + MAP_SWAPPED, // header loaded, nothing else + MAP_INACTIVE, // in memory, linkable, but not active + MAP_ACTIVE, // running! }; /* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should @@ -90,7 +95,7 @@ */ #define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) -/* These are used in the MapLook flags element. They are not used in +/* These are used in the mapspace flags element. They are not used in * in the object flags structure. */ #define P_BLOCKSVIEW 0x01 @@ -115,6 +120,12 @@ #define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ #define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */ +// persistent flags (pflags) in mapspace +enum +{ + PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace +}; + /* Instead of having numerous arrays that have information on a * particular space (was map, floor, floor2, map_ob), * have this structure take care of that information. @@ -133,12 +144,13 @@ MoveType ACC (RW, move_slow); /* What movement types this space slows */ MoveType ACC (RW, move_on); /* What movement types are activated */ MoveType ACC (RW, move_off); /* What movement types are activated */ - uint16_t ACC (RW, nrof_); // saturates at 64k + uint16_t ACC (RW, items_); // saturates at 64k uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) uint32_t ACC (RW, smell); // the last count a player was seen here, or 0 static uint32_t ACC (RW, smellcount); // global smell counter - uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems + uint8_t pflags; // additional, persistent flags + uint8_t pad [3]; // pad to 64 bytes on LP64 systems //-GPL @@ -147,12 +159,13 @@ { // we take advantage of the fact that 0x80 is the sign bit // to generate more efficient code on many cpus - assert (P_UPTODATE == 0x80); + assert (sint8 (P_UPTODATE) < 0); + assert (sint8 (-1 & ~P_UPTODATE) >= 0); - if (expect_false (sint8 (flags_) < 0)) + if (expect_false (sint8 (flags_) >= 0)) update_ (); - // must be true by now + // must be true by now (gcc seems content with only the second test) assume (sint8 (flags_) < 0); assume (flags_ & P_UPTODATE); } @@ -163,11 +176,16 @@ return flags_; } + MTH void update_up (); + MTH void invalidate () { flags_ = 0; + + if (pflags) + update_up (); } - + MTH object *player () { object *op; @@ -181,14 +199,14 @@ return op; } - MTH uint32 nrof () + MTH uint32 items() { update (); - return nrof_; + return items_; } // return the item volume on this mapspace in cm³ - MTH uint64 volume () + MTH volume_t volume () { update (); return volume_ * 1024; @@ -205,7 +223,7 @@ } }; -// a rectangular area of a map +// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk struct maprect { maptile *m; @@ -214,6 +232,18 @@ int dx, dy; // offset to go from local coordinates to original tile */ }; +// (refcounted) list of objects on this map that need physics processing +struct physics_queue +: unordered_vector +{ + int i; // already processed + physics_queue (); + ~physics_queue (); + object *pop (); +}; + +#define PHYSICS_QUEUES 16 // "activity" at least every 16 ticks + //+GPL struct shopitems : zero_initialised @@ -221,7 +251,7 @@ const char *name; /* name of the item in question, null if it is the default item */ const char *name_pl; /* plural name */ int typenum; /* itemtype number we need to match 0 if it is the default price */ - sint8 strength; /* the degree of specialisation the shop has in this item, + sint8 strength; /* the degree of specialisation the shop has in this item, * as a percentage from -100 to 100 */ int index; /* being the size of the shopitems array. */ }; @@ -233,8 +263,8 @@ IO_UNIQUES = 0x04, // unique objects }; -/* In general, code should always use the macros - * above (or functions in map.c) to access many of the +/* In general, code should always use the macros + * above (or functions in map.c) to access many of the * values in the map structure. Failure to do this will * almost certainly break various features. You may think * it is safe to look at width and height values directly @@ -252,8 +282,8 @@ tstamp ACC (RW, last_access); /* last time this map was accessed somehow */ shstr ACC (RW, name); /* Name of map as given by its creator */ - region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by - * points to the struct containing all the properties of + region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by + * points to the struct containing all the properties of * the region */ double ACC (RW, reset_time); uint32 ACC (RW, reset_timeout); /* How many seconds must elapse before this map @@ -264,11 +294,11 @@ bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by * players entering/exiting map */ - sint32 ACC (RW, timeout); /* swapout is set to this */ - sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ - uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must + uint8 ACC (RW, state); /* If not true, the map has been freed and must * be loaded before used. The map,omap and map_ob * arrays will be allocated when the map is loaded */ + sint32 ACC (RW, timeout); /* swapout is set to this */ + sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ sint16 players; /* How many players are on this map right now */ uint16 ACC (RW, difficulty); /* What level the player should be to play here */ @@ -282,13 +312,6 @@ uint16 ACC (RW, enter_x); /* enter_x and enter_y are default entrance location */ uint16 ACC (RW, enter_y); /* on the map if none are set in the exit */ oblinkpt *buttons; /* Linked list of linked lists of buttons */ - sint16 ACC (RW, temp); /* base temperature of this tile (F) */ - sint16 ACC (RW, pressure); /* barometric pressure (mb) */ - sint8 ACC (RW, humid); /* humitidy of this tile */ - sint8 ACC (RW, windspeed); /* windspeed of this tile */ - sint8 ACC (RW, winddir); /* direction of wind */ - sint8 ACC (RW, sky); /* sky conditions */ - int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */ struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */ shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */ double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */ @@ -296,15 +319,20 @@ sint64 ACC (RW, shopmax); /* maximum price a shop will offer */ shstr ACC (RW, msg); /* Message map creator may have left */ shstr ACC (RW, maplore); /* Map lore information */ - shstr ACC (RW, tile_path[4]); /* path to adjoining maps */ - maptile *ACC (RW, tile_map[4]); /* Next map, linked list */ + shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */ + maptile *ACC (RW, tile_map[TILE_NUM]); /* 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 + volume_t ACC (RW, max_volume); // maximum volume for all items on a mapspace int ACC (RW, max_items); // maximum number of items on a mapspace //-GPL + physics_queue pq[PHYSICS_QUEUES]; + MTH void queue_physics (object *ob, int after = 0); + MTH void queue_physics_at (int x, int y); + MTH int run_physics (tick_t tick, int max_objects); + MTH void activate_physics (); + // the maptile:: is neccessary here for the perl interface to work MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const { @@ -321,6 +349,7 @@ // deallocates the mapspaces (and destroys all objects) MTH void clear (); + MTH void post_load (); // update cached values in mapspaces etc. MTH void fix_auto_apply (); MTH void do_decay_objects (); MTH void update_buttons (); @@ -328,7 +357,7 @@ MTH int estimate_difficulty () const; MTH void play_sound (faceidx sound, int x, int y) const; - MTH void say_msg (const char *msg, int x, int y) const; + MTH void say_msg (const_utf8_string msg, int x, int y) const; // connected links oblinkpt *find_link (shstr_tmp id); @@ -356,25 +385,34 @@ // save objects into the given file (uses IO_ flags) bool _save_objects (object_freezer &freezer, int flags); - MTH bool _save_objects (const char *path, int flags); + MTH bool _save_objects (const_octet_string path, int flags); // save the header pseudo object _only_ bool _save_header (object_freezer &freezer); - MTH bool _save_header (const char *path); + MTH bool _save_header (const_octet_string path); maptile (); maptile (int w, int h); + void init (); ~maptile (); void do_destroy (); void gather_callbacks (AV *&callbacks, event_type event) const; + MTH bool linkable () { return state >= MAP_INACTIVE; } + MTH int size () const { return width * height; } MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); MTH void touch () { last_access = runtime; } + // returns the map at given direction. if the map isn't linked yet, + // it will either return false (if load is false), or otherwise try to link + // it - if linking fails because the map is not loaded yet, it will + // start loading the map and return 0. + // thus, if you get 0, the map exists and load is true, then some later + // call (some tick or so later...) will eventually succeed. MTH maptile *tile_available (int dir, bool load = true); // find the map that is at coordinate x|y relative to this map @@ -394,12 +432,12 @@ do_load_sync (); } - void make_map_floor (char **layout, char *floorstyle, random_map_params *RP); + void make_map_floor (char **layout, const char *floorstyle, random_map_params *RP); bool generate_random_map (random_map_params *RP); - static maptile *find_async (const char *path, maptile *original = 0, bool load = true);//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 + static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL + static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL + static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL object *pick_random_object (rand_gen &gen = rndm) const; mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; } @@ -407,11 +445,18 @@ // return an array of maprects corresponding // to the given rectangular area. the last rect will have // a 0 map pointer. - // the array will be stored in a static memory area, - // so recursion is not atm. supported - maprect *split_to_tiles (int x0, int y0, int x1, int y1); + maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1); + + MTH bool is_in_shop (int x, int y) const; }; +inline bool +object::is_in_shop () const +{ + return is_on_map () + && map->is_in_shop (x, y); +} + //+GPL /* This is used by get_rangevector to determine where the other @@ -439,9 +484,9 @@ int out_of_map (maptile *m, int x, int y); maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); -void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/); +void get_rangevector_from_mapcoord (maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/); int on_same_map (const object *op1, const object *op2); -int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); +int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy); // adjust map, x and y for tiled maps and return true if the position is valid at all static inline bool @@ -484,7 +529,7 @@ mapxy &move (int dir) { - return move (freearr_x [dir], freearr_y [dir]); + return move (DIRX (dir), DIRY (dir)); } operator void *() const { return (void *)m; } @@ -555,6 +600,35 @@ } \ } +extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations + +// special "grave" map used to store all removed objects +// till they can be destroyed - saves a lot of checks in the rest +// of the code +struct freed_map +: maptile +{ + freed_map () + : maptile (3, 3) + { + path = ""; + name = "/internal/freed_objects_map"; + no_drop = 1; + no_reset = 1; + + state = MAP_ACTIVE; + } + + ~freed_map () + { + destroy (); + } +}; + +// initialised in common/shstr.C, due to shstr usage we need defined +// initialisation order! +extern struct freed_map freed_map; // freed objects are moved here to avoid crashes + // loop over every space in the given maprect, // setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0 // the iterator code must be a single statement following this macro call, similar to "if" @@ -570,16 +644,16 @@ // order (unorded), but is likely faster. // m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op // "continue" will skip to the next space -#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \ - for (maprect *r_e_c_t = (map)->split_to_tiles ( \ +#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \ + for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \ (ox) + (dx0) , (oy) + (dy0) , \ (ox) + (dx1) + 1, (oy) + (dy1) + 1); \ r_e_c_t->m; \ ++r_e_c_t) \ rect_mapwalk (r_e_c_t, (ox), (oy)) -#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ - unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1) +#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1) \ + unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1) #endif