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.146 by root, Sat Aug 19 02:49:53 2006 UTC vs.
Revision 1.153 by root, Tue Sep 19 22:02:38 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 uint32_t player;
175 mapface face[3];
174 uint16_t darkness; 176 uint16_t darkness;
175 mapface face[3]; 177 uint8_t stat_width, stat_hp, flags;
176 uint8_t stat_hp;
177} mapcell; 178} mapcell;
178 179
179typedef struct { 180typedef struct {
180 int32_t c0, c1; 181 int32_t c0, c1;
181 mapcell *col; 182 mapcell *col;
… …
1273 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1274 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1274 uint8_t *data_end = (uint8_t *)SvEND (data_); 1275 uint8_t *data_end = (uint8_t *)SvEND (data_);
1275 mapcell *cell; 1276 mapcell *cell;
1276 int x, y, flags; 1277 int x, y, flags;
1277 1278
1278 while (data < data_end) 1279 while (data < data_end - 1)
1279 { 1280 {
1280 flags = (data [0] << 8) + data [1]; data += 2; 1281 flags = (data [0] << 8) + data [1]; data += 2;
1281 1282
1282 x = self->x + ((flags >> 10) & 63); 1283 x = self->x + ((flags >> 10) & 63);
1283 y = self->y + ((flags >> 4) & 63); 1284 y = self->y + ((flags >> 4) & 63);
… …
1305 do 1306 do
1306 { 1307 {
1307 ext = *data++; 1308 ext = *data++;
1308 cmd = ext & 0x3f; 1309 cmd = ext & 0x3f;
1309 1310
1310 if (ext < 4) 1311 if (cmd < 4)
1311 cell->darkness = 255 - ext * 64 + 1; 1312 cell->darkness = 255 - ext * 64 + 1;
1312 else if (ext == 5) // health 1313 else if (cmd == 5) // health
1314 {
1315 cell->stat_width = 1;
1313 cell->stat_hp = *data++; 1316 cell->stat_hp = *data++;
1317 }
1318 else if (cmd == 6) // monster width
1319 cell->stat_width = *data++ + 1;
1320 else if (cmd == 0x47) // monster width
1321 {
1322 if (*data == 4)
1323 ; // decode player tag
1324
1325 data += *data + 1;
1326 }
1327 else if (cmd == 8) // cell flags
1328 cell->flags = *data++;
1314 else if (ext & 0x40) // unknown, multibyte => skip 1329 else if (ext & 0x40) // unknown, multibyte => skip
1315 data += *data + 1; 1330 data += *data + 1;
1331 else
1332 data++;
1316 } 1333 }
1317 while (cmd & 0x80); 1334 while (ext & 0x80);
1318 } 1335 }
1319 else 1336 else
1320 cell->darkness = *data++ + 1; 1337 cell->darkness = *data++ + 1;
1321 } 1338 }
1322 1339
… …
1450 face = cell->face [z]; 1467 face = cell->face [z];
1451 1468
1452 if (face && face < self->texs) 1469 if (face && face < self->texs)
1453 { 1470 {
1454 maptex tex = self->tex [face]; 1471 maptex tex = self->tex [face];
1455
1456 int px = (x + 1) * 32 - tex.w; 1472 int px = (x + 1) * 32 - tex.w;
1457 int py = (y + 1) * 32 - tex.h; 1473 int py = (y + 1) * 32 - tex.h;
1458 1474
1459 if (last_name != tex.name) 1475 if (last_name != tex.name)
1460 { 1476 {
1461 glEnd (); 1477 glEnd ();
1462 last_name = tex.name;
1463 glBindTexture (GL_TEXTURE_2D, last_name); 1478 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1464 glBegin (GL_QUADS); 1479 glBegin (GL_QUADS);
1465 } 1480 }
1466 1481
1467 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1482 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1468 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1483 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1469 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1484 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1470 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1485 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1471 } 1486 }
1487
1488 if (cell->flags && z == 2)
1489 {
1490 if (cell->flags & 1)
1491 {
1492 maptex tex = self->tex [1];
1493 int px = (x + 1) * 32 - tex.w + 2;
1494 int py = (y + 1) * 32 - tex.h - 6;
1495
1496 glEnd ();
1497 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1498 glBegin (GL_QUADS);
1499
1500 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1501 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1502 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1503 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1504 }
1505 }
1472 } 1506 }
1473 } 1507 }
1474 1508
1475 glEnd (); 1509 glEnd ();
1476 1510
… …
1491 int px = x * 32; 1525 int px = x * 32;
1492 int py = y * 32; 1526 int py = y * 32;
1493 1527
1494 if (cell->stat_hp) 1528 if (cell->stat_hp)
1495 { 1529 {
1496 int width = sh / 28 + 1; 1530 int width = cell->stat_width * 32;
1531 int thick = sh / 28 + 1 + cell->stat_width;
1497 1532
1498 glColor3ub (0, 0, 0); 1533 glColor3ub (0, 0, 0);
1499 glRectf (px + 1, py, px + 31, py + width + 2); 1534 glRectf (px + 1, py - thick - 2,
1535 px + width - 1, py);
1500 1536
1501 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1537 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1502 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1); 1538 glRectf (px + 2,
1539 py - thick - 1,
1540 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1503 } 1541 }
1504 } 1542 }
1505 } 1543 }
1506} 1544}
1507 1545

Diff Legend

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