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.143 by root, Fri Aug 18 02:23:39 2006 UTC vs.
Revision 1.147 by root, Sat Aug 19 03:57:08 2006 UTC

… …
171} maptex; 171} maptex;
172 172
173typedef struct { 173typedef struct {
174 uint16_t darkness; 174 uint16_t darkness;
175 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp; 176 uint8_t stat_width, stat_hp;
177} mapcell; 177} mapcell;
178 178
179typedef struct { 179typedef struct {
180 int32_t c0, c1; 180 int32_t c0, c1;
181 mapcell *col; 181 mapcell *col;
… …
294static void 294static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 295map_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
319static void 323static 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 (cmd < 4)
1308 cell->darkness = 255 - ext * 64 + 1; 1311 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health 1312 else if (cmd == 5) // health
1313 {
1314 cell->stat_width = 1;
1310 cell->stat_hp = *data++; 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++;
1311 } 1323 }
1312 while (cmd & 0x80); 1324 while (ext & 0x80);
1313 } 1325 }
1314 else 1326 else
1315 cell->darkness = *data++ + 1; 1327 cell->darkness = *data++ + 1;
1316 } 1328 }
1317 1329
… …
1329 { 1341 {
1330 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;
1331 } 1343 }
1332 } 1344 }
1333 else 1345 else
1346 {
1334 cell->darkness = 0; 1347 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1335 } 1350 }
1336} 1351}
1337 1352
1338SV * 1353SV *
1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1439 { 1454 {
1440 mapcell *cell = row->col + (x + vx - row->c0); 1455 mapcell *cell = row->col + (x + vx - row->c0);
1441 1456
1442 face = cell->face [z]; 1457 face = cell->face [z];
1443 1458
1444 if (face) 1459 if (face && face < self->texs)
1445 { 1460 {
1446 maptex tex = self->tex [face]; 1461 maptex tex = self->tex [face];
1447 1462
1448 int px = (x + 1) * 32 - tex.w; 1463 int px = (x + 1) * 32 - tex.w;
1449 int py = (y + 1) * 32 - tex.h; 1464 int py = (y + 1) * 32 - tex.h;
… …
1465 } 1480 }
1466 1481
1467 glEnd (); 1482 glEnd ();
1468 1483
1469 glDisable (GL_TEXTURE_2D); 1484 glDisable (GL_TEXTURE_2D);
1470 glDisable (GL_BLEND);
1471 1485
1486 // top layer: overlays such as the health bar
1472 for (y = 0; y < sh; y++) 1487 for (y = 0; y < sh; y++)
1473 if (0 <= y + vy && y + vy < self->rows) 1488 if (0 <= y + vy && y + vy < self->rows)
1474 { 1489 {
1475 maprow *row = self->row + (y + vy); 1490 maprow *row = self->row + (y + vy);
1476 1491
… …
1482 int px = x * 32; 1497 int px = x * 32;
1483 int py = y * 32; 1498 int py = y * 32;
1484 1499
1485 if (cell->stat_hp) 1500 if (cell->stat_hp)
1486 { 1501 {
1502 int width = cell->stat_width * 32;
1503 int thick = sh / 28 + 1 + cell->stat_width;
1504
1487 glColor3ub (0, 0, 0); 1505 glColor4ub (0, 0, 0, 128);
1488 glRectf (px + 1, py + 1, px + 31, py + 4);
1489
1490 glColor3ub (0, 255, 0);
1491 glBegin (GL_LINES);
1492 glVertex2f (px + 2, py + 2.5f); 1506 glRectf (px + 1, py,
1493 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f); 1507 px + width - 1, py + thick + 2);
1508
1509 glColor4ub (cell->stat_hp, 255 - cell->stat_hp, 0, 192);
1494 glEnd (); 1510 glRectf (px + 2,
1511 py + 1,
1512 px + width - 2 - cell->stat_hp * (width - 4) / 255, py + thick + 1);
1495 } 1513 }
1496 } 1514 }
1497 } 1515 }
1516
1517 glDisable (GL_BLEND);
1498} 1518}
1499 1519
1500void 1520void
1501draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1521draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1502 CODE: 1522 CODE:

Diff Legend

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