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.138 by root, Mon Aug 14 01:21:01 2006 UTC vs.
Revision 1.142 by root, Fri Aug 18 01:27:15 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;
1283 } 1291 }
1284 1292
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1293 //TODO: don't trust server data to be in-range(!)
1294
1295 if (flags & 8)
1296 {
1297 if (extmap)
1298 {
1299 uint8_t ext, cmd;
1300
1301 do
1302 {
1303 ext = *data++;
1304 cmd = ext & 0x7f;
1305
1306 if (ext < 4)
1307 cell->darkness = 255 - ext * 64 + 1;
1308 else if (ext == 5) // health
1309 cell->stat_hp = *data++;
1310 }
1311 while (cmd & 0x80);
1312 }
1313 else
1314 cell->darkness = *data++ + 1;
1315 }
1288 1316
1289 if (flags & 4) 1317 if (flags & 4)
1290 { 1318 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1319 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1292 } 1320 }
… …
1300 { 1328 {
1301 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1329 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1302 } 1330 }
1303 } 1331 }
1304 else 1332 else
1305 cell->darkness = -1; 1333 cell->darkness = 0;
1306 } 1334 }
1307} 1335}
1308 1336
1309SV * 1337SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1338mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1526 for (x = 0; x < sw; x++) 1554 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 1555 if (row->c0 <= x + vx && x + vx < row->c1)
1528 { 1556 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 1557 mapcell *cell = row->col + (x + vx - row->c0);
1530 1558
1531 darkness[y * sw4 + x] = cell->darkness < 0 1559 darkness[y * sw4 + x] = cell->darkness
1560 ? 255 - cell->darkness + 1
1532 ? 255 - FOW_DARKNESS 1561 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 1562 }
1535 } 1563 }
1536 1564
1537 EXTEND (SP, 3); 1565 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 1566 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1653 1681
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1682 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1683 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1684 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1657 1685
1658 if (cell->darkness <= 0) 1686 if (cell->darkness <= 1)
1659 { 1687 {
1660 cell->darkness = -1; 1688 cell->darkness = 0;
1661 1689
1662 for (z = 0; z <= 2; z++) 1690 for (z = 0; z <= 2; z++)
1663 { 1691 {
1664 cell->face[z] = face[z]; 1692 cell->face[z] = face[z];
1665 1693

Diff Legend

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