| … | |
… | |
| 1233 | |
1233 | |
| 1234 | while (data < data_end) |
1234 | while (data < data_end) |
| 1235 | { |
1235 | { |
| 1236 | flags = (data [0] << 8) + data [1]; data += 2; |
1236 | flags = (data [0] << 8) + data [1]; data += 2; |
| 1237 | |
1237 | |
| 1238 | x = ((flags >> 10) & 63) + self->x; |
1238 | x = self->x + ((flags >> 10) & 63); |
| 1239 | y = ((flags >> 4) & 63) + self->y; |
1239 | y = self->y + ((flags >> 4) & 63); |
| 1240 | |
1240 | |
| 1241 | cell = map_get_cell (self, x, y); |
1241 | cell = map_get_cell (self, x, y); |
| 1242 | |
1242 | |
| 1243 | if (flags & 15) |
1243 | if (flags & 15) |
| 1244 | { |
1244 | { |
| … | |
… | |
| 1341 | int vx, vy; |
1341 | int vx, vy; |
| 1342 | int x, y, z; |
1342 | int x, y, z; |
| 1343 | int last_name; |
1343 | int last_name; |
| 1344 | mapface face; |
1344 | mapface face; |
| 1345 | |
1345 | |
| 1346 | vx = self->x + (self->w - sw + 1) / 2 - shift_x; |
1346 | vx = self->x + self->w / 2 - sw / 2 - shift_x; |
| 1347 | vy = self->y + (self->h - sh + 1) / 2 - shift_y; |
1347 | vy = self->y + self->h / 2 - sh / 2 - shift_y; |
| 1348 | |
1348 | |
| 1349 | /* |
1349 | /* |
| 1350 | int vx = self->vx = self->w >= sw |
1350 | int vx = self->vx = self->w >= sw |
| 1351 | ? self->x + (self->w - sw) / 2 |
1351 | ? self->x + (self->w - sw) / 2 |
| 1352 | : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); |
1352 | : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx)); |
