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.143 by root, Fri Aug 18 02:23:39 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 & 0x7f;
1306
1307 if (ext < 4)
1308 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health
1310 cell->stat_hp = *data++;
1311 }
1312 while (cmd & 0x80);
1313 }
1314 else
1315 cell->darkness = *data++ + 1;
1316 }
1288 1317
1289 if (flags & 4) 1318 if (flags & 4)
1290 { 1319 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1320 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1292 } 1321 }
… …
1300 { 1329 {
1301 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1330 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1302 } 1331 }
1303 } 1332 }
1304 else 1333 else
1305 cell->darkness = -1; 1334 cell->darkness = 0;
1306 } 1335 }
1307} 1336}
1308 1337
1309SV * 1338SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1339mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1437 1466
1438 glEnd (); 1467 glEnd ();
1439 1468
1440 glDisable (GL_TEXTURE_2D); 1469 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1470 glDisable (GL_BLEND);
1471
1472 for (y = 0; y < sh; y++)
1473 if (0 <= y + vy && y + vy < self->rows)
1474 {
1475 maprow *row = self->row + (y + vy);
1476
1477 for (x = 0; x < sw; x++)
1478 if (row->c0 <= x + vx && x + vx < row->c1)
1479 {
1480 mapcell *cell = row->col + (x + vx - row->c0);
1481
1482 int px = x * 32;
1483 int py = y * 32;
1484
1485 if (cell->stat_hp)
1486 {
1487 glColor3ub (0, 0, 0);
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);
1493 glVertex2f (px + 29.f - cell->stat_hp * (28.f / 255.f), py + 2.5f);
1494 glEnd ();
1495 }
1496 }
1497 }
1442} 1498}
1443 1499
1444void 1500void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1501draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE: 1502 CODE:
… …
1526 for (x = 0; x < sw; x++) 1582 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 1583 if (row->c0 <= x + vx && x + vx < row->c1)
1528 { 1584 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 1585 mapcell *cell = row->col + (x + vx - row->c0);
1530 1586
1531 darkness[y * sw4 + x] = cell->darkness < 0 1587 darkness[y * sw4 + x] = cell->darkness
1588 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 1589 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 1590 }
1535 } 1591 }
1536 1592
1537 EXTEND (SP, 3); 1593 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 1594 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1653 1709
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1710 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1711 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1712 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1657 1713
1658 if (cell->darkness <= 0) 1714 if (cell->darkness == 0)
1659 { 1715 {
1660 cell->darkness = -1; 1716 cell->darkness = 0;
1661 1717
1662 for (z = 0; z <= 2; z++) 1718 for (z = 0; z <= 2; z++)
1663 { 1719 {
1664 cell->face[z] = face[z]; 1720 cell->face[z] = face[z];
1665 1721
… …
1803 const_iv (GL_SEPARABLE_2D), 1859 const_iv (GL_SEPARABLE_2D),
1804 const_iv (GL_CONVOLUTION_2D), 1860 const_iv (GL_CONVOLUTION_2D),
1805 const_iv (GL_CONVOLUTION_BORDER_MODE), 1861 const_iv (GL_CONVOLUTION_BORDER_MODE),
1806 const_iv (GL_CONSTANT_BORDER), 1862 const_iv (GL_CONSTANT_BORDER),
1807 const_iv (GL_LINES), 1863 const_iv (GL_LINES),
1864 const_iv (GL_LINE_STRIP),
1808 const_iv (GL_LINE_LOOP), 1865 const_iv (GL_LINE_LOOP),
1809 const_iv (GL_QUADS), 1866 const_iv (GL_QUADS),
1810 const_iv (GL_QUAD_STRIP), 1867 const_iv (GL_QUAD_STRIP),
1811 const_iv (GL_TRIANGLES), 1868 const_iv (GL_TRIANGLES),
1812 const_iv (GL_TRIANGLE_STRIP), 1869 const_iv (GL_TRIANGLE_STRIP),
… …
2009 2066
2010void glEndList () 2067void glEndList ()
2011 2068
2012void glCallList (int list) 2069void glCallList (int list)
2013 2070
2014

Diff Legend

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