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.87 by root, Tue Sep 4 05:43:21 2007 UTC vs.
Revision 1.88 by root, Wed Sep 12 11:10:10 2007 UTC

… …
103 */ 103 */
104#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ 104#define P_OUT_OF_MAP 0x10000 /* This space is outside the map */
105#define P_NEW_MAP 0x20000 105#define P_NEW_MAP 0x20000
106 /* Coordinates passed result in a new tiled map */ 106 /* Coordinates passed result in a new tiled map */
107 107
108/* P_NO_PASS is used for ob_blocked() return value. It needs
109 * to be here to make sure the bits don't match with anything.
110 */
111#define P_NO_PASS 0x80000
112
113/* Instead of having numerous arrays that have information on a 108/* Instead of having numerous arrays that have information on a
114 * particular space (was map, floor, floor2, map_ob), 109 * particular space (was map, floor, floor2, map_ob),
115 * have this structure take care of that information. 110 * have this structure take care of that information.
116 * This puts it all in one place, and should also make it easier 111 * This puts it all in one place, and should also make it easier
117 * to extend information about a space. 112 * to extend information about a space.
… …
154 return 0; 149 return 0;
155 } 150 }
156 151
157 // return the item volume on this mapspace in cm³ 152 // return the item volume on this mapspace in cm³
158 uint64 volume () const; 153 uint64 volume () const;
154
155 bool blocks (MoveType mt) const
156 {
157 return move_block && (mt & move_block) == mt;
158 }
159}; 159};
160 160
161struct shopitems : zero_initialised 161struct shopitems : zero_initialised
162{ 162{
163 const char *name; /* name of the item in question, null if it is the default item */ 163 const char *name; /* name of the item in question, null if it is the default item */
… …
348 int distance_y; 348 int distance_y;
349 int direction; 349 int direction;
350 object *part; 350 object *part;
351}; 351};
352 352
353// comaptibility cruft start
353//TODO: these should be refactored into things like xy_normalise 354//TODO: these should be refactored into things like xy_normalise
354// and so on. 355// and so on.
355int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny); 356int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
356int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
357int out_of_map (maptile *m, int x, int y); 357int out_of_map (maptile *m, int x, int y);
358maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y); 358maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
359void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags); 359void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
360void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags); 360void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
361int on_same_map (const object *op1, const object *op2); 361int on_same_map (const object *op1, const object *op2);
362int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy); 362int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
363 363
364// adjust map, x and y for tiled maps and return true if the position is valid at all 364// adjust map, x and y for tiled maps and return true if the position is valid at all
365inline bool 365static inline bool
366xy_normalise (maptile *&map, sint16 &x, sint16 &y) 366xy_normalise (maptile *&map, sint16 &x, sint16 &y)
367{ 367{
368 // when in range, do a quick return, otherwise go the slow route 368 // when in range, do a quick return, otherwise go the slow route
369 return 369 return
370 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height)) 370 (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
371 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP); 371 || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
372} 372}
373// comaptibility cruft end
373 374
374inline mapspace & 375inline mapspace &
375object::ms () const 376object::ms () const
376{ 377{
377 return map->at (x, y); 378 return map->at (x, y);
378} 379}
379 380
380// not used anywhere *yet*
381struct mapxy { 381struct mapxy {
382 maptile *m; 382 maptile *m;
383 sint16 x, y; 383 sint16 x, y;
384 384
385 mapxy (maptile *m, sint16 x, sint16 y) 385 mapxy (maptile *m, sint16 x, sint16 y)
… …
407 407
408 return *this; 408 return *this;
409 } 409 }
410 410
411 mapspace *operator ->() const { return &m->at (x, y); } 411 mapspace *operator ->() const { return &m->at (x, y); }
412 mapspace *operator * () const { return &m->at (x, y); } 412 mapspace &operator * () const { return m->at (x, y); }
413 413
414 bool normalise () 414 bool normalise ()
415 { 415 {
416 return xy_normalise (m, x, y); 416 return xy_normalise (m, x, y);
417 } 417 }

Diff Legend

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