| … | … | ||
|---|---|---|---|
| 367 | self->oy = 0; | 367 | self->oy = 0; |
| 368 | self->row = 0; | 368 | self->row = 0; |
| 369 | self->rows = 0; | 369 | self->rows = 0; |
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | #define CELL_CLEAR(cell) \ | ||
| 373 | do { \ | ||
| 374 | if ((cell)->player) \ | ||
| 375 | (cell)->tile [2] = 0; \ | ||
| 376 | (cell)->darkness = 0; \ | ||
| 377 | (cell)->stat_hp = 0; \ | ||
| 378 | (cell)->flags = 0; \ | ||
| 379 | (cell)->player = 0; \ | ||
| 380 | } while (0) | ||
| 381 | |||
| 372 | static void | 382 | static void |
| 373 | map_blank (DC__Map self, int x0, int y0, int w, int h) | 383 | map_blank (DC__Map self, int x0, int y0, int w, int h) |
| 374 | { | 384 | { |
| 375 | int x, y; | 385 | int x, y; |
| 376 | maprow *row; | 386 | maprow *row; |
| … | … | ||
| 390 | if (x >= row->c1) | 400 | if (x >= row->c1) |
| 391 | break; | 401 | break; |
| 392 | 402 | ||
| 393 | cell = row->col + x - row->c0; | 403 | cell = row->col + x - row->c0; |
| 394 | 404 | ||
| 395 | cell->darkness = 0; | 405 | CELL_CLEAR (cell); |
| 396 | cell->stat_hp = 0; | ||
| 397 | cell->flags = 0; | ||
| 398 | cell->player = 0; | ||
| 399 | } | 406 | } |
| 400 | } | 407 | } |
| 401 | } | 408 | } |
| 402 | 409 | ||
| 403 | typedef struct { | 410 | typedef struct { |
| … | … | ||
| 1780 | } | 1787 | } |
| 1781 | } | 1788 | } |
| 1782 | } | 1789 | } |
| 1783 | } | 1790 | } |
| 1784 | else | 1791 | else |
| 1785 | { | 1792 | CELL_CLEAR (cell); |
| 1786 | cell->darkness = 0; | ||
| 1787 | cell->stat_hp = 0; | ||
| 1788 | cell->flags = 0; | ||
| 1789 | cell->player = 0; | ||
| 1790 | } | ||
| 1791 | } | 1793 | } |
| 1792 | } | 1794 | } |
| 1793 | OUTPUT: | 1795 | OUTPUT: |
| 1794 | RETVAL | 1796 | RETVAL |
| 1795 | 1797 |
| – | Removed lines |
| + | Added lines |
| < | Changed lines |
| > | Changed lines |