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.152 by root, Sat Aug 19 18:18:36 2006 UTC vs.
Revision 1.155 by root, Thu Sep 21 00:16:42 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];
176 uint8_t stat_width, stat_hp; 177 uint8_t stat_width, stat_hp, flags;
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;
… …
314 315
315 cell = row->col + x - row->c0; 316 cell = row->col + x - row->c0;
316 317
317 cell->darkness = 0; 318 cell->darkness = 0;
318 cell->stat_hp = 0; 319 cell->stat_hp = 0;
320 cell->flags = 0;
321 cell->player = 0;
319 } 322 }
320 } 323 }
321} 324}
322 325
323static void 326static void
… …
1243void 1246void
1244scroll (CFPlus::Map self, int dx, int dy) 1247scroll (CFPlus::Map self, int dx, int dy)
1245 CODE: 1248 CODE:
1246{ 1249{
1247 if (dx > 0) 1250 if (dx > 0)
1248 map_blank (self, self->x, self->y, dx - 1, self->h); 1251 map_blank (self, self->x, self->y, dx, self->h);
1249 else if (dx < 0) 1252 else if (dx < 0)
1250 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);
1251 1254
1252 if (dy > 0) 1255 if (dy > 0)
1253 map_blank (self, self->x, self->y, self->w, dy - 1); 1256 map_blank (self, self->x, self->y, self->w, dy);
1254 else if (dy < 0) 1257 else if (dy < 0)
1255 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);
1256 1259
1257 self->ox += dx; self->x += dx; 1260 self->ox += dx; self->x += dx;
1258 self->oy += dy; self->y += dy; 1261 self->oy += dy; self->y += dy;
1259 1262
1260 while (self->y < 0) 1263 while (self->y < 0)
… …
1286 1289
1287 if (flags & 15) 1290 if (flags & 15)
1288 { 1291 {
1289 if (!cell->darkness) 1292 if (!cell->darkness)
1290 { 1293 {
1294 memset (cell, 0, sizeof (*cell));
1291 cell->darkness = 256; 1295 cell->darkness = 256;
1292 cell->face [0] = 0;
1293 cell->face [1] = 0;
1294 cell->face [2] = 0;
1295 } 1296 }
1296 1297
1297 //TODO: don't trust server data to be in-range(!) 1298 //TODO: don't trust server data to be in-range(!)
1298 1299
1299 if (flags & 8) 1300 if (flags & 8)
… …
1314 cell->stat_width = 1; 1315 cell->stat_width = 1;
1315 cell->stat_hp = *data++; 1316 cell->stat_hp = *data++;
1316 } 1317 }
1317 else if (cmd == 6) // monster width 1318 else if (cmd == 6) // monster width
1318 cell->stat_width = *data++ + 1; 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++;
1319 else if (ext & 0x40) // unknown, multibyte => skip 1329 else if (ext & 0x40) // unknown, multibyte => skip
1320 data += *data + 1; 1330 data += *data + 1;
1321 else 1331 else
1322 data++; 1332 data++;
1323 } 1333 }
1324 while (ext & 0x80); 1334 while (ext & 0x80);
1325 } 1335 }
1326 else 1336 else
1327 cell->darkness = *data++ + 1; 1337 cell->darkness = *data++ + 1;
1338
1328 } 1339 }
1329 1340
1330 if (flags & 4) 1341 if (flags & 4)
1331 { 1342 {
1332 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;
… …
1341 { 1352 {
1342 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;
1343 } 1354 }
1344 } 1355 }
1345 else 1356 else
1346 {
1347 cell->darkness = 0; 1357 cell->darkness = 0;
1348 cell->stat_hp = 0;
1349 }
1350 } 1358 }
1351} 1359}
1352 1360
1353SV * 1361SV *
1354mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1362mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1457 face = cell->face [z]; 1465 face = cell->face [z];
1458 1466
1459 if (face && face < self->texs) 1467 if (face && face < self->texs)
1460 { 1468 {
1461 maptex tex = self->tex [face]; 1469 maptex tex = self->tex [face];
1462
1463 int px = (x + 1) * 32 - tex.w; 1470 int px = (x + 1) * 32 - tex.w;
1464 int py = (y + 1) * 32 - tex.h; 1471 int py = (y + 1) * 32 - tex.h;
1465 1472
1466 if (last_name != tex.name) 1473 if (last_name != tex.name)
1467 { 1474 {
1468 glEnd (); 1475 glEnd ();
1469 last_name = tex.name;
1470 glBindTexture (GL_TEXTURE_2D, last_name); 1476 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1471 glBegin (GL_QUADS); 1477 glBegin (GL_QUADS);
1472 } 1478 }
1473 1479
1474 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1480 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1475 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1481 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1476 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1482 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1477 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1483 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1484 }
1485
1486 if (cell->flags && z == 2)
1487 {
1488 if (cell->flags & 1)
1489 {
1490 maptex tex = self->tex [1];
1491 int px = (x + 1) * 32 - tex.w + 2;
1492 int py = (y + 1) * 32 - tex.h - 6;
1493
1494 glEnd ();
1495 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1496 glBegin (GL_QUADS);
1497
1498 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1499 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1500 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1501 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1502 }
1478 } 1503 }
1479 } 1504 }
1480 } 1505 }
1481 1506
1482 glEnd (); 1507 glEnd ();

Diff Legend

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