… | |
… | |
41 | { |
41 | { |
42 | int x[4], y[4]; |
42 | int x[4], y[4]; |
43 | int index; |
43 | int index; |
44 | } blocks; |
44 | } blocks; |
45 | |
45 | |
|
|
46 | // 31/32 == a speed hack |
|
|
47 | // we would like to use 32 for speed, but the code loops endlessly |
|
|
48 | // then, reason not yet identified, so only make the array use 32, |
|
|
49 | // not the define's. |
46 | blocks block[MAP_CLIENT_X][MAP_CLIENT_Y]; |
50 | blocks block[MAP_CLIENT_X][MAP_CLIENT_Y == 31 ? 32 : MAP_CLIENT_Y]; |
47 | |
51 | |
48 | static void expand_lighted_sight (object *op); |
52 | static void expand_lighted_sight (object *op); |
49 | |
53 | |
50 | /* |
54 | /* |
51 | * Used to initialise the array used by the LOS routines. |
55 | * Used to initialise the array used by the LOS routines. |
… | |
… | |
90 | |
94 | |
91 | void |
95 | void |
92 | init_block (void) |
96 | init_block (void) |
93 | { |
97 | { |
94 | int x, y, dx, dy, i; |
98 | int x, y, dx, dy, i; |
95 | static int block_x[3] = { -1, -1, 0 }, block_y[3] = |
99 | static int block_x[3] = { -1, -1, 0 }, |
96 | { |
100 | block_y[3] = { -1, 0, -1 }; |
97 | -1, 0, -1}; |
|
|
98 | |
101 | |
99 | for (x = 0; x < MAP_CLIENT_X; x++) |
102 | for (x = 0; x < MAP_CLIENT_X; x++) |
100 | for (y = 0; y < MAP_CLIENT_Y; y++) |
103 | for (y = 0; y < MAP_CLIENT_Y; y++) |
101 | { |
|
|
102 | block[x][y].index = 0; |
104 | block[x][y].index = 0; |
103 | } |
|
|
104 | |
105 | |
105 | |
106 | |
106 | /* The table should be symmetric, so only do the upper left |
107 | /* The table should be symmetric, so only do the upper left |
107 | * quadrant - makes the processing easier. |
108 | * quadrant - makes the processing easier. |
108 | */ |
109 | */ |
… | |
… | |
125 | /* For simplicity, we mirror the coordinates to block the other |
126 | /* For simplicity, we mirror the coordinates to block the other |
126 | * quadrants. |
127 | * quadrants. |
127 | */ |
128 | */ |
128 | set_block (x, y, dx, dy); |
129 | set_block (x, y, dx, dy); |
129 | if (x == MAP_CLIENT_X / 2) |
130 | if (x == MAP_CLIENT_X / 2) |
130 | { |
|
|
131 | set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1); |
131 | set_block (x, MAP_CLIENT_Y - y - 1, dx, MAP_CLIENT_Y - dy - 1); |
132 | } |
|
|
133 | else if (y == MAP_CLIENT_Y / 2) |
132 | else if (y == MAP_CLIENT_Y / 2) |
134 | { |
|
|
135 | set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy); |
133 | set_block (MAP_CLIENT_X - x - 1, y, MAP_CLIENT_X - dx - 1, dy); |
136 | } |
|
|
137 | } |
134 | } |
138 | else |
135 | else |
139 | { |
136 | { |
140 | float d1, r, s, l; |
137 | float d1, r, s, l; |
141 | |
138 | |
… | |
… | |
175 | * that if some particular space is blocked, it blocks |
172 | * that if some particular space is blocked, it blocks |
176 | * the view of the spaces 'behind' it, and those blocked |
173 | * the view of the spaces 'behind' it, and those blocked |
177 | * spaces behind it may block other spaces, etc. |
174 | * spaces behind it may block other spaces, etc. |
178 | * In this way, the chain of visibility is set. |
175 | * In this way, the chain of visibility is set. |
179 | */ |
176 | */ |
180 | |
|
|
181 | static void |
177 | static void |
182 | set_wall (object *op, int x, int y) |
178 | set_wall (object *op, int x, int y) |
183 | { |
179 | { |
184 | int i; |
180 | int i; |
185 | |
181 | |
… | |
… | |
490 | if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ |
486 | if (QUERY_FLAG (op, FLAG_BLIND)) /* player is blind */ |
491 | blinded_sight (op); |
487 | blinded_sight (op); |
492 | else |
488 | else |
493 | expand_sight (op); |
489 | expand_sight (op); |
494 | |
490 | |
|
|
491 | //TODO: no range-checking whatsoever :( |
495 | if (QUERY_FLAG (op, FLAG_XRAYS)) |
492 | if (QUERY_FLAG (op, FLAG_XRAYS)) |
496 | { |
|
|
497 | int x, y; |
|
|
498 | |
|
|
499 | for (x = -2; x <= 2; x++) |
493 | for (int x = -2; x <= 2; x++) |
500 | for (y = -2; y <= 2; y++) |
494 | for (int y = -2; y <= 2; y++) |
501 | op->contr->blocked_los[dx + x][dy + y] = 0; |
495 | op->contr->blocked_los[dx + x][dy + y] = 0; |
502 | } |
|
|
503 | } |
496 | } |
504 | |
497 | |
505 | /* update all_map_los is like update_all_los below, |
498 | /* update all_map_los is like update_all_los below, |
506 | * but updates everyone on the map, no matter where they |
499 | * but updates everyone on the map, no matter where they |
507 | * are. This generally should not be used, as a per |
500 | * are. This generally should not be used, as a per |