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.139 by root, Mon Aug 14 03:04:17 2006 UTC vs.
Revision 1.156 by root, Thu Sep 21 14:47:51 2006 UTC

… …
155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE; 155 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
156 156
157 if (!rect.width) rect.width = 1; 157 if (!rect.width) rect.width = 1;
158 if (!rect.height) rect.height = 1; 158 if (!rect.height) rect.height = 1;
159 159
160 rect.width = (rect.width + 3) & ~3;
161
162 *w = rect.width; 160 *w = rect.width;
163 *h = rect.height; 161 *h = rect.height;
164} 162}
165 163
166typedef uint16_t mapface; 164typedef uint16_t mapface;
… …
171 float s, t; 169 float s, t;
172 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
173} maptex; 171} maptex;
174 172
175typedef struct { 173typedef struct {
176 int16_t darkness; 174 uint32_t player;
177 mapface face[3]; 175 mapface face[3];
176 uint16_t darkness;
177 uint8_t stat_width, stat_hp, flags;
178} mapcell; 178} mapcell;
179 179
180typedef struct { 180typedef struct {
181 int32_t c0, c1; 181 int32_t c0, c1;
182 mapcell *col; 182 mapcell *col;
… …
295static void 295static void
296map_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)
297{ 297{
298 int x, y; 298 int x, y;
299 maprow *row; 299 maprow *row;
300 mapcell *cell;
300 301
301 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
302 if (y >= 0) 303 if (y >= 0)
303 { 304 {
304 if (y >= self->rows) 305 if (y >= self->rows)
… …
310 if (x >= row->c0) 311 if (x >= row->c0)
311 { 312 {
312 if (x >= row->c1) 313 if (x >= row->c1)
313 break; 314 break;
314 315
315 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;
316 } 322 }
317 } 323 }
318} 324}
319 325
320static void 326static void
… …
1240void 1246void
1241scroll (CFPlus::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1242 CODE: 1248 CODE:
1243{ 1249{
1244 if (dx > 0) 1250 if (dx > 0)
1245 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1246 else if (dx < 0) 1252 else if (dx < 0)
1247 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);
1248 1254
1249 if (dy > 0) 1255 if (dy > 0)
1250 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1251 else if (dy < 0) 1257 else if (dy < 0)
1252 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);
1253 1259
1254 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1255 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1256 1262
1257 while (self->y < 0) 1263 while (self->y < 0)
… …
1262 self->y += MAP_EXTEND_Y; 1268 self->y += MAP_EXTEND_Y;
1263 } 1269 }
1264} 1270}
1265 1271
1266void 1272void
1267map1a_update (CFPlus::Map self, SV *data_) 1273map1a_update (CFPlus::Map self, SV *data_, int extmap)
1268 CODE: 1274 CODE:
1269{ 1275{
1270 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1271 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1272 mapcell *cell; 1278 mapcell *cell;
1273 int x, y, flags; 1279 int x, y, flags;
1274 1280
1275 while (data < data_end) 1281 while (data < data_end - 1)
1276 { 1282 {
1277 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1278 1284
1279 x = self->x + ((flags >> 10) & 63); 1285 x = self->x + ((flags >> 10) & 63);
1280 y = self->y + ((flags >> 4) & 63); 1286 y = self->y + ((flags >> 4) & 63);
1281 1287
1282 cell = map_get_cell (self, x, y); 1288 cell = map_get_cell (self, x, y);
1283 1289
1284 if (flags & 15) 1290 if (flags & 15)
1285 { 1291 {
1286 if (cell->darkness < 0) 1292 if (!cell->darkness)
1287 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1288 cell->darkness = 0; 1295 cell->darkness = 256;
1289 cell->face [0] = 0;
1290 cell->face [1] = 0;
1291 cell->face [2] = 0;
1292 } 1296 }
1293 1297
1294 cell->darkness = flags & 8 ? *data++ : 255;
1295
1296 //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 }
1297 1339
1298 if (flags & 4) 1340 if (flags & 4)
1299 { 1341 {
1300 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;
1301 } 1343 }
… …
1309 { 1351 {
1310 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;
1311 } 1353 }
1312 } 1354 }
1313 else 1355 else
1314 cell->darkness = -1; 1356 cell->darkness = 0;
1315 } 1357 }
1316} 1358}
1317 1359
1318SV * 1360SV *
1319mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1361mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1419 { 1461 {
1420 mapcell *cell = row->col + (x + vx - row->c0); 1462 mapcell *cell = row->col + (x + vx - row->c0);
1421 1463
1422 face = cell->face [z]; 1464 face = cell->face [z];
1423 1465
1424 if (face) 1466 if (face && face < self->texs)
1425 { 1467 {
1426 maptex tex = self->tex [face]; 1468 maptex tex = self->tex [face];
1427
1428 int px = (x + 1) * 32 - tex.w; 1469 int px = (x + 1) * 32 - tex.w;
1429 int py = (y + 1) * 32 - tex.h; 1470 int py = (y + 1) * 32 - tex.h;
1430 1471
1431 if (last_name != tex.name) 1472 if (last_name != tex.name)
1432 { 1473 {
1433 glEnd (); 1474 glEnd ();
1434 last_name = tex.name;
1435 glBindTexture (GL_TEXTURE_2D, last_name); 1475 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1436 glBegin (GL_QUADS); 1476 glBegin (GL_QUADS);
1437 } 1477 }
1438 1478
1439 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1479 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1440 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1480 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1441 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);
1442 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1482 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1443 } 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 }
1444 } 1503 }
1445 } 1504 }
1446 1505
1447 glEnd (); 1506 glEnd ();
1448 1507
1449 glDisable (GL_TEXTURE_2D); 1508 glDisable (GL_TEXTURE_2D);
1450 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 }
1451} 1541}
1452 1542
1453void 1543void
1454draw_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)
1455 CODE: 1545 CODE:
… …
1535 for (x = 0; x < sw; x++) 1625 for (x = 0; x < sw; x++)
1536 if (row->c0 <= x + vx && x + vx < row->c1) 1626 if (row->c0 <= x + vx && x + vx < row->c1)
1537 { 1627 {
1538 mapcell *cell = row->col + (x + vx - row->c0); 1628 mapcell *cell = row->col + (x + vx - row->c0);
1539 1629
1540 darkness[y * sw4 + x] = cell->darkness < 0 1630 darkness[y * sw4 + x] = cell->darkness
1631 ? 255 - (cell->darkness - 1)
1541 ? 255 - FOW_DARKNESS 1632 : 255 - FOW_DARKNESS;
1542 : 255 - cell->darkness;
1543 } 1633 }
1544 } 1634 }
1545 1635
1546 EXTEND (SP, 3); 1636 EXTEND (SP, 3);
1547 PUSHs (sv_2mortal (newSViv (sw4))); 1637 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1662 1752
1663 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1753 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1664 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1754 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1665 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1755 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1666 1756
1667 if (cell->darkness <= 0) 1757 if (cell->darkness == 0)
1668 { 1758 {
1669 cell->darkness = -1; 1759 cell->darkness = 0;
1670 1760
1671 for (z = 0; z <= 2; z++) 1761 for (z = 0; z <= 2; z++)
1672 { 1762 {
1673 cell->face[z] = face[z]; 1763 cell->face[z] = face[z];
1674 1764

Diff Legend

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