--- deliantra/server/include/map.h 2010/04/04 02:51:56 1.131 +++ deliantra/server/include/map.h 2011/06/03 08:36:45 1.149 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team * Copyright (©) 1992 Frank Tore Johansen * @@ -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. @@ -138,7 +149,8 @@ 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 @@ -164,11 +176,16 @@ return flags_; } + MTH void update_up (); + MTH void invalidate () { flags_ = 0; + + if (pflags) + update_up (); } - + MTH object *player () { object *op; @@ -215,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 @@ -265,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 */ @@ -290,14 +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 */ uint64 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 { @@ -358,17 +393,26 @@ 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 @@ -388,7 +432,7 @@ 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_utf8_string path, maptile *original = 0, bool load = true);//PERL @@ -440,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 @@ -558,6 +602,33 @@ 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"