| … | |
… | |
| 187 | { |
187 | { |
| 188 | if (flags & NDI_ALL) |
188 | if (flags & NDI_ALL) |
| 189 | { |
189 | { |
| 190 | player *tmppl; |
190 | player *tmppl; |
| 191 | |
191 | |
| 192 | for (tmppl = first_player; tmppl != NULL; tmppl = tmppl->next) |
192 | for_all_players (pl) |
| 193 | new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); |
193 | new_draw_info ((flags & ~NDI_ALL), pri, tmppl->ob, buf); |
| 194 | |
194 | |
| 195 | return; |
195 | return; |
| 196 | } |
196 | } |
| 197 | |
197 | |
| … | |
… | |
| 309 | void |
309 | void |
| 310 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
310 | new_info_map_except (int color, maptile * map, object *op, const char *str) |
| 311 | { |
311 | { |
| 312 | player *pl; |
312 | player *pl; |
| 313 | |
313 | |
| 314 | for (pl = first_player; pl != NULL; pl = pl->next) |
314 | for_all_players (pl) |
| 315 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
315 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op) |
| 316 | { |
316 | { |
| 317 | new_draw_info (color, 0, pl->ob, str); |
317 | new_draw_info (color, 0, pl->ob, str); |
| 318 | } |
318 | } |
| 319 | } |
319 | } |
| … | |
… | |
| 325 | void |
325 | void |
| 326 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
326 | new_info_map_except2 (int color, maptile * map, object *op1, object *op2, const char *str) |
| 327 | { |
327 | { |
| 328 | player *pl; |
328 | player *pl; |
| 329 | |
329 | |
| 330 | for (pl = first_player; pl != NULL; pl = pl->next) |
330 | for_all_players (pl) |
| 331 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
331 | if (pl->ob != NULL && pl->ob->map == map && pl->ob != op1 && pl->ob != op2) |
| 332 | { |
332 | { |
| 333 | new_draw_info (color, 0, pl->ob, str); |
333 | new_draw_info (color, 0, pl->ob, str); |
| 334 | } |
334 | } |
| 335 | } |
335 | } |
| … | |
… | |
| 341 | void |
341 | void |
| 342 | new_info_map (int color, maptile * map, const char *str) |
342 | new_info_map (int color, maptile * map, const char *str) |
| 343 | { |
343 | { |
| 344 | player *pl; |
344 | player *pl; |
| 345 | |
345 | |
| 346 | for (pl = first_player; pl != NULL; pl = pl->next) |
346 | for_all_players (pl) |
| 347 | if (pl->ob != NULL && pl->ob->map == map) |
347 | if (pl->ob != NULL && pl->ob->map == map) |
| 348 | { |
348 | { |
| 349 | new_draw_info (color, 0, pl->ob, str); |
349 | new_draw_info (color, 0, pl->ob, str); |
| 350 | } |
350 | } |
| 351 | } |
351 | } |
| … | |
… | |
| 598 | xmax = 0; |
598 | xmax = 0; |
| 599 | ymax = 0; |
599 | ymax = 0; |
| 600 | |
600 | |
| 601 | for (int x = 0; x < MAGIC_MAP_SIZE; x++) |
601 | for (int x = 0; x < MAGIC_MAP_SIZE; x++) |
| 602 | for (int y = 0; y < MAGIC_MAP_SIZE; y++) |
602 | for (int y = 0; y < MAGIC_MAP_SIZE; y++) |
| 603 | if (map_mark[x + MAP_WIDTH (pl->map) * y] | FACE_FLOOR) |
603 | if (map_mark[x + pl->map->width * y] | FACE_FLOOR) |
| 604 | { |
604 | { |
| 605 | xmin = x < xmin ? x : xmin; |
605 | xmin = x < xmin ? x : xmin; |
| 606 | xmax = x > xmax ? x : xmax; |
606 | xmax = x > xmax ? x : xmax; |
| 607 | ymin = y < ymin ? y : ymin; |
607 | ymin = y < ymin ? y : ymin; |
| 608 | ymax = y > ymax ? y : ymax; |
608 | ymax = y > ymax ? y : ymax; |
