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.156 by root, Thu Sep 21 14:47:51 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 uint32_t player;
168 mapface face[3]; 175 mapface face[3];
176 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags;
169} mapcell; 178} mapcell;
170 179
171typedef struct { 180typedef struct {
172 int32_t c0, c1; 181 int32_t c0, c1;
173 mapcell *col; 182 mapcell *col;
… …
286static void 295static void
287map_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)
288{ 297{
289 int x, y; 298 int x, y;
290 maprow *row; 299 maprow *row;
300 mapcell *cell;
291 301
292 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 303 if (y >= 0)
294 { 304 {
295 if (y >= self->rows) 305 if (y >= self->rows)
… …
301 if (x >= row->c0) 311 if (x >= row->c0)
302 { 312 {
303 if (x >= row->c1) 313 if (x >= row->c1)
304 break; 314 break;
305 315
306 row->col[x - row->c0].darkness = -1; 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;
307 } 322 }
308 } 323 }
309} 324}
310 325
311static void 326static void
… …
1231void 1246void
1232scroll (CFPlus::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1233 CODE: 1248 CODE:
1234{ 1249{
1235 if (dx > 0) 1250 if (dx > 0)
1236 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1237 else if (dx < 0) 1252 else if (dx < 0)
1238 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);
1239 1254
1240 if (dy > 0) 1255 if (dy > 0)
1241 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1242 else if (dy < 0) 1257 else if (dy < 0)
1243 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);
1244 1259
1245 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1246 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1247 1262
1248 while (self->y < 0) 1263 while (self->y < 0)
… …
1253 self->y += MAP_EXTEND_Y; 1268 self->y += MAP_EXTEND_Y;
1254 } 1269 }
1255} 1270}
1256 1271
1257void 1272void
1258map1a_update (CFPlus::Map self, SV *data_) 1273map1a_update (CFPlus::Map self, SV *data_, int extmap)
1259 CODE: 1274 CODE:
1260{ 1275{
1261 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1262 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1263 mapcell *cell; 1278 mapcell *cell;
1264 int x, y, flags; 1279 int x, y, flags;
1265 1280
1266 while (data < data_end) 1281 while (data < data_end - 1)
1267 { 1282 {
1268 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1269 1284
1270 x = self->x + ((flags >> 10) & 63); 1285 x = self->x + ((flags >> 10) & 63);
1271 y = self->y + ((flags >> 4) & 63); 1286 y = self->y + ((flags >> 4) & 63);
1272 1287
1273 cell = map_get_cell (self, x, y); 1288 cell = map_get_cell (self, x, y);
1274 1289
1275 if (flags & 15) 1290 if (flags & 15)
1276 { 1291 {
1277 if (cell->darkness < 0) 1292 if (!cell->darkness)
1278 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1279 cell->darkness = 0; 1295 cell->darkness = 256;
1280 cell->face [0] = 0;
1281 cell->face [1] = 0;
1282 cell->face [2] = 0;
1283 } 1296 }
1284 1297
1285 cell->darkness = flags & 8 ? *data++ : 255;
1286
1287 //TODO: don't trust server data to be in-range(!) 1298 //TODO: don't trust server data to be in-range(!)
1299
1300 if (flags & 8)
1301 {
1302 if (extmap)
1303 {
1304 uint8_t ext, cmd;
1305
1306 do
1307 {
1308 ext = *data++;
1309 cmd = ext & 0x3f;
1310
1311 if (cmd < 4)
1312 cell->darkness = 255 - ext * 64 + 1;
1313 else if (cmd == 5) // health
1314 {
1315 cell->stat_width = 1;
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++;
1333 }
1334 while (ext & 0x80);
1335 }
1336 else
1337 cell->darkness = *data++ + 1;
1338 }
1288 1339
1289 if (flags & 4) 1340 if (flags & 4)
1290 { 1341 {
1291 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1342 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1292 } 1343 }
… …
1300 { 1351 {
1301 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1352 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1302 } 1353 }
1303 } 1354 }
1304 else 1355 else
1305 cell->darkness = -1; 1356 cell->darkness = 0;
1306 } 1357 }
1307} 1358}
1308 1359
1309SV * 1360SV *
1310mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1361mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1410 { 1461 {
1411 mapcell *cell = row->col + (x + vx - row->c0); 1462 mapcell *cell = row->col + (x + vx - row->c0);
1412 1463
1413 face = cell->face [z]; 1464 face = cell->face [z];
1414 1465
1415 if (face) 1466 if (face && face < self->texs)
1416 { 1467 {
1417 maptex tex = self->tex [face]; 1468 maptex tex = self->tex [face];
1418
1419 int px = (x + 1) * 32 - tex.w; 1469 int px = (x + 1) * 32 - tex.w;
1420 int py = (y + 1) * 32 - tex.h; 1470 int py = (y + 1) * 32 - tex.h;
1421 1471
1422 if (last_name != tex.name) 1472 if (last_name != tex.name)
1423 { 1473 {
1424 glEnd (); 1474 glEnd ();
1425 last_name = tex.name;
1426 glBindTexture (GL_TEXTURE_2D, last_name); 1475 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1427 glBegin (GL_QUADS); 1476 glBegin (GL_QUADS);
1428 } 1477 }
1429 1478
1430 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1479 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1431 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1480 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1432 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1481 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1433 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1482 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1434 } 1483 }
1484
1485 if (cell->flags && z == 2)
1486 {
1487 if (cell->flags & 1)
1488 {
1489 maptex tex = self->tex [1];
1490 int px = (x + 1) * 32 - tex.w + 2;
1491 int py = (y + 1) * 32 - tex.h - 6;
1492
1493 glEnd ();
1494 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1495 glBegin (GL_QUADS);
1496
1497 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1498 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1499 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1500 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1501 }
1502 }
1435 } 1503 }
1436 } 1504 }
1437 1505
1438 glEnd (); 1506 glEnd ();
1439 1507
1440 glDisable (GL_TEXTURE_2D); 1508 glDisable (GL_TEXTURE_2D);
1441 glDisable (GL_BLEND); 1509 glDisable (GL_BLEND);
1510
1511 // top layer: overlays such as the health bar
1512 for (y = 0; y < sh; y++)
1513 if (0 <= y + vy && y + vy < self->rows)
1514 {
1515 maprow *row = self->row + (y + vy);
1516
1517 for (x = 0; x < sw; x++)
1518 if (row->c0 <= x + vx && x + vx < row->c1)
1519 {
1520 mapcell *cell = row->col + (x + vx - row->c0);
1521
1522 int px = x * 32;
1523 int py = y * 32;
1524
1525 if (cell->stat_hp)
1526 {
1527 int width = cell->stat_width * 32;
1528 int thick = sh / 28 + 1 + cell->stat_width;
1529
1530 glColor3ub (0, 0, 0);
1531 glRectf (px + 1, py - thick - 2,
1532 px + width - 1, py);
1533
1534 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1535 glRectf (px + 2,
1536 py - thick - 1,
1537 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1538 }
1539 }
1540 }
1442} 1541}
1443 1542
1444void 1543void
1445draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1544draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1446 CODE: 1545 CODE:
… …
1526 for (x = 0; x < sw; x++) 1625 for (x = 0; x < sw; x++)
1527 if (row->c0 <= x + vx && x + vx < row->c1) 1626 if (row->c0 <= x + vx && x + vx < row->c1)
1528 { 1627 {
1529 mapcell *cell = row->col + (x + vx - row->c0); 1628 mapcell *cell = row->col + (x + vx - row->c0);
1530 1629
1531 darkness[y * sw4 + x] = cell->darkness < 0 1630 darkness[y * sw4 + x] = cell->darkness
1631 ? 255 - (cell->darkness - 1)
1532 ? 255 - FOW_DARKNESS 1632 : 255 - FOW_DARKNESS;
1533 : 255 - cell->darkness;
1534 } 1633 }
1535 } 1634 }
1536 1635
1537 EXTEND (SP, 3); 1636 EXTEND (SP, 3);
1538 PUSHs (sv_2mortal (newSViv (sw4))); 1637 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1653 1752
1654 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1753 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1655 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1754 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1656 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1755 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1657 1756
1658 if (cell->darkness <= 0) 1757 if (cell->darkness == 0)
1659 { 1758 {
1660 cell->darkness = -1; 1759 cell->darkness = 0;
1661 1760
1662 for (z = 0; z <= 2; z++) 1761 for (z = 0; z <= 2; z++)
1663 { 1762 {
1664 cell->face[z] = face[z]; 1763 cell->face[z] = face[z];
1665 1764
… …
1803 const_iv (GL_SEPARABLE_2D), 1902 const_iv (GL_SEPARABLE_2D),
1804 const_iv (GL_CONVOLUTION_2D), 1903 const_iv (GL_CONVOLUTION_2D),
1805 const_iv (GL_CONVOLUTION_BORDER_MODE), 1904 const_iv (GL_CONVOLUTION_BORDER_MODE),
1806 const_iv (GL_CONSTANT_BORDER), 1905 const_iv (GL_CONSTANT_BORDER),
1807 const_iv (GL_LINES), 1906 const_iv (GL_LINES),
1907 const_iv (GL_LINE_STRIP),
1808 const_iv (GL_LINE_LOOP), 1908 const_iv (GL_LINE_LOOP),
1809 const_iv (GL_QUADS), 1909 const_iv (GL_QUADS),
1810 const_iv (GL_QUAD_STRIP), 1910 const_iv (GL_QUAD_STRIP),
1811 const_iv (GL_TRIANGLES), 1911 const_iv (GL_TRIANGLES),
1812 const_iv (GL_TRIANGLE_STRIP), 1912 const_iv (GL_TRIANGLE_STRIP),
… …
2009 2109
2010void glEndList () 2110void glEndList ()
2011 2111
2012void glCallList (int list) 2112void glCallList (int list)
2013 2113
2014

Diff Legend

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