… | |
… | |
107 | * used in the get_map_flags value - that function is used to return |
107 | * used in the get_map_flags value - that function is used to return |
108 | * the flag value, as well as other conditions - using a more general |
108 | * the flag value, as well as other conditions - using a more general |
109 | * function that does more of the work can hopefully be used to replace |
109 | * function that does more of the work can hopefully be used to replace |
110 | * lots of duplicate checks currently in the code. |
110 | * lots of duplicate checks currently in the code. |
111 | */ |
111 | */ |
112 | #define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ |
112 | #define P_OUT_OF_MAP 0x10000 /* This space is outside the map */ |
113 | #define P_NEW_MAP 0x20000 |
113 | #define P_NEW_MAP 0x20000 /* Coordinates passed result in a new tiled map */ |
114 | /* Coordinates passed result in a new tiled map */ |
|
|
115 | |
114 | |
116 | /* Instead of having numerous arrays that have information on a |
115 | /* Instead of having numerous arrays that have information on a |
117 | * particular space (was map, floor, floor2, map_ob), |
116 | * particular space (was map, floor, floor2, map_ob), |
118 | * have this structure take care of that information. |
117 | * have this structure take care of that information. |
119 | * This puts it all in one place, and should also make it easier |
118 | * This puts it all in one place, and should also make it easier |
… | |
… | |
123 | struct mapspace |
122 | struct mapspace |
124 | { |
123 | { |
125 | object *ACC (RW, bot); |
124 | object *ACC (RW, bot); |
126 | object *ACC (RW, top); /* lowest/highest object on this space */ |
125 | object *ACC (RW, top); /* lowest/highest object on this space */ |
127 | object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ |
126 | object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */ |
|
|
127 | uint32_t smell; // the last count a player was seen here, or 0 |
|
|
128 | static uint32_t smellcount; // global smell counter |
128 | uint8 flags_; /* flags about this space (see the P_ values above) */ |
129 | uint8 flags_; /* flags about this space (see the P_ values above) */ |
129 | sint8 ACC (RW, light); /* How much light this space provides */ |
130 | sint8 ACC (RW, light); /* How much light this space provides */ |
130 | MoveType ACC (RW, move_block); /* What movement types this space blocks */ |
131 | MoveType ACC (RW, move_block); /* What movement types this space blocks */ |
131 | MoveType ACC (RW, move_slow); /* What movement types this space slows */ |
132 | MoveType ACC (RW, move_slow); /* What movement types this space slows */ |
132 | MoveType ACC (RW, move_on); /* What movement types are activated */ |
133 | MoveType ACC (RW, move_on); /* What movement types are activated */ |
… | |
… | |
488 | // can be used as a single statement, but both iterate macros |
489 | // can be used as a single statement, but both iterate macros |
489 | // invocations must not be followed by a ";" |
490 | // invocations must not be followed by a ";" |
490 | // see common/los.C for usage example |
491 | // see common/los.C for usage example |
491 | // the walk will be ordered, outer loop x, inner loop y |
492 | // the walk will be ordered, outer loop x, inner loop y |
492 | // m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op |
493 | // m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op |
|
|
494 | // "continue" will skip to the next space |
493 | #define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \ |
495 | #define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \ |
494 | for (int dx = (dx0); dx <= (dx1); ++dx) \ |
496 | for (int dx = (dx0); dx <= (dx1); ++dx) \ |
495 | { \ |
497 | { \ |
496 | sint16 nx, ny; \ |
498 | sint16 nx, ny; \ |
497 | maptile *m = 0; \ |
499 | maptile *m = 0; \ |
… | |
… | |
502 | /* if not, do it the slow way */ \ |
504 | /* if not, do it the slow way */ \ |
503 | if (!m || ++ny >= m->height) \ |
505 | if (!m || ++ny >= m->height) \ |
504 | { \ |
506 | { \ |
505 | nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ |
507 | nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \ |
506 | \ |
508 | \ |
507 | if (xy_normalise (m, nx, ny)) \ |
509 | if (!xy_normalise (m, nx, ny)) \ |
508 | m->touch (); \ |
|
|
509 | else \ |
|
|
510 | m = 0; \ |
510 | m = 0; \ |
511 | } |
511 | } |
512 | |
512 | |
513 | #define ordered_mapwalk_end \ |
513 | #define ordered_mapwalk_end \ |
514 | } \ |
514 | } \ |
515 | } |
515 | } |
516 | |
516 | |
517 | // loop over every space in the given maprect, |
517 | // loop over every space in the given maprect, |
518 | // setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0 |
518 | // setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0 |
519 | // the iterator code must be a single statement following this macro call, similar to "if" |
519 | // the iterator code must be a single statement following this macro call, similar to "if" |
|
|
520 | // "continue" will skip to the next space |
520 | #define rect_mapwalk(rect,dx0,dy0) \ |
521 | #define rect_mapwalk(rect,dx0,dy0) \ |
521 | statementvar (maptile *, m, (rect)->m) \ |
522 | statementvar (maptile *, m, (rect)->m) \ |
522 | for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \ |
523 | for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \ |
523 | for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \ |
524 | for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \ |
524 | statementvar (int, dx, nx + (rect)->dx - (dx0)) \ |
525 | statementvar (int, dx, nx + (rect)->dx - (dx0)) \ |
525 | statementvar (int, dy, ny + (rect)->dy - (dy0)) |
526 | statementvar (int, dy, ny + (rect)->dy - (dy0)) |
526 | |
527 | |
527 | // same as above, but the walk will not follow any particular |
528 | // same as above, but the walk will not follow any particular |
528 | // order (unorded), but is likely faster. |
529 | // order (unorded), but is likely faster. |
529 | // m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op |
530 | // m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op |
|
|
531 | // "continue" will skip to the next space |
530 | #define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ |
532 | #define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \ |
531 | for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \ |
533 | for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \ |
532 | (op)->x + (dx0) , (op)->y + (dy0) , \ |
534 | (op)->x + (dx0) , (op)->y + (dy0) , \ |
533 | (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \ |
535 | (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \ |
534 | r_e_c_t->m; \ |
536 | r_e_c_t->m; \ |