| … | |
… | |
| 294 | static void |
294 | static void |
| 295 | 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) |
| 296 | { |
296 | { |
| 297 | int x, y; |
297 | int x, y; |
| 298 | maprow *row; |
298 | maprow *row; |
|
|
299 | mapcell *cell; |
| 299 | |
300 | |
| 300 | for (y = y0; y < y0 + h; y++) |
301 | for (y = y0; y < y0 + h; y++) |
| 301 | if (y >= 0) |
302 | if (y >= 0) |
| 302 | { |
303 | { |
| 303 | if (y >= self->rows) |
304 | if (y >= self->rows) |
| … | |
… | |
| 309 | if (x >= row->c0) |
310 | if (x >= row->c0) |
| 310 | { |
311 | { |
| 311 | if (x >= row->c1) |
312 | if (x >= row->c1) |
| 312 | break; |
313 | break; |
| 313 | |
314 | |
| 314 | row->col[x - row->c0].darkness = 0; |
315 | cell = row->col + x - row->c0; |
|
|
316 | |
|
|
317 | cell->darkness = 0; |
|
|
318 | cell->stat_hp = 0; |
| 315 | } |
319 | } |
| 316 | } |
320 | } |
| 317 | } |
321 | } |
| 318 | |
322 | |
| 319 | static void |
323 | static void |
| … | |
… | |
| 1286 | { |
1290 | { |
| 1287 | cell->darkness = 256; |
1291 | cell->darkness = 256; |
| 1288 | cell->face [0] = 0; |
1292 | cell->face [0] = 0; |
| 1289 | cell->face [1] = 0; |
1293 | cell->face [1] = 0; |
| 1290 | cell->face [2] = 0; |
1294 | cell->face [2] = 0; |
| 1291 | cell->stat_hp = 0; |
|
|
| 1292 | } |
1295 | } |
| 1293 | |
1296 | |
| 1294 | //TODO: don't trust server data to be in-range(!) |
1297 | //TODO: don't trust server data to be in-range(!) |
| 1295 | |
1298 | |
| 1296 | if (flags & 8) |
1299 | if (flags & 8) |
| … | |
… | |
| 1300 | uint8_t ext, cmd; |
1303 | uint8_t ext, cmd; |
| 1301 | |
1304 | |
| 1302 | do |
1305 | do |
| 1303 | { |
1306 | { |
| 1304 | ext = *data++; |
1307 | ext = *data++; |
| 1305 | cmd = ext & 0x7f; |
1308 | cmd = ext & 0x3f; |
| 1306 | |
1309 | |
| 1307 | if (ext < 4) |
1310 | if (ext < 4) |
| 1308 | cell->darkness = 255 - ext * 64 + 1; |
1311 | cell->darkness = 255 - ext * 64 + 1; |
| 1309 | else if (ext == 5) // health |
1312 | else if (ext == 5) // health |
| 1310 | cell->stat_hp = *data++; |
1313 | cell->stat_hp = *data++; |
|
|
1314 | else if (ext & 0x40) // unknown, multibyte => skip |
|
|
1315 | data += *data + 1; |
| 1311 | } |
1316 | } |
| 1312 | while (cmd & 0x80); |
1317 | while (cmd & 0x80); |
| 1313 | } |
1318 | } |
| 1314 | else |
1319 | else |
| 1315 | cell->darkness = *data++ + 1; |
1320 | cell->darkness = *data++ + 1; |
| … | |
… | |
| 1329 | { |
1334 | { |
| 1330 | cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; |
1335 | cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; |
| 1331 | } |
1336 | } |
| 1332 | } |
1337 | } |
| 1333 | else |
1338 | else |
|
|
1339 | { |
| 1334 | cell->darkness = 0; |
1340 | cell->darkness = 0; |
|
|
1341 | cell->stat_hp = 0; |
|
|
1342 | } |
| 1335 | } |
1343 | } |
| 1336 | } |
1344 | } |
| 1337 | |
1345 | |
| 1338 | SV * |
1346 | SV * |
| 1339 | mapmap (CFPlus::Map self, int x0, int y0, int w, int h) |
1347 | mapmap (CFPlus::Map self, int x0, int y0, int w, int h) |
| … | |
… | |
| 1439 | { |
1447 | { |
| 1440 | mapcell *cell = row->col + (x + vx - row->c0); |
1448 | mapcell *cell = row->col + (x + vx - row->c0); |
| 1441 | |
1449 | |
| 1442 | face = cell->face [z]; |
1450 | face = cell->face [z]; |
| 1443 | |
1451 | |
| 1444 | if (face) |
1452 | if (face && face < self->texs) |
| 1445 | { |
1453 | { |
| 1446 | maptex tex = self->tex [face]; |
1454 | maptex tex = self->tex [face]; |
| 1447 | |
1455 | |
| 1448 | int px = (x + 1) * 32 - tex.w; |
1456 | int px = (x + 1) * 32 - tex.w; |
| 1449 | int py = (y + 1) * 32 - tex.h; |
1457 | int py = (y + 1) * 32 - tex.h; |
| … | |
… | |
| 1467 | glEnd (); |
1475 | glEnd (); |
| 1468 | |
1476 | |
| 1469 | glDisable (GL_TEXTURE_2D); |
1477 | glDisable (GL_TEXTURE_2D); |
| 1470 | glDisable (GL_BLEND); |
1478 | glDisable (GL_BLEND); |
| 1471 | |
1479 | |
|
|
1480 | // top layer: overlays such as the health bar |
| 1472 | for (y = 0; y < sh; y++) |
1481 | for (y = 0; y < sh; y++) |
| 1473 | if (0 <= y + vy && y + vy < self->rows) |
1482 | if (0 <= y + vy && y + vy < self->rows) |
| 1474 | { |
1483 | { |
| 1475 | maprow *row = self->row + (y + vy); |
1484 | maprow *row = self->row + (y + vy); |
| 1476 | |
1485 | |
| … | |
… | |
| 1482 | int px = x * 32; |
1491 | int px = x * 32; |
| 1483 | int py = y * 32; |
1492 | int py = y * 32; |
| 1484 | |
1493 | |
| 1485 | if (cell->stat_hp) |
1494 | if (cell->stat_hp) |
| 1486 | { |
1495 | { |
|
|
1496 | int width = sh / 28 + 1; |
|
|
1497 | |
| 1487 | glColor3ub (0, 0, 0); |
1498 | glColor3ub (0, 0, 0); |
| 1488 | glRectf (px + 1, py + 1, px + 31, py + 4); |
1499 | glRectf (px + 1, py, px + 31, py + width + 2); |
| 1489 | |
1500 | |
| 1490 | glColor3ub (0, 255, 0); |
1501 | glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); |
| 1491 | glBegin (GL_LINES); |
|
|
| 1492 | glVertex2f (px + 2, py + 2.5f); |
|
|
| 1493 | glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f); |
1502 | glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1); |
| 1494 | glEnd (); |
|
|
| 1495 | } |
1503 | } |
| 1496 | } |
1504 | } |
| 1497 | } |
1505 | } |
| 1498 | } |
1506 | } |
| 1499 | |
1507 | |
