… | |
… | |
163 | if (ob->map && ob->map->path) |
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 | // due to historical glitches, the bit ordering and map index ordering differs |
168 | if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01; |
168 | if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01; |
169 | if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02; |
169 | if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02; |
170 | if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04; |
170 | if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04; |
171 | if (ob->map->tile_path[TILE_WEST ]) flags |= 0x08; |
171 | if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08; |
172 | // these two are debatable |
172 | // these two are debatable |
173 | if (ob->map->tile_path[TILE_UP ]) flags |= 0x10; |
173 | if (ob->map->tile_path [TILE_UP ]) flags |= 0x10; |
174 | if (ob->map->tile_path[TILE_DOWN ]) flags |= 0x20; |
174 | if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20; |
175 | |
175 | |
176 | 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", |
177 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
177 | flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, |
178 | ob->map->width, ob->map->height, &ob->map->path); |
178 | ob->map->width, ob->map->height, &ob->map->path); |
179 | } |
179 | } |
… | |
… | |
349 | |
349 | |
350 | // due to historical glitches, the mapinfo index and tile index differs |
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 }; |
351 | static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN }; |
352 | |
352 | |
353 | // maybe we should only allow the four flat directions |
353 | // maybe we should only allow the four flat directions |
354 | if (dir >= 0 && dir < array_length (dirmap)) |
354 | if (IN_RANGE_EXC (dir, 0, array_length (dirmap))) |
355 | { |
355 | { |
356 | dir = dirmap [dir]; |
356 | dir = dirmap [dir]; |
357 | |
357 | |
358 | if (!map->tile_path [dir]) |
358 | if (!map->tile_path [dir]) |
359 | map = 0; |
359 | map = 0; |
… | |
… | |
386 | else |
386 | else |
387 | { |
387 | { |
388 | int flags = 0; |
388 | int flags = 0; |
389 | |
389 | |
390 | // due to historical glitches, the bit ordering and map index ordering differs |
390 | // due to historical glitches, the bit ordering and map index ordering differs |
391 | if (map->tile_path[TILE_NORTH]) flags |= 0x01; |
391 | if (map->tile_path [TILE_NORTH]) flags |= 0x01; |
392 | if (map->tile_path[TILE_EAST ]) flags |= 0x02; |
392 | if (map->tile_path [TILE_EAST ]) flags |= 0x02; |
393 | if (map->tile_path[TILE_SOUTH]) flags |= 0x04; |
393 | if (map->tile_path [TILE_SOUTH]) flags |= 0x04; |
394 | if (map->tile_path[TILE_WEST ]) flags |= 0x08; |
394 | if (map->tile_path [TILE_WEST ]) flags |= 0x08; |
395 | // these two are debatable |
395 | // these two are debatable |
396 | if (map->tile_path[TILE_UP ]) flags |= 0x10; |
396 | if (map->tile_path [TILE_UP ]) flags |= 0x10; |
397 | if (map->tile_path[TILE_DOWN ]) flags |= 0x20; |
397 | if (map->tile_path [TILE_DOWN ]) flags |= 0x20; |
398 | |
398 | |
399 | 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); |
400 | } |
400 | } |
401 | |
401 | |
402 | return 1; |
402 | return 1; |