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.139 by root, Wed May 4 07:41:14 2011 UTC vs.
Revision 1.146 by root, Sun May 8 11:32:12 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};
66
67#define REVERSE_TILE_DIR(dir) ((dir) ^ 1)
65 68
66/* Values for state below */ 69/* Values for state below */
67enum { 70enum
71{
68 MAP_SWAPPED, // header loaded, nothing else 72 MAP_SWAPPED, // header loaded, nothing else
69 MAP_INACTIVE, // in memory, linkable, but not active 73 MAP_INACTIVE, // in memory, linkable, but not active
70 MAP_ACTIVE, // running! 74 MAP_ACTIVE, // running!
71}; 75};
72 76
… …
89 * 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
90 * map tiling. 94 * map tiling.
91 */ 95 */
92#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)))
93 97
94/* 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
95 * in the object flags structure. 99 * in the object flags structure.
96 */ 100 */
97#define P_BLOCKSVIEW 0x01 101#define P_BLOCKSVIEW 0x01
98#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 */
99#define P_NO_CLERIC 0x04 /* no clerical spells cast here */ 103#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
… …
113 * 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
114 * lots of duplicate checks currently in the code. 118 * lots of duplicate checks currently in the code.
115 */ 119 */
116#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 */
117#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};
118 128
119/* Instead of having numerous arrays that have information on a 129/* Instead of having numerous arrays that have information on a
120 * particular space (was map, floor, floor2, map_ob), 130 * particular space (was map, floor, floor2, map_ob),
121 * have this structure take care of that information. 131 * have this structure take care of that information.
122 * 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
… …
137 uint16_t ACC (RW, items_); // saturates at 64k 147 uint16_t ACC (RW, items_); // saturates at 64k
138 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)
139 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
140 static uint32_t ACC (RW, smellcount); // global smell counter 150 static uint32_t ACC (RW, smellcount); // global smell counter
141 151
152 uint8_t pflags; // additional, persistent flags
142 uint32_t pad1_; // pad to 64 bytes on 64 bit systems 153 uint8_t pad [3]; // pad to 64 bytes on LP64 systems
143 154
144//-GPL 155//-GPL
145 156
146 void update_ (); 157 void update_ ();
147 MTH void update () 158 MTH void update ()
… …
163 { 174 {
164 update (); 175 update ();
165 return flags_; 176 return flags_;
166 } 177 }
167 178
179 MTH void update_up ();
180
168 MTH void invalidate () 181 MTH void invalidate ()
169 { 182 {
170 flags_ = 0; 183 flags_ = 0;
171 } 184
185 if (pflags)
186 update_up ();
172 187 }
188
173 MTH object *player () 189 MTH object *player ()
174 { 190 {
175 object *op; 191 object *op;
176 192
177 if (flags () & P_PLAYER) 193 if (flags () & P_PLAYER)
… …
213 maptile *m; 229 maptile *m;
214 int x0, y0; 230 int x0, y0;
215 int x1, y1; 231 int x1, y1;
216 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 */
217}; 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
218 246
219//+GPL 247//+GPL
220 248
221struct shopitems : zero_initialised 249struct shopitems : zero_initialised
222{ 250{
… …
297 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
298 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
299 327
300//-GPL 328//-GPL
301 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
302 // the maptile:: is neccessary here for the perl interface to work 336 // the maptile:: is neccessary here for the perl interface to work
303 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const 337 MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
304 { 338 {
305 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS); 339 return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
306 } 340 }
307 341
308 static void adjust_daylight (); 342 static void adjust_daylight ();
309 343
310 MTH void activate (); 344 MTH void activate ();
345 MTH void activate_physics ();
311 MTH void deactivate (); 346 MTH void deactivate ();
312 347
313 // allocates all (empty) mapspace 348 // allocates all (empty) mapspace
314 MTH void alloc (); 349 MTH void alloc ();
315 // deallocates the mapspaces (and destroys all objects) 350 // deallocates the mapspaces (and destroys all objects)
… …
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
374 MTH void touch () { last_access = runtime; } 409 MTH void touch () { last_access = runtime; }
375 410
411 // returns the map at given direction. if the map isn't linked yet,
412 // it will either return false (if load is false), or otherwise try to link
413 // it - if linking fails because the map is not loaded yet, it will
414 // start loading the map and return 0.
415 // thus, if you get 0, the map exists and load is true, then some later
416 // call (some tick or so later...) will eventually succeed.
376 MTH maptile *tile_available (int dir, bool load = true); 417 MTH maptile *tile_available (int dir, bool load = true);
377 418
378 // find the map that is at coordinate x|y relative to this map 419 // find the map that is at coordinate x|y relative to this map
379 // TODO: need a better way than passing by reference 420 // TODO: need a better way than passing by reference
380 // TODO: make perl interface 421 // TODO: make perl interface

Diff Legend

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