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.142 by root, Fri Aug 18 01:27:15 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 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;
… …
294static void 295static void
295map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 296map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
296{ 297{
297 int x, y; 298 int x, y;
298 maprow *row; 299 maprow *row;
300 mapcell *cell;
299 301
300 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 303 if (y >= 0)
302 { 304 {
303 if (y >= self->rows) 305 if (y >= self->rows)
… …
309 if (x >= row->c0) 311 if (x >= row->c0)
310 { 312 {
311 if (x >= row->c1) 313 if (x >= row->c1)
312 break; 314 break;
313 315
314 row->col[x - row->c0].darkness = 0; 316 cell = row->col + x - row->c0;
317
318 cell->darkness = 0;
319 cell->stat_hp = 0;
320 cell->flags = 0;
321 cell->player = 0;
315 } 322 }
316 } 323 }
317} 324}
318 325
319static void 326static void
… …
1239void 1246void
1240scroll (CFPlus::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1248 CODE:
1242{ 1249{
1243 if (dx > 0) 1250 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1252 else if (dx < 0)
1246 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1253 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1247 1254
1248 if (dy > 0) 1255 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1257 else if (dy < 0)
1251 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1258 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1252 1259
1253 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1255 1262
1256 while (self->y < 0) 1263 while (self->y < 0)
… …
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1278 mapcell *cell;
1272 int x, y, flags; 1279 int x, y, flags;
1273 1280
1274 while (data < data_end) 1281 while (data < data_end - 1)
1275 { 1282 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1277 1284
1278 x = self->x + ((flags >> 10) & 63); 1285 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1286 y = self->y + ((flags >> 4) & 63);
… …
1282 1289
1283 if (flags & 15) 1290 if (flags & 15)
1284 { 1291 {
1285 if (!cell->darkness) 1292 if (!cell->darkness)
1286 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1295 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 } 1296 }
1292 1297
1293 //TODO: don't trust server data to be in-range(!) 1298 //TODO: don't trust server data to be in-range(!)
1294 1299
1295 if (flags & 8) 1300 if (flags & 8)
… …
1299 uint8_t ext, cmd; 1304 uint8_t ext, cmd;
1300 1305
1301 do 1306 do
1302 { 1307 {
1303 ext = *data++; 1308 ext = *data++;
1304 cmd = ext & 0x7f; 1309 cmd = ext & 0x3f;
1305 1310
1306 if (ext < 4) 1311 if (cmd < 4)
1307 cell->darkness = 255 - ext * 64 + 1; 1312 cell->darkness = 255 - ext * 64 + 1;
1308 else if (ext == 5) // health 1313 else if (cmd == 5) // health
1314 {
1315 cell->stat_width = 1;
1309 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++;
1329 else if (ext & 0x40) // unknown, multibyte => skip
1330 data += *data + 1;
1331 else
1332 data++;
1310 } 1333 }
1311 while (cmd & 0x80); 1334 while (ext & 0x80);
1312 } 1335 }
1313 else 1336 else
1314 cell->darkness = *data++ + 1; 1337 cell->darkness = *data++ + 1;
1338
1315 } 1339 }
1316 1340
1317 if (flags & 4) 1341 if (flags & 4)
1318 { 1342 {
1319 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1343 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
… …
1438 { 1462 {
1439 mapcell *cell = row->col + (x + vx - row->c0); 1463 mapcell *cell = row->col + (x + vx - row->c0);
1440 1464
1441 face = cell->face [z]; 1465 face = cell->face [z];
1442 1466
1443 if (face) 1467 if (face && face < self->texs)
1444 { 1468 {
1445 maptex tex = self->tex [face]; 1469 maptex tex = self->tex [face];
1446
1447 int px = (x + 1) * 32 - tex.w; 1470 int px = (x + 1) * 32 - tex.w;
1448 int py = (y + 1) * 32 - tex.h; 1471 int py = (y + 1) * 32 - tex.h;
1449 1472
1450 if (last_name != tex.name) 1473 if (last_name != tex.name)
1451 { 1474 {
1452 glEnd (); 1475 glEnd ();
1453 last_name = tex.name;
1454 glBindTexture (GL_TEXTURE_2D, last_name); 1476 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1455 glBegin (GL_QUADS); 1477 glBegin (GL_QUADS);
1456 } 1478 }
1457 1479
1458 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1480 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1459 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1481 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1460 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1482 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1461 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1483 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1462 } 1484 }
1485
1486 if (cell->flags && z == 2)
1487 {
1488 if (cell->flags & 1)
1489 {
1490 maptex tex = self->tex [1];
1491 int px = (x + 1) * 32 - tex.w + 2;
1492 int py = (y + 1) * 32 - tex.h - 6;
1493
1494 glEnd ();
1495 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1496 glBegin (GL_QUADS);
1497
1498 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1499 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1500 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1501 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1502 }
1503 }
1463 } 1504 }
1464 } 1505 }
1465 1506
1466 glEnd (); 1507 glEnd ();
1467 1508
1468 glDisable (GL_TEXTURE_2D); 1509 glDisable (GL_TEXTURE_2D);
1469 glDisable (GL_BLEND); 1510 glDisable (GL_BLEND);
1511
1512 // top layer: overlays such as the health bar
1513 for (y = 0; y < sh; y++)
1514 if (0 <= y + vy && y + vy < self->rows)
1515 {
1516 maprow *row = self->row + (y + vy);
1517
1518 for (x = 0; x < sw; x++)
1519 if (row->c0 <= x + vx && x + vx < row->c1)
1520 {
1521 mapcell *cell = row->col + (x + vx - row->c0);
1522
1523 int px = x * 32;
1524 int py = y * 32;
1525
1526 if (cell->stat_hp)
1527 {
1528 int width = cell->stat_width * 32;
1529 int thick = sh / 28 + 1 + cell->stat_width;
1530
1531 glColor3ub (0, 0, 0);
1532 glRectf (px + 1, py - thick - 2,
1533 px + width - 1, py);
1534
1535 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1536 glRectf (px + 2,
1537 py - thick - 1,
1538 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1539 }
1540 }
1541 }
1470} 1542}
1471 1543
1472void 1544void
1473draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1545draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1474 CODE: 1546 CODE:
… …
1555 if (row->c0 <= x + vx && x + vx < row->c1) 1627 if (row->c0 <= x + vx && x + vx < row->c1)
1556 { 1628 {
1557 mapcell *cell = row->col + (x + vx - row->c0); 1629 mapcell *cell = row->col + (x + vx - row->c0);
1558 1630
1559 darkness[y * sw4 + x] = cell->darkness 1631 darkness[y * sw4 + x] = cell->darkness
1560 ? 255 - cell->darkness + 1 1632 ? 255 - (cell->darkness - 1)
1561 : 255 - FOW_DARKNESS; 1633 : 255 - FOW_DARKNESS;
1562 } 1634 }
1563 } 1635 }
1564 1636
1565 EXTEND (SP, 3); 1637 EXTEND (SP, 3);
… …
1681 1753
1682 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1754 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1683 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1755 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1684 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1756 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1685 1757
1686 if (cell->darkness <= 1) 1758 if (cell->darkness == 0)
1687 { 1759 {
1688 cell->darkness = 0; 1760 cell->darkness = 0;
1689 1761
1690 for (z = 0; z <= 2; z++) 1762 for (z = 0; z <= 2; z++)
1691 { 1763 {

Diff Legend

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