ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/map.h
(Generate patch)

Comparing deliantra/server/include/map.h (file contents):
Revision 1.137 by root, Tue May 3 04:40:29 2011 UTC vs.
Revision 1.145 by root, Sat May 7 20:03:28 2011 UTC

… …
50#define MAGIC_MAP_SIZE 50 50#define MAGIC_MAP_SIZE 50
51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2 51#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
52 52
53#define MAP_LAYERS 3 53#define MAP_LAYERS 3
54 54
55// tile map index 55// tile map index - toggling the lowest bit reverses direction
56enum { 56enum
57{
57 TILE_NORTH, 58 TILE_NORTH,
58 TILE_EAST,
59 TILE_SOUTH, 59 TILE_SOUTH,
60 TILE_EAST ,
60 TILE_WEST, 61 TILE_WEST,
61 TILE_UP, 62 TILE_UP,
62 TILE_DOWN, 63 TILE_DOWN,
63 TILE_NUM, 64 TILE_NUM
64}; 65};
65 66
67#define REVERSE_TILE_DIR(dir) ((dir) ^ 1)
68
66/* Values for in_memory below */ 69/* Values for state below */
67enum { 70enum
68 MAP_ACTIVE, 71{
69 MAP_INACTIVE, // not used atm. 72 MAP_SWAPPED, // header loaded, nothing else
70 MAP_SWAPPED, 73 MAP_INACTIVE, // in memory, linkable, but not active
71 MAP_LOADING, 74 MAP_ACTIVE, // running!
72 MAP_SAVING,
73}; 75};
74 76
75/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should 77/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
76 * really be used, as it is multi tile aware. However, there are some cases 78 * really be used, as it is multi tile aware. However, there are some cases
77 * where it is known the map is not tiled or the values are known 79 * where it is known the map is not tiled or the values are known
… …
91 * should almost always be using out_of_map instead, which takes into account 93 * should almost always be using out_of_map instead, which takes into account
92 * map tiling. 94 * map tiling.
93 */ 95 */
94#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height))) 96#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
95 97
96/* These are used in the MapLook flags element. They are not used in 98/* These are used in the mapspace flags element. They are not used in
97 * in the object flags structure. 99 * in the object flags structure.
98 */ 100 */
99#define P_BLOCKSVIEW 0x01 101#define P_BLOCKSVIEW 0x01
100#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */ 102#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */
101#define P_NO_CLERIC 0x04 /* no clerical spells cast here */ 103#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
… …
115 * function that does more of the work can hopefully be used to replace 117 * function that does more of the work can hopefully be used to replace
116 * lots of duplicate checks currently in the code. 118 * lots of duplicate checks currently in the code.
117 */ 119 */
118#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 120#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
119#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */ 121#define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */
122
123// persistent flags (pflags) in mapspace
124enum
125{
126 PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace
127};
120 128
121/* Instead of having numerous arrays that have information on a 129/* Instead of having numerous arrays that have information on a
122 * particular space (was map, floor, floor2, map_ob), 130 * particular space (was map, floor, floor2, map_ob),
123 * have this structure take care of that information. 131 * have this structure take care of that information.
124 * This puts it all in one place, and should also make it easier 132 * This puts it all in one place, and should also make it easier
… …
139 uint16_t ACC (RW, items_); // saturates at 64k 147 uint16_t ACC (RW, items_); // saturates at 64k
140 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024) 148 uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
141 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0 149 uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
142 static uint32_t ACC (RW, smellcount); // global smell counter 150 static uint32_t ACC (RW, smellcount); // global smell counter
143 151
152 uint8_t pflags; // additional, persistent flags
144 uint32_t pad1_; // pad to 64 bytes on 64 bit systems 153 uint8_t pad [3]; // pad to 64 bytes on LP64 systems
145 154
146//-GPL 155//-GPL
147 156
148 void update_ (); 157 void update_ ();
149 MTH void update () 158 MTH void update ()
… …
165 { 174 {
166 update (); 175 update ();
167 return flags_; 176 return flags_;
168 } 177 }
169 178
179 MTH void update_up ();
180
170 MTH void invalidate () 181 MTH void invalidate ()
171 { 182 {
172 flags_ = 0; 183 flags_ = 0;
173 } 184
185 if (pflags)
186 update_up ();
174 187 }
188
175 MTH object *player () 189 MTH object *player ()
176 { 190 {
177 object *op; 191 object *op;
178 192
179 if (flags () & P_PLAYER) 193 if (flags () & P_PLAYER)
… …
215 maptile *m; 229 maptile *m;
216 int x0, y0; 230 int x0, y0;
217 int x1, y1; 231 int x1, y1;
218 int dx, dy; // offset to go from local coordinates to original tile */ 232 int dx, dy; // offset to go from local coordinates to original tile */
219}; 233};
234
235// (refcounted) list of objects on this map that need physics processing
236struct physics_queue
237: unordered_vector<object *>
238{
239 int i; // already processed
240 physics_queue ();
241 ~physics_queue ();
242 object *pop ();
243};
244
245#define PHYSICS_QUEUES 16 // "activity" at least every 16 ticks
220 246
221//+GPL 247//+GPL
222 248
223struct shopitems : zero_initialised 249struct shopitems : zero_initialised
224{ 250{
… …
266 bool ACC (RW, dirty); /* if true, something was inserted or removed */ 292 bool ACC (RW, dirty); /* if true, something was inserted or removed */
267 bool ACC (RW, no_reset); // must not reset this map 293 bool ACC (RW, no_reset); // must not reset this map
268 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by 294 bool ACC (RW, fixed_resettime); /* if true, reset time is not affected by
269 * players entering/exiting map 295 * players entering/exiting map
270 */ 296 */
297 uint8 ACC (RW, state); /* If not true, the map has been freed and must
298 * be loaded before used. The map,omap and map_ob
299 * arrays will be allocated when the map is loaded */
271 sint32 ACC (RW, timeout); /* swapout is set to this */ 300 sint32 ACC (RW, timeout); /* swapout is set to this */
272 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */ 301 sint32 ACC (RW, swap_time); /* When it reaches 0, the map will be swapped out */
273 uint32 ACC (RW, in_memory); /* If not true, the map has been freed and must
274 * be loaded before used. The map,omap and map_ob
275 * arrays will be allocated when the map is loaded */
276 sint16 players; /* How many players are on this map right now */ 302 sint16 players; /* How many players are on this map right now */
277 uint16 ACC (RW, difficulty); /* What level the player should be to play here */ 303 uint16 ACC (RW, difficulty); /* What level the player should be to play here */
278 304
279 bool ACC (RW, per_player); 305 bool ACC (RW, per_player);
280 bool ACC (RW, per_party); 306 bool ACC (RW, per_party);
… …
299 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace 325 uint64 ACC (RW, max_volume); // maximum volume for all items on a mapspace
300 int ACC (RW, max_items); // maximum number of items on a mapspace 326 int ACC (RW, max_items); // maximum number of items on a mapspace
301 327
302//-GPL 328//-GPL
303 329
330 physics_queue pq[PHYSICS_QUEUES];
331 MTH void queue_physics (object *ob, int after = 0);
332 MTH void queue_physics_at (int x, int y);
333 MTH void post_load_physics ();
334 MTH int run_physics (tick_t tick, int max_objects);
335
304 // the maptile:: is neccessary here for the perl interface to work 336 // the maptile:: is neccessary here for the perl interface to work
305 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 337 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
306 { 338 {
307 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS); 339 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
308 } 340 }
309 341
310 static void adjust_daylight (); 342 static void adjust_daylight ();
311 343
312 MTH void activate (); 344 MTH void activate ();
345 MTH void activate_physics ();
313 MTH void deactivate (); 346 MTH void deactivate ();
314 347
315 // allocates all (empty) mapspace 348 // allocates all (empty) mapspace
316 MTH void alloc (); 349 MTH void alloc ();
317 // deallocates the mapspaces (and destroys all objects) 350 // deallocates the mapspaces (and destroys all objects)
… …
364 void init (); 397 void init ();
365 ~maptile (); 398 ~maptile ();
366 399
367 void do_destroy (); 400 void do_destroy ();
368 void gather_callbacks (AV *&callbacks, event_type event) const; 401 void gather_callbacks (AV *&callbacks, event_type event) const;
402
403 MTH bool linkable () { return state >= MAP_INACTIVE; }
369 404
370 MTH int size () const { return width * height; } 405 MTH int size () const { return width * height; }
371 406
372 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0); 407 MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
373 408

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines