ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/Client.xs
(Generate patch)

Comparing deliantra/Deliantra-Client/Client.xs (file contents):
Revision 1.141 by root, Fri Aug 18 01:01:00 2006 UTC vs.
Revision 1.144 by root, Fri Aug 18 02:25:12 2006 UTC

… …
169 float s, t; 169 float s, t;
170 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
171} maptex; 171} maptex;
172 172
173typedef struct { 173typedef struct {
174 int16_t darkness; 174 uint16_t darkness;
175 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
176} mapcell; 177} mapcell;
177 178
178typedef struct { 179typedef struct {
179 int32_t c0, c1; 180 int32_t c0, c1;
180 mapcell *col; 181 mapcell *col;
… …
308 if (x >= row->c0) 309 if (x >= row->c0)
309 { 310 {
310 if (x >= row->c1) 311 if (x >= row->c1)
311 break; 312 break;
312 313
313 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
314 } 315 }
315 } 316 }
316} 317}
317 318
318static void 319static void
… …
1279 1280
1280 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1281 1282
1282 if (flags & 15) 1283 if (flags & 15)
1283 { 1284 {
1284 if (cell->darkness < 0) 1285 if (!cell->darkness)
1285 { 1286 {
1286 cell->darkness = 0; 1287 cell->darkness = 256;
1287 cell->face [0] = 0; 1288 cell->face [0] = 0;
1288 cell->face [1] = 0; 1289 cell->face [1] = 0;
1289 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1290 } 1292 }
1293
1294 //TODO: don't trust server data to be in-range(!)
1291 1295
1292 if (flags & 8) 1296 if (flags & 8)
1293 { 1297 {
1294 fprintf (stderr, "oi\n");//D
1295 if (extmap) 1298 if (extmap)
1296 { 1299 {
1297 uint8_t ext, cmd; 1300 uint8_t ext, cmd;
1298 1301
1299 do 1302 do
1300 { 1303 {
1301
1302 ext = *data++; 1304 ext = *data++;
1303 cmd = ext & 0x7f; 1305 cmd = ext & 0x3f;
1304
1305 fprintf (stderr, "extcmd = %x\n", ext);//D
1306 1306
1307 if (ext < 4) 1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64; 1308 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health
1310 cell->stat_hp = *data++;
1311 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1;
1309 } 1313 }
1310 while (cmd & 0x80); 1314 while (cmd & 0x80);
1311 } 1315 }
1312 else 1316 else
1313 cell->darkness = flags & 8 ? *data++ : 255; 1317 cell->darkness = *data++ + 1;
1314 } 1318 }
1315
1316 //TODO: don't trust server data to be in-range(!)
1317 1319
1318 if (flags & 4) 1320 if (flags & 4)
1319 { 1321 {
1320 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1322 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1321 } 1323 }
… …
1329 { 1331 {
1330 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1332 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1331 } 1333 }
1332 } 1334 }
1333 else 1335 else
1334 cell->darkness = -1; 1336 cell->darkness = 0;
1335 } 1337 }
1336} 1338}
1337 1339
1338SV * 1340SV *
1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1341mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1466 1468
1467 glEnd (); 1469 glEnd ();
1468 1470
1469 glDisable (GL_TEXTURE_2D); 1471 glDisable (GL_TEXTURE_2D);
1470 glDisable (GL_BLEND); 1472 glDisable (GL_BLEND);
1473
1474 for (y = 0; y < sh; y++)
1475 if (0 <= y + vy && y + vy < self->rows)
1476 {
1477 maprow *row = self->row + (y + vy);
1478
1479 for (x = 0; x < sw; x++)
1480 if (row->c0 <= x + vx && x + vx < row->c1)
1481 {
1482 mapcell *cell = row->col + (x + vx - row->c0);
1483
1484 int px = x * 32;
1485 int py = y * 32;
1486
1487 if (cell->stat_hp)
1488 {
1489 glColor3ub (0, 0, 0);
1490 glRectf (px + 1, py + 1, px + 31, py + 4);
1491
1492 glColor3ub (0, 255, 0);
1493 glBegin (GL_LINES);
1494 glVertex2f (px + 2, py + 2.5f);
1495 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
1496 glEnd ();
1497 }
1498 }
1499 }
1471} 1500}
1472 1501
1473void 1502void
1474draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1503draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1475 CODE: 1504 CODE:
… …
1555 for (x = 0; x < sw; x++) 1584 for (x = 0; x < sw; x++)
1556 if (row->c0 <= x + vx && x + vx < row->c1) 1585 if (row->c0 <= x + vx && x + vx < row->c1)
1557 { 1586 {
1558 mapcell *cell = row->col + (x + vx - row->c0); 1587 mapcell *cell = row->col + (x + vx - row->c0);
1559 1588
1560 darkness[y * sw4 + x] = cell->darkness < 0 1589 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1)
1561 ? 255 - FOW_DARKNESS 1591 : 255 - FOW_DARKNESS;
1562 : 255 - cell->darkness;
1563 } 1592 }
1564 } 1593 }
1565 1594
1566 EXTEND (SP, 3); 1595 EXTEND (SP, 3);
1567 PUSHs (sv_2mortal (newSViv (sw4))); 1596 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1682 1711
1683 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1684 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1685 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1686 1715
1687 if (cell->darkness <= 0) 1716 if (cell->darkness == 0)
1688 { 1717 {
1689 cell->darkness = -1; 1718 cell->darkness = 0;
1690 1719
1691 for (z = 0; z <= 2; z++) 1720 for (z = 0; z <= 2; z++)
1692 { 1721 {
1693 cell->face[z] = face[z]; 1722 cell->face[z] = face[z];
1694 1723

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines