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.145 by root, Fri Aug 18 03:19:58 2006 UTC vs.
Revision 1.154 by root, Tue Sep 19 22:23:30 2006 UTC

… …
169 float s, t; 169 float s, t;
170 uint8_t r, g, b, a; 170 uint8_t r, g, b, a;
171} maptex; 171} maptex;
172 172
173typedef struct { 173typedef struct {
174 uint32_t player;
175 mapface face[3];
174 uint16_t darkness; 176 uint16_t darkness;
175 mapface face[3]; 177 uint8_t stat_width, stat_hp, flags;
176 uint8_t stat_hp;
177} mapcell; 178} mapcell;
178 179
179typedef struct { 180typedef struct {
180 int32_t c0, c1; 181 int32_t c0, c1;
181 mapcell *col; 182 mapcell *col;
… …
294static void 295static void
295map_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)
296{ 297{
297 int x, y; 298 int x, y;
298 maprow *row; 299 maprow *row;
300 mapcell *cell;
299 301
300 for (y = y0; y < y0 + h; y++) 302 for (y = y0; y < y0 + h; y++)
301 if (y >= 0) 303 if (y >= 0)
302 { 304 {
303 if (y >= self->rows) 305 if (y >= self->rows)
… …
309 if (x >= row->c0) 311 if (x >= row->c0)
310 { 312 {
311 if (x >= row->c1) 313 if (x >= row->c1)
312 break; 314 break;
313 315
314 row->col[x - row->c0].darkness = 0; 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;
315 } 322 }
316 } 323 }
317} 324}
318 325
319static void 326static void
… …
1239void 1246void
1240scroll (CFPlus::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1241 CODE: 1248 CODE:
1242{ 1249{
1243 if (dx > 0) 1250 if (dx > 0)
1244 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1245 else if (dx < 0) 1252 else if (dx < 0)
1246 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);
1247 1254
1248 if (dy > 0) 1255 if (dy > 0)
1249 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1250 else if (dy < 0) 1257 else if (dy < 0)
1251 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);
1252 1259
1253 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1254 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1255 1262
1256 while (self->y < 0) 1263 while (self->y < 0)
… …
1269 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1276 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1270 uint8_t *data_end = (uint8_t *)SvEND (data_); 1277 uint8_t *data_end = (uint8_t *)SvEND (data_);
1271 mapcell *cell; 1278 mapcell *cell;
1272 int x, y, flags; 1279 int x, y, flags;
1273 1280
1274 while (data < data_end) 1281 while (data < data_end - 1)
1275 { 1282 {
1276 flags = (data [0] << 8) + data [1]; data += 2; 1283 flags = (data [0] << 8) + data [1]; data += 2;
1277 1284
1278 x = self->x + ((flags >> 10) & 63); 1285 x = self->x + ((flags >> 10) & 63);
1279 y = self->y + ((flags >> 4) & 63); 1286 y = self->y + ((flags >> 4) & 63);
… …
1282 1289
1283 if (flags & 15) 1290 if (flags & 15)
1284 { 1291 {
1285 if (!cell->darkness) 1292 if (!cell->darkness)
1286 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1287 cell->darkness = 256; 1295 cell->darkness = 256;
1288 cell->face [0] = 0;
1289 cell->face [1] = 0;
1290 cell->face [2] = 0;
1291 cell->stat_hp = 0;
1292 } 1296 }
1293 1297
1294 //TODO: don't trust server data to be in-range(!) 1298 //TODO: don't trust server data to be in-range(!)
1295 1299
1296 if (flags & 8) 1300 if (flags & 8)
… …
1302 do 1306 do
1303 { 1307 {
1304 ext = *data++; 1308 ext = *data++;
1305 cmd = ext & 0x3f; 1309 cmd = ext & 0x3f;
1306 1310
1307 if (ext < 4) 1311 if (cmd < 4)
1308 cell->darkness = 255 - ext * 64 + 1; 1312 cell->darkness = 255 - ext * 64 + 1;
1309 else if (ext == 5) // health 1313 else if (cmd == 5) // health
1314 {
1315 cell->stat_width = 1;
1310 cell->stat_hp = *data++; 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++;
1311 else if (ext & 0x40) // unknown, multibyte => skip 1329 else if (ext & 0x40) // unknown, multibyte => skip
1312 data += *data + 1; 1330 data += *data + 1;
1331 else
1332 data++;
1313 } 1333 }
1314 while (cmd & 0x80); 1334 while (ext & 0x80);
1315 } 1335 }
1316 else 1336 else
1317 cell->darkness = *data++ + 1; 1337 cell->darkness = *data++ + 1;
1338
1318 } 1339 }
1319 1340
1320 if (flags & 4) 1341 if (flags & 4)
1321 { 1342 {
1322 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1343 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
… …
1331 { 1352 {
1332 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1353 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1333 } 1354 }
1334 } 1355 }
1335 else 1356 else
1357 {
1336 cell->darkness = 0; 1358 cell->darkness = 0;
1359 cell->stat_hp = 0;
1360 cell->flags = 0;
1361 cell->player = 0;
1362 }
1337 } 1363 }
1338} 1364}
1339 1365
1340SV * 1366SV *
1341mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1367mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1444 face = cell->face [z]; 1470 face = cell->face [z];
1445 1471
1446 if (face && face < self->texs) 1472 if (face && face < self->texs)
1447 { 1473 {
1448 maptex tex = self->tex [face]; 1474 maptex tex = self->tex [face];
1449
1450 int px = (x + 1) * 32 - tex.w; 1475 int px = (x + 1) * 32 - tex.w;
1451 int py = (y + 1) * 32 - tex.h; 1476 int py = (y + 1) * 32 - tex.h;
1452 1477
1453 if (last_name != tex.name) 1478 if (last_name != tex.name)
1454 { 1479 {
1455 glEnd (); 1480 glEnd ();
1456 last_name = tex.name;
1457 glBindTexture (GL_TEXTURE_2D, last_name); 1481 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1458 glBegin (GL_QUADS); 1482 glBegin (GL_QUADS);
1459 } 1483 }
1460 1484
1461 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1485 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1462 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1486 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1463 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1487 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1464 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1488 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1465 } 1489 }
1490
1491 if (cell->flags && z == 2)
1492 {
1493 if (cell->flags & 1)
1494 {
1495 maptex tex = self->tex [1];
1496 int px = (x + 1) * 32 - tex.w + 2;
1497 int py = (y + 1) * 32 - tex.h - 6;
1498
1499 glEnd ();
1500 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1501 glBegin (GL_QUADS);
1502
1503 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1504 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1505 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1506 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1507 }
1508 }
1466 } 1509 }
1467 } 1510 }
1468 1511
1469 glEnd (); 1512 glEnd ();
1470 1513
… …
1485 int px = x * 32; 1528 int px = x * 32;
1486 int py = y * 32; 1529 int py = y * 32;
1487 1530
1488 if (cell->stat_hp) 1531 if (cell->stat_hp)
1489 { 1532 {
1490 int width = sh / 28 + 1; 1533 int width = cell->stat_width * 32;
1534 int thick = sh / 28 + 1 + cell->stat_width;
1491 1535
1492 glColor3ub (0, 0, 0); 1536 glColor3ub (0, 0, 0);
1493 glRectf (px + 1, py, px + 31, py + width + 2); 1537 glRectf (px + 1, py - thick - 2,
1538 px + width - 1, py);
1494 1539
1495 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0); 1540 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); 1541 glRectf (px + 2,
1542 py - thick - 1,
1543 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1497 } 1544 }
1498 } 1545 }
1499 } 1546 }
1500} 1547}
1501 1548

Diff Legend

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