… | |
… | |
155 | rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; |
155 | rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; |
156 | |
156 | |
157 | if (!rect.width) rect.width = 1; |
157 | if (!rect.width) rect.width = 1; |
158 | if (!rect.height) rect.height = 1; |
158 | if (!rect.height) rect.height = 1; |
159 | |
159 | |
160 | rect.width = (rect.width + 3) & ~3; |
|
|
161 | |
|
|
162 | *w = rect.width; |
160 | *w = rect.width; |
163 | *h = rect.height; |
161 | *h = rect.height; |
164 | } |
162 | } |
165 | |
163 | |
166 | typedef uint16_t mapface; |
164 | typedef uint16_t mapface; |
… | |
… | |
171 | float s, t; |
169 | float s, t; |
172 | uint8_t r, g, b, a; |
170 | uint8_t r, g, b, a; |
173 | } maptex; |
171 | } maptex; |
174 | |
172 | |
175 | typedef struct { |
173 | typedef struct { |
176 | int16_t darkness; |
174 | uint16_t darkness; |
177 | mapface face[3]; |
175 | mapface face[3]; |
|
|
176 | uint8_t stat_width, stat_hp; |
178 | } mapcell; |
177 | } mapcell; |
179 | |
178 | |
180 | typedef struct { |
179 | typedef struct { |
181 | int32_t c0, c1; |
180 | int32_t c0, c1; |
182 | mapcell *col; |
181 | mapcell *col; |
… | |
… | |
295 | static void |
294 | static void |
296 | map_blank (CFPlus__Map self, int x0, int y0, int w, int h) |
295 | map_blank (CFPlus__Map self, int x0, int y0, int w, int h) |
297 | { |
296 | { |
298 | int x, y; |
297 | int x, y; |
299 | maprow *row; |
298 | maprow *row; |
|
|
299 | mapcell *cell; |
300 | |
300 | |
301 | for (y = y0; y < y0 + h; y++) |
301 | for (y = y0; y < y0 + h; y++) |
302 | if (y >= 0) |
302 | if (y >= 0) |
303 | { |
303 | { |
304 | if (y >= self->rows) |
304 | if (y >= self->rows) |
… | |
… | |
310 | if (x >= row->c0) |
310 | if (x >= row->c0) |
311 | { |
311 | { |
312 | if (x >= row->c1) |
312 | if (x >= row->c1) |
313 | break; |
313 | break; |
314 | |
314 | |
315 | row->col[x - row->c0].darkness = -1; |
315 | cell = row->col + x - row->c0; |
|
|
316 | |
|
|
317 | cell->darkness = 0; |
|
|
318 | cell->stat_hp = 0; |
316 | } |
319 | } |
317 | } |
320 | } |
318 | } |
321 | } |
319 | |
322 | |
320 | static void |
323 | static void |
… | |
… | |
1262 | self->y += MAP_EXTEND_Y; |
1265 | self->y += MAP_EXTEND_Y; |
1263 | } |
1266 | } |
1264 | } |
1267 | } |
1265 | |
1268 | |
1266 | void |
1269 | void |
1267 | map1a_update (CFPlus::Map self, SV *data_) |
1270 | map1a_update (CFPlus::Map self, SV *data_, int extmap) |
1268 | CODE: |
1271 | CODE: |
1269 | { |
1272 | { |
1270 | uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); |
1273 | uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); |
1271 | uint8_t *data_end = (uint8_t *)SvEND (data_); |
1274 | uint8_t *data_end = (uint8_t *)SvEND (data_); |
1272 | mapcell *cell; |
1275 | mapcell *cell; |
… | |
… | |
1281 | |
1284 | |
1282 | cell = map_get_cell (self, x, y); |
1285 | cell = map_get_cell (self, x, y); |
1283 | |
1286 | |
1284 | if (flags & 15) |
1287 | if (flags & 15) |
1285 | { |
1288 | { |
1286 | if (cell->darkness < 0) |
1289 | if (!cell->darkness) |
1287 | { |
1290 | { |
1288 | cell->darkness = 0; |
1291 | cell->darkness = 256; |
1289 | cell->face [0] = 0; |
1292 | cell->face [0] = 0; |
1290 | cell->face [1] = 0; |
1293 | cell->face [1] = 0; |
1291 | cell->face [2] = 0; |
1294 | cell->face [2] = 0; |
1292 | } |
1295 | } |
1293 | |
1296 | |
1294 | cell->darkness = flags & 8 ? *data++ : 255; |
|
|
1295 | |
|
|
1296 | //TODO: don't trust server data to be in-range(!) |
1297 | //TODO: don't trust server data to be in-range(!) |
|
|
1298 | |
|
|
1299 | if (flags & 8) |
|
|
1300 | { |
|
|
1301 | if (extmap) |
|
|
1302 | { |
|
|
1303 | uint8_t ext, cmd; |
|
|
1304 | |
|
|
1305 | do |
|
|
1306 | { |
|
|
1307 | ext = *data++; |
|
|
1308 | cmd = ext & 0x3f; |
|
|
1309 | |
|
|
1310 | if (cmd < 4) |
|
|
1311 | cell->darkness = 255 - ext * 64 + 1; |
|
|
1312 | else if (cmd == 5) // health |
|
|
1313 | { |
|
|
1314 | cell->stat_width = 1; |
|
|
1315 | cell->stat_hp = *data++; |
|
|
1316 | } |
|
|
1317 | else if (cmd == 6) // monster width |
|
|
1318 | cell->stat_width = *data++ + 1; |
|
|
1319 | else if (ext & 0x40) // unknown, multibyte => skip |
|
|
1320 | data += *data + 1; |
|
|
1321 | else |
|
|
1322 | data++; |
|
|
1323 | } |
|
|
1324 | while (ext & 0x80); |
|
|
1325 | } |
|
|
1326 | else |
|
|
1327 | cell->darkness = *data++ + 1; |
|
|
1328 | } |
1297 | |
1329 | |
1298 | if (flags & 4) |
1330 | if (flags & 4) |
1299 | { |
1331 | { |
1300 | cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; |
1332 | cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; |
1301 | } |
1333 | } |
… | |
… | |
1309 | { |
1341 | { |
1310 | cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; |
1342 | cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; |
1311 | } |
1343 | } |
1312 | } |
1344 | } |
1313 | else |
1345 | else |
|
|
1346 | { |
1314 | cell->darkness = -1; |
1347 | cell->darkness = 0; |
|
|
1348 | cell->stat_hp = 0; |
|
|
1349 | } |
1315 | } |
1350 | } |
1316 | } |
1351 | } |
1317 | |
1352 | |
1318 | SV * |
1353 | SV * |
1319 | mapmap (CFPlus::Map self, int x0, int y0, int w, int h) |
1354 | mapmap (CFPlus::Map self, int x0, int y0, int w, int h) |
… | |
… | |
1419 | { |
1454 | { |
1420 | mapcell *cell = row->col + (x + vx - row->c0); |
1455 | mapcell *cell = row->col + (x + vx - row->c0); |
1421 | |
1456 | |
1422 | face = cell->face [z]; |
1457 | face = cell->face [z]; |
1423 | |
1458 | |
1424 | if (face) |
1459 | if (face && face < self->texs) |
1425 | { |
1460 | { |
1426 | maptex tex = self->tex [face]; |
1461 | maptex tex = self->tex [face]; |
1427 | |
1462 | |
1428 | int px = (x + 1) * 32 - tex.w; |
1463 | int px = (x + 1) * 32 - tex.w; |
1429 | int py = (y + 1) * 32 - tex.h; |
1464 | int py = (y + 1) * 32 - tex.h; |
… | |
… | |
1445 | } |
1480 | } |
1446 | |
1481 | |
1447 | glEnd (); |
1482 | glEnd (); |
1448 | |
1483 | |
1449 | glDisable (GL_TEXTURE_2D); |
1484 | glDisable (GL_TEXTURE_2D); |
|
|
1485 | |
|
|
1486 | // top layer: overlays such as the health bar |
|
|
1487 | for (y = 0; y < sh; y++) |
|
|
1488 | if (0 <= y + vy && y + vy < self->rows) |
|
|
1489 | { |
|
|
1490 | maprow *row = self->row + (y + vy); |
|
|
1491 | |
|
|
1492 | for (x = 0; x < sw; x++) |
|
|
1493 | if (row->c0 <= x + vx && x + vx < row->c1) |
|
|
1494 | { |
|
|
1495 | mapcell *cell = row->col + (x + vx - row->c0); |
|
|
1496 | |
|
|
1497 | int px = x * 32; |
|
|
1498 | int py = y * 32; |
|
|
1499 | |
|
|
1500 | if (cell->stat_hp) |
|
|
1501 | { |
|
|
1502 | int width = cell->stat_width * 32; |
|
|
1503 | int thick = sh / 28 + 1 + cell->stat_width; |
|
|
1504 | |
|
|
1505 | glColor4ub (0, 0, 0, 127); |
|
|
1506 | glRectf (px + 1, py, |
|
|
1507 | px + width - 1, py + thick + 2); |
|
|
1508 | |
|
|
1509 | glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 255); |
|
|
1510 | glRectf (px + 2, |
|
|
1511 | py + 1, |
|
|
1512 | px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1); |
|
|
1513 | } |
|
|
1514 | } |
|
|
1515 | } |
|
|
1516 | |
1450 | glDisable (GL_BLEND); |
1517 | glDisable (GL_BLEND); |
1451 | } |
1518 | } |
1452 | |
1519 | |
1453 | void |
1520 | void |
1454 | draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) |
1521 | draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) |
… | |
… | |
1535 | for (x = 0; x < sw; x++) |
1602 | for (x = 0; x < sw; x++) |
1536 | if (row->c0 <= x + vx && x + vx < row->c1) |
1603 | if (row->c0 <= x + vx && x + vx < row->c1) |
1537 | { |
1604 | { |
1538 | mapcell *cell = row->col + (x + vx - row->c0); |
1605 | mapcell *cell = row->col + (x + vx - row->c0); |
1539 | |
1606 | |
1540 | darkness[y * sw4 + x] = cell->darkness < 0 |
1607 | darkness[y * sw4 + x] = cell->darkness |
|
|
1608 | ? 255 - (cell->darkness - 1) |
1541 | ? 255 - FOW_DARKNESS |
1609 | : 255 - FOW_DARKNESS; |
1542 | : 255 - cell->darkness; |
|
|
1543 | } |
1610 | } |
1544 | } |
1611 | } |
1545 | |
1612 | |
1546 | EXTEND (SP, 3); |
1613 | EXTEND (SP, 3); |
1547 | PUSHs (sv_2mortal (newSViv (sw4))); |
1614 | PUSHs (sv_2mortal (newSViv (sw4))); |
… | |
… | |
1662 | |
1729 | |
1663 | if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } |
1730 | if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } |
1664 | if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } |
1731 | if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } |
1665 | if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } |
1732 | if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } |
1666 | |
1733 | |
1667 | if (cell->darkness <= 0) |
1734 | if (cell->darkness == 0) |
1668 | { |
1735 | { |
1669 | cell->darkness = -1; |
1736 | cell->darkness = 0; |
1670 | |
1737 | |
1671 | for (z = 0; z <= 2; z++) |
1738 | for (z = 0; z <= 2; z++) |
1672 | { |
1739 | { |
1673 | cell->face[z] = face[z]; |
1740 | cell->face[z] = face[z]; |
1674 | |
1741 | |