| … | |
… | |
| 158 | client &socket = *pl->ns; |
158 | client &socket = *pl->ns; |
| 159 | object *ob = pl->viewpoint; |
159 | object *ob = pl->viewpoint; |
| 160 | |
160 | |
| 161 | if (socket.mapinfocmd) |
161 | if (socket.mapinfocmd) |
| 162 | { |
162 | { |
| 163 | if (ob->map && ob->map->path[0]) |
163 | if (ob->map && ob->map->path) |
| 164 | { |
164 | { |
| 165 | int flags = 0; |
165 | int flags = 0; |
| 166 | |
166 | |
|
|
167 | // due to historical glitches, the bit ordering and map index ordering differs |
| 167 | if (ob->map->tile_path[0]) flags |= 0x01; |
168 | if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01; |
| 168 | if (ob->map->tile_path[1]) flags |= 0x02; |
169 | if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02; |
| 169 | if (ob->map->tile_path[2]) flags |= 0x04; |
170 | if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04; |
| 170 | if (ob->map->tile_path[3]) flags |= 0x08; |
171 | if (ob->map->tile_path[TILE_WEST ]) flags |= 0x08; |
| 171 | // these two are debatable |
172 | // these two are debatable |
| 172 | if (ob->map->tile_path[4]) flags |= 0x10; |
173 | if (ob->map->tile_path[TILE_UP ]) flags |= 0x10; |
| 173 | if (ob->map->tile_path[5]) flags |= 0x20; |
174 | if (ob->map->tile_path[TILE_DOWN ]) flags |= 0x20; |
| 174 | |
175 | |
| 175 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
176 | socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s", |
| 176 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
177 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
| 177 | ob->map->width, ob->map->height, &ob->map->path); |
178 | ob->map->width, ob->map->height, &ob->map->path); |
| 178 | } |
179 | } |
| … | |
… | |
| 344 | |
345 | |
| 345 | while (*buf && map && max_distance) |
346 | while (*buf && map && max_distance) |
| 346 | { |
347 | { |
| 347 | int dir = *buf++ - '1'; |
348 | int dir = *buf++ - '1'; |
| 348 | |
349 | |
|
|
350 | // due to historical glitches, the mapinfo index and tile index differs |
|
|
351 | static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN }; |
|
|
352 | |
| 349 | // maybe we should only allow the four flat directions |
353 | // maybe we should only allow the four flat directions |
| 350 | if (dir >= 0 && dir < array_length (map->tile_path)) |
354 | if (dir >= 0 && dir < array_length (dirmap)) |
| 351 | { |
355 | { |
|
|
356 | dir = dirmap [dir]; |
|
|
357 | |
| 352 | if (!map->tile_path [dir]) |
358 | if (!map->tile_path [dir]) |
| 353 | map = 0; |
359 | map = 0; |
| 354 | else if (map->tile_available (dir, false)) |
360 | else if (map->tile_available (dir, false)) |
| 355 | { |
361 | { |
| 356 | maptile *neigh = map->tile_map [dir]; |
362 | maptile *neigh = map->tile_map [dir]; |
| … | |
… | |
| 379 | send_packet_printf ("mapinfo %s nomap", token); |
385 | send_packet_printf ("mapinfo %s nomap", token); |
| 380 | else |
386 | else |
| 381 | { |
387 | { |
| 382 | int flags = 0; |
388 | int flags = 0; |
| 383 | |
389 | |
|
|
390 | // due to historical glitches, the bit ordering and map index ordering differs |
| 384 | if (map->tile_path[0]) flags |= 0x01; |
391 | if (map->tile_path[TILE_NORTH]) flags |= 0x01; |
| 385 | if (map->tile_path[1]) flags |= 0x02; |
392 | if (map->tile_path[TILE_EAST ]) flags |= 0x02; |
| 386 | if (map->tile_path[2]) flags |= 0x04; |
393 | if (map->tile_path[TILE_SOUTH]) flags |= 0x04; |
| 387 | if (map->tile_path[3]) flags |= 0x08; |
394 | if (map->tile_path[TILE_WEST ]) flags |= 0x08; |
| 388 | // these two are debatable |
395 | // these two are debatable |
| 389 | if (map->tile_path[4]) flags |= 0x10; |
396 | if (map->tile_path[TILE_UP ]) flags |= 0x10; |
| 390 | if (map->tile_path[5]) flags |= 0x20; |
397 | if (map->tile_path[TILE_DOWN ]) flags |= 0x20; |
| 391 | |
398 | |
| 392 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
399 | send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path); |
| 393 | } |
400 | } |
| 394 | |
401 | |
| 395 | return 1; |
402 | return 1; |
