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.135 by root, Sun Aug 13 15:14:17 2006 UTC vs.
Revision 1.145 by root, Fri Aug 18 03:19:58 2006 UTC

… …
144} 144}
145 145
146static void 146static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 148{
149 PangoRectangle rect;
150
151 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 152 pango_layout_get_extents (self->pl, 0, &rect);
150 153
151 if (!*w) *w = 1; 154 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 156
154 *w = (*w + 3) & ~3; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1;
159
160 *w = rect.width;
161 *h = rect.height;
155} 162}
156 163
157typedef uint16_t mapface; 164typedef uint16_t mapface;
158 165
159typedef struct { 166typedef struct {
… …
162 float s, t; 169 float s, t;
163 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
164} maptex; 171} maptex;
165 172
166typedef struct { 173typedef struct {
167 int16_t darkness; 174 uint16_t darkness;
168 mapface face[3]; 175 mapface face[3];
176 uint8_t stat_hp;
169} mapcell; 177} mapcell;
170 178
171typedef struct { 179typedef struct {
172 int32_t c0, c1; 180 int32_t c0, c1;
173 mapcell *col; 181 mapcell *col;
… …
301 if (x >= row->c0) 309 if (x >= row->c0)
302 { 310 {
303 if (x >= row->c1) 311 if (x >= row->c1)
304 break; 312 break;
305 313
306 row->col[x - row->c0].darkness = -1; 314 row->col[x - row->c0].darkness = 0;
307 } 315 }
308 } 316 }
309} 317}
310 318
311static void 319static void
… …
1253 self->y += MAP_EXTEND_Y; 1261 self->y += MAP_EXTEND_Y;
1254 } 1262 }
1255} 1263}
1256 1264
1257void 1265void
1258map1a_update (CFPlus::Map self, SV *data_) 1266map1a_update (CFPlus::Map self, SV *data_, int extmap)
1259 CODE: 1267 CODE:
1260{ 1268{
1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1262 uint8_t *data_end = (uint8_t *)SvEND (data_); 1270 uint8_t *data_end = (uint8_t *)SvEND (data_);
1263 mapcell *cell; 1271 mapcell *cell;
… …
1272 1280
1273 cell = map_get_cell (self, x, y); 1281 cell = map_get_cell (self, x, y);
1274 1282
1275 if (flags & 15) 1283 if (flags & 15)
1276 { 1284 {
1277 if (cell->darkness < 0) 1285 if (!cell->darkness)
1278 { 1286 {
1279 cell->darkness = 0; 1287 cell->darkness = 256;
1280 cell->face [0] = 0; 1288 cell->face [0] = 0;
1281 cell->face [1] = 0; 1289 cell->face [1] = 0;
1282 cell->face [2] = 0; 1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1283 } 1292 }
1284 1293
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1294 //TODO: don't trust server data to be in-range(!)
1295
1296 if (flags & 8)
1297 {
1298 if (extmap)
1299 {
1300 uint8_t ext, cmd;
1301
1302 do
1303 {
1304 ext = *data++;
1305 cmd = ext & 0x3f;
1306
1307 if (ext < 4)
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;
1313 }
1314 while (cmd & 0x80);
1315 }
1316 else
1317 cell->darkness = *data++ + 1;
1318 }
1288 1319
1289 if (flags & 4) 1320 if (flags & 4)
1290 { 1321 {
1291 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;
1292 } 1323 }
… …
1300 { 1331 {
1301 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;
1302 } 1333 }
1303 } 1334 }
1304 else 1335 else
1305 cell->darkness = -1; 1336 cell->darkness = 0;
1306 } 1337 }
1307} 1338}
1308 1339
1309SV * 1340SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1341mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1410 { 1441 {
1411 mapcell *cell = row->col + (x + vx - row->c0); 1442 mapcell *cell = row->col + (x + vx - row->c0);
1412 1443
1413 face = cell->face [z]; 1444 face = cell->face [z];
1414 1445
1415 if (face) 1446 if (face && face < self->texs)
1416 { 1447 {
1417 maptex tex = self->tex [face]; 1448 maptex tex = self->tex [face];
1418 1449
1419 int px = (x + 1) * 32 - tex.w; 1450 int px = (x + 1) * 32 - tex.w;
1420 int py = (y + 1) * 32 - tex.h; 1451 int py = (y + 1) * 32 - tex.h;
… …
1437 1468
1438 glEnd (); 1469 glEnd ();
1439 1470
1440 glDisable (GL_TEXTURE_2D); 1471 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1472 glDisable (GL_BLEND);
1473
1474 // top layer: overlays such as the health bar
1475 for (y = 0; y < sh; y++)
1476 if (0 <= y + vy && y + vy < self->rows)
1477 {
1478 maprow *row = self->row + (y + vy);
1479
1480 for (x = 0; x < sw; x++)
1481 if (row->c0 <= x + vx && x + vx < row->c1)
1482 {
1483 mapcell *cell = row->col + (x + vx - row->c0);
1484
1485 int px = x * 32;
1486 int py = y * 32;
1487
1488 if (cell->stat_hp)
1489 {
1490 int width = sh / 28 + 1;
1491
1492 glColor3ub (0, 0, 0);
1493 glRectf (px + 1, py, px + 31, py + width + 2);
1494
1495 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1496 glRectf (px + 2, py + 1, px + 30 - cell->stat_hp * 28 / 255, py + width + 1);
1497 }
1498 }
1499 }
1442} 1500}
1443 1501
1444void 1502void
1445draw_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)
1446 CODE: 1504 CODE:
… …
1526 for (x = 0; x < sw; x++) 1584 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 1585 if (row->c0 <= x + vx && x + vx < row->c1)
1528 { 1586 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 1587 mapcell *cell = row->col + (x + vx - row->c0);
1530 1588
1531 darkness[y * sw4 + x] = cell->darkness < 0 1589 darkness[y * sw4 + x] = cell->darkness
1590 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 1591 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 1592 }
1535 } 1593 }
1536 1594
1537 EXTEND (SP, 3); 1595 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 1596 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1653 1711
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1712 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1713 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1714 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1657 1715
1658 if (cell->darkness <= 0) 1716 if (cell->darkness == 0)
1659 { 1717 {
1660 cell->darkness = -1; 1718 cell->darkness = 0;
1661 1719
1662 for (z = 0; z <= 2; z++) 1720 for (z = 0; z <= 2; z++)
1663 { 1721 {
1664 cell->face[z] = face[z]; 1722 cell->face[z] = face[z];
1665 1723
… …
1803 const_iv (GL_SEPARABLE_2D), 1861 const_iv (GL_SEPARABLE_2D),
1804 const_iv (GL_CONVOLUTION_2D), 1862 const_iv (GL_CONVOLUTION_2D),
1805 const_iv (GL_CONVOLUTION_BORDER_MODE), 1863 const_iv (GL_CONVOLUTION_BORDER_MODE),
1806 const_iv (GL_CONSTANT_BORDER), 1864 const_iv (GL_CONSTANT_BORDER),
1807 const_iv (GL_LINES), 1865 const_iv (GL_LINES),
1866 const_iv (GL_LINE_STRIP),
1808 const_iv (GL_LINE_LOOP), 1867 const_iv (GL_LINE_LOOP),
1809 const_iv (GL_QUADS), 1868 const_iv (GL_QUADS),
1810 const_iv (GL_QUAD_STRIP), 1869 const_iv (GL_QUAD_STRIP),
1811 const_iv (GL_TRIANGLES), 1870 const_iv (GL_TRIANGLES),
1812 const_iv (GL_TRIANGLE_STRIP), 1871 const_iv (GL_TRIANGLE_STRIP),
… …
2009 2068
2010void glEndList () 2069void glEndList ()
2011 2070
2012void glCallList (int list) 2071void glCallList (int list)
2013 2072
2014

Diff Legend

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