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.134 by root, Fri Aug 4 16:49:58 2006 UTC vs.
Revision 1.166 by root, Fri Dec 8 15:07:08 2006 UTC

1#ifdef _WIN32 1#ifdef _WIN32
2# define WIN32_LEAN_AND_MEAN 2# define WIN32_LEAN_AND_MEAN
3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls 3# define _WIN32_WINNT 0x0500 // needed to get win2000 api calls
4# include <malloc.h> 4# include <malloc.h>
5# include <windows.h> 5# include <windows.h>
6# include <wininet.h>
6# pragma warning(disable:4244) 7# pragma warning(disable:4244)
8# pragma warning(disable:4761)
7#endif 9#endif
8 10
9#include "EXTERN.h" 11#include "EXTERN.h"
10#include "perl.h" 12#include "perl.h"
11#include "XSUB.h" 13#include "XSUB.h"
… …
36# include <sys/types.h> 38# include <sys/types.h>
37# include <sys/socket.h> 39# include <sys/socket.h>
38# include <netinet/in.h> 40# include <netinet/in.h>
39# include <netinet/tcp.h> 41# include <netinet/tcp.h>
40# include <inttypes.h> 42# include <inttypes.h>
41#else
42 typedef unsigned char uint8_t;
43 typedef unsigned short uint16_t;
44 typedef unsigned int uint32_t;
45 typedef signed char int8_t;
46 typedef signed short int16_t;
47 typedef signed int int32_t;
48#endif 43#endif
49 44
50#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, objetc replacement character */ 45#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
51 46
52#define FOW_DARKNESS 32 47#define FOW_DARKNESS 32
53 48
54#define MAP_EXTEND_X 32 49#define MAP_EXTEND_X 32
55#define MAP_EXTEND_Y 512 50#define MAP_EXTEND_Y 512
… …
144} 139}
145 140
146static void 141static void
147layout_get_pixel_size (CFPlus__Layout self, int *w, int *h) 142layout_get_pixel_size (CFPlus__Layout self, int *w, int *h)
148{ 143{
144 PangoRectangle rect;
145
146 // get_pixel_* wrongly rounds down
149 pango_layout_get_pixel_size (self->pl, w, h); 147 pango_layout_get_extents (self->pl, 0, &rect);
150 148
151 if (!*w) *w = 1; 149 rect.width = (rect.width + PANGO_SCALE - 1) / PANGO_SCALE;
152 if (!*h) *h = 1; 150 rect.height = (rect.height + PANGO_SCALE - 1) / PANGO_SCALE;
153 151
154 *w = (*w + 3) & ~3; 152 if (!rect.width) rect.width = 1;
153 if (!rect.height) rect.height = 1;
154
155 *w = rect.width;
156 *h = rect.height;
155} 157}
156 158
157typedef uint16_t mapface; 159typedef uint16_t mapface;
158 160
159typedef struct { 161typedef struct {
… …
162 float s, t; 164 float s, t;
163 uint8_t r, g, b, a; 165 uint8_t r, g, b, a;
164} maptex; 166} maptex;
165 167
166typedef struct { 168typedef struct {
167 int16_t darkness; 169 uint32_t player;
168 mapface face[3]; 170 mapface face[3];
171 uint16_t darkness;
172 uint8_t stat_width, stat_hp, flags;
169} mapcell; 173} mapcell;
170 174
171typedef struct { 175typedef struct {
172 int32_t c0, c1; 176 int32_t c0, c1;
173 mapcell *col; 177 mapcell *col;
… …
286static void 290static void
287map_blank (CFPlus__Map self, int x0, int y0, int w, int h) 291map_blank (CFPlus__Map self, int x0, int y0, int w, int h)
288{ 292{
289 int x, y; 293 int x, y;
290 maprow *row; 294 maprow *row;
295 mapcell *cell;
291 296
292 for (y = y0; y < y0 + h; y++) 297 for (y = y0; y < y0 + h; y++)
293 if (y >= 0) 298 if (y >= 0)
294 { 299 {
295 if (y >= self->rows) 300 if (y >= self->rows)
… …
301 if (x >= row->c0) 306 if (x >= row->c0)
302 { 307 {
303 if (x >= row->c1) 308 if (x >= row->c1)
304 break; 309 break;
305 310
306 row->col[x - row->c0].darkness = -1; 311 cell = row->col + x - row->c0;
312
313 cell->darkness = 0;
314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
307 } 317 }
308 } 318 }
309} 319}
310 320
311static void 321static void
… …
636#ifndef _WIN32 646#ifndef _WIN32
637 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 647 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
638#endif 648#endif
639 649
640void 650void
651win32_proxy_info ()
652 PPCODE:
653{
654#ifdef _WIN32
655 char buffer[2048];
656 DWORD buflen;
657
658 EXTEND (SP, 3);
659
660 buflen = sizeof (buffer);
661 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
662 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
663 {
664 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
665
666 buflen = sizeof (buffer);
667 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
668 {
669 PUSHs (newSVpv (buffer, 0));
670
671 buflen = sizeof (buffer);
672 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
673 PUSHs (newSVpv (buffer, 0));
674 }
675 }
676#endif
677}
678
679void
641add_font (char *file) 680add_font (char *file)
642 CODE: 681 CODE:
643 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 682 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
644 683
645void 684void
… …
747 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 786 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
748#endif 787#endif
749 _exit (1); 788 _exit (1);
750 789
751void 790void
752_exit (int retval) 791_exit (int retval = 0)
753 CODE: 792 CODE:
793#ifdef WIN32
794 ExitThread (retval); // unclean, please beam me up
795#else
754 _exit (retval); 796 _exit (retval);
797#endif
755 798
756MODULE = CFPlus PACKAGE = CFPlus::Font 799MODULE = CFPlus PACKAGE = CFPlus::Font
757 800
758CFPlus::Font 801CFPlus::Font
759new_from_file (SV *class, char *path, int id = 0) 802new_from_file (SV *class, char *path, int id = 0)
… …
1006xy_to_index (CFPlus::Layout self, int x, int y) 1049xy_to_index (CFPlus::Layout self, int x, int y)
1007 CODE: 1050 CODE:
1008{ 1051{
1009 int index, trailing; 1052 int index, trailing;
1010 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1053 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1011 RETVAL = index; 1054 RETVAL = index + trailing;
1012} 1055}
1013 OUTPUT: 1056 OUTPUT:
1014 RETVAL 1057 RETVAL
1015 1058
1016void 1059void
… …
1025 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1068 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1026 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1069 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1027} 1070}
1028 1071
1029void 1072void
1073index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1074 PPCODE:
1075{
1076 int line, x;
1077
1078 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1079 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1080
1081 EXTEND (SP, 2);
1082 PUSHs (sv_2mortal (newSViv (line - 1)));
1083 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1084}
1085
1086void
1087line_x_to_index (CFPlus::Layout self, int line, int x)
1088 PPCODE:
1089{
1090 PangoLayoutLine *lp;
1091 int index, trailing;
1092
1093 if (line < 0)
1094 XSRETURN_EMPTY;
1095
1096 if (!(lp = pango_layout_get_line (self->pl, line)))
1097 XSRETURN_EMPTY; /* do better */
1098
1099 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1100
1101 EXTEND (SP, 2);
1102 if (GIMME_V == G_SCALAR)
1103 PUSHs (sv_2mortal (newSViv (index + trailing)));
1104 else
1105 {
1106 PUSHs (sv_2mortal (newSViv (index)));
1107 PUSHs (sv_2mortal (newSViv (trailing)));
1108 }
1109}
1110
1111void
1030render (CFPlus::Layout self, float x, float y) 1112render (CFPlus::Layout self, float x, float y, int flags = 0)
1031 PPCODE: 1113 PPCODE:
1032 pango_opengl_render_layout_subpixel ( 1114 pango_opengl_render_layout_subpixel (
1033 self->pl, 1115 self->pl,
1034 x * PANGO_SCALE, y * PANGO_SCALE, 1116 x * PANGO_SCALE, y * PANGO_SCALE,
1035 self->r, self->g, self->b, self->a 1117 self->r, self->g, self->b, self->a,
1118 flags
1036 ); 1119 );
1037 1120
1038MODULE = CFPlus PACKAGE = CFPlus::Texture 1121MODULE = CFPlus PACKAGE = CFPlus::Texture
1039 1122
1040void 1123void
… …
1124} 1207}
1125 1208
1126MODULE = CFPlus PACKAGE = CFPlus::Map 1209MODULE = CFPlus PACKAGE = CFPlus::Map
1127 1210
1128CFPlus::Map 1211CFPlus::Map
1129new (SV *class, int map_width, int map_height) 1212new (SV *class)
1130 CODE: 1213 CODE:
1131 New (0, RETVAL, 1, struct map); 1214 New (0, RETVAL, 1, struct map);
1132 RETVAL->x = 0; 1215 RETVAL->x = 0;
1133 RETVAL->y = 0; 1216 RETVAL->y = 0;
1134 RETVAL->w = map_width; 1217 RETVAL->w = 0;
1135 RETVAL->h = map_height; 1218 RETVAL->h = 0;
1136 RETVAL->ox = 0; 1219 RETVAL->ox = 0;
1137 RETVAL->oy = 0; 1220 RETVAL->oy = 0;
1138 RETVAL->faces = 8192; 1221 RETVAL->faces = 8192;
1139 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1222 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1140 RETVAL->texs = 8192; 1223 RETVAL->texs = 8192;
… …
1151 map_clear (self); 1234 map_clear (self);
1152 Safefree (self->face); 1235 Safefree (self->face);
1153 Safefree (self->tex); 1236 Safefree (self->tex);
1154 Safefree (self); 1237 Safefree (self);
1155} 1238}
1239
1240void
1241resize (CFPlus::Map self, int map_width, int map_height)
1242 CODE:
1243 self->w = map_width;
1244 self->h = map_height;
1156 1245
1157void 1246void
1158clear (CFPlus::Map self) 1247clear (CFPlus::Map self)
1159 CODE: 1248 CODE:
1160 map_clear (self); 1249 map_clear (self);
… …
1230void 1319void
1231scroll (CFPlus::Map self, int dx, int dy) 1320scroll (CFPlus::Map self, int dx, int dy)
1232 CODE: 1321 CODE:
1233{ 1322{
1234 if (dx > 0) 1323 if (dx > 0)
1235 map_blank (self, self->x, self->y, dx - 1, self->h); 1324 map_blank (self, self->x, self->y, dx, self->h);
1236 else if (dx < 0) 1325 else if (dx < 0)
1237 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1326 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1238 1327
1239 if (dy > 0) 1328 if (dy > 0)
1240 map_blank (self, self->x, self->y, self->w, dy - 1); 1329 map_blank (self, self->x, self->y, self->w, dy);
1241 else if (dy < 0) 1330 else if (dy < 0)
1242 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1331 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1243 1332
1244 self->ox += dx; self->x += dx; 1333 self->ox += dx; self->x += dx;
1245 self->oy += dy; self->y += dy; 1334 self->oy += dy; self->y += dy;
1246 1335
1247 while (self->y < 0) 1336 while (self->y < 0)
… …
1252 self->y += MAP_EXTEND_Y; 1341 self->y += MAP_EXTEND_Y;
1253 } 1342 }
1254} 1343}
1255 1344
1256void 1345void
1257map1a_update (CFPlus::Map self, SV *data_) 1346map1a_update (CFPlus::Map self, SV *data_, int extmap)
1258 CODE: 1347 CODE:
1259{ 1348{
1260 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 1349 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1261 uint8_t *data_end = (uint8_t *)SvEND (data_); 1350 uint8_t *data_end = (uint8_t *)SvEND (data_);
1262 mapcell *cell; 1351 mapcell *cell;
1263 int x, y, flags; 1352 int x, y, flags;
1264 1353
1265 while (data < data_end) 1354 while (data < data_end - 1)
1266 { 1355 {
1267 flags = (data [0] << 8) + data [1]; data += 2; 1356 flags = (data [0] << 8) + data [1]; data += 2;
1268 1357
1269 x = self->x + ((flags >> 10) & 63); 1358 x = self->x + ((flags >> 10) & 63);
1270 y = self->y + ((flags >> 4) & 63); 1359 y = self->y + ((flags >> 4) & 63);
1271 1360
1272 cell = map_get_cell (self, x, y); 1361 cell = map_get_cell (self, x, y);
1273 1362
1274 if (flags & 15) 1363 if (flags & 15)
1275 { 1364 {
1276 if (cell->darkness < 0) 1365 if (!cell->darkness)
1277 { 1366 {
1367 memset (cell, 0, sizeof (*cell));
1278 cell->darkness = 0; 1368 cell->darkness = 256;
1279 cell->face [0] = 0;
1280 cell->face [1] = 0;
1281 cell->face [2] = 0;
1282 } 1369 }
1283 1370
1284 cell->darkness = flags & 8 ? *data++ : 255;
1285
1286 //TODO: don't trust server data to be in-range(!) 1371 //TODO: don't trust server data to be in-range(!)
1372
1373 if (flags & 8)
1374 {
1375 if (extmap)
1376 {
1377 uint8_t ext, cmd;
1378
1379 do
1380 {
1381 ext = *data++;
1382 cmd = ext & 0x3f;
1383
1384 if (cmd < 4)
1385 cell->darkness = 255 - ext * 64 + 1;
1386 else if (cmd == 5) // health
1387 {
1388 cell->stat_width = 1;
1389 cell->stat_hp = *data++;
1390 }
1391 else if (cmd == 6) // monster width
1392 cell->stat_width = *data++ + 1;
1393 else if (cmd == 0x47) // monster width
1394 {
1395 if (*data == 4)
1396 ; // decode player tag
1397
1398 data += *data + 1;
1399 }
1400 else if (cmd == 8) // cell flags
1401 cell->flags = *data++;
1402 else if (ext & 0x40) // unknown, multibyte => skip
1403 data += *data + 1;
1404 else
1405 data++;
1406 }
1407 while (ext & 0x80);
1408 }
1409 else
1410 cell->darkness = *data++ + 1;
1411 }
1287 1412
1288 if (flags & 4) 1413 if (flags & 4)
1289 { 1414 {
1290 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2; 1415 cell->face [0] = self->face [(data [0] << 8) + data [1]]; data += 2;
1291 } 1416 }
… …
1299 { 1424 {
1300 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1425 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1301 } 1426 }
1302 } 1427 }
1303 else 1428 else
1304 cell->darkness = -1; 1429 cell->darkness = 0;
1305 } 1430 }
1306} 1431}
1307 1432
1308SV * 1433SV *
1309mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1434mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1364} 1489}
1365 OUTPUT: 1490 OUTPUT:
1366 RETVAL 1491 RETVAL
1367 1492
1368void 1493void
1369draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1494draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1370 CODE: 1495 CODE:
1371{ 1496{
1372 int vx, vy;
1373 int x, y, z; 1497 int x, y, z;
1374 int last_name; 1498 int last_name;
1375 mapface face; 1499 mapface face;
1376
1377 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1378 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1379
1380 /*
1381 int vx = self->vx = self->w >= sw
1382 ? self->x + (self->w - sw) / 2
1383 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1384
1385 int vy = self->vy = self->h >= sh
1386 ? self->y + (self->h - sh) / 2
1387 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1388 */
1389 1500
1390 glColor4ub (255, 255, 255, 255); 1501 glColor4ub (255, 255, 255, 255);
1391 1502
1392 glEnable (GL_BLEND); 1503 glEnable (GL_BLEND);
1393 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1504 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1396 1507
1397 glBegin (GL_QUADS); 1508 glBegin (GL_QUADS);
1398 1509
1399 last_name = 0; 1510 last_name = 0;
1400 1511
1512 mx += self->x;
1513 my += self->y;
1514
1401 for (z = 0; z < 3; z++) 1515 for (z = 0; z < 3; z++)
1402 for (y = 0; y < sh; y++) 1516 for (y = 0; y < sh; y++)
1403 if (0 <= y + vy && y + vy < self->rows) 1517 if (0 <= y + my && y + my < self->rows)
1404 { 1518 {
1405 maprow *row = self->row + (y + vy); 1519 maprow *row = self->row + (y + my);
1406 1520
1407 for (x = 0; x < sw; x++) 1521 for (x = 0; x < sw; x++)
1408 if (row->c0 <= x + vx && x + vx < row->c1) 1522 if (row->c0 <= x + mx && x + mx < row->c1)
1409 { 1523 {
1410 mapcell *cell = row->col + (x + vx - row->c0); 1524 mapcell *cell = row->col + (x + mx - row->c0);
1411 1525
1412 face = cell->face [z]; 1526 face = cell->face [z];
1413 1527
1414 if (face) 1528 if (face && face < self->texs)
1415 { 1529 {
1416 maptex tex = self->tex [face]; 1530 maptex tex = self->tex [face];
1417
1418 int px = (x + 1) * 32 - tex.w; 1531 int px = (x + 1) * 32 - tex.w;
1419 int py = (y + 1) * 32 - tex.h; 1532 int py = (y + 1) * 32 - tex.h;
1420 1533
1421 if (last_name != tex.name) 1534 if (last_name != tex.name)
1422 { 1535 {
1423 glEnd (); 1536 glEnd ();
1424 last_name = tex.name;
1425 glBindTexture (GL_TEXTURE_2D, last_name); 1537 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1426 glBegin (GL_QUADS); 1538 glBegin (GL_QUADS);
1427 } 1539 }
1428 1540
1429 glTexCoord2f (0 , 0 ); glVertex2f (px , py ); 1541 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1430 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h); 1542 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1431 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h); 1543 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1432 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py ); 1544 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1433 } 1545 }
1546
1547 if (cell->flags && z == 2)
1548 {
1549 if (cell->flags & 1)
1550 {
1551 maptex tex = self->tex [1];
1552 int px = (x + 1) * 32 - tex.w + 2;
1553 int py = (y + 1) * 32 - tex.h - 6;
1554
1555 glEnd ();
1556 glBindTexture (GL_TEXTURE_2D, last_name = tex.name);
1557 glBegin (GL_QUADS);
1558
1559 glTexCoord2f (0 , 0 ); glVertex2f (px , py );
1560 glTexCoord2f (0 , tex.t); glVertex2f (px , py + tex.h);
1561 glTexCoord2f (tex.s, tex.t); glVertex2f (px + tex.w, py + tex.h);
1562 glTexCoord2f (tex.s, 0 ); glVertex2f (px + tex.w, py );
1563 }
1564 }
1434 } 1565 }
1435 } 1566 }
1436 1567
1437 glEnd (); 1568 glEnd ();
1438 1569
1439 glDisable (GL_TEXTURE_2D); 1570 glDisable (GL_TEXTURE_2D);
1440 glDisable (GL_BLEND); 1571 glDisable (GL_BLEND);
1572
1573 // top layer: overlays such as the health bar
1574 for (y = 0; y < sh; y++)
1575 if (0 <= y + my && y + my < self->rows)
1576 {
1577 maprow *row = self->row + (y + my);
1578
1579 for (x = 0; x < sw; x++)
1580 if (row->c0 <= x + mx && x + mx < row->c1)
1581 {
1582 mapcell *cell = row->col + (x + mx - row->c0);
1583
1584 int px = x * 32;
1585 int py = y * 32;
1586
1587 if (cell->stat_hp)
1588 {
1589 int width = cell->stat_width * 32;
1590 int thick = sh / 28 + 1 + cell->stat_width;
1591
1592 glColor3ub (0, 0, 0);
1593 glRectf (px + 1, py - thick - 2,
1594 px + width - 1, py);
1595
1596 glColor3ub (cell->stat_hp, 255 - cell->stat_hp, 0);
1597 glRectf (px + 2,
1598 py - thick - 1,
1599 px + width - 2 - cell->stat_hp * (width - 4) / 255, py - 1);
1600 }
1601 }
1602 }
1441} 1603}
1442 1604
1443void 1605void
1444draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data) 1606draw_magicmap (CFPlus::Map self, int dx, int dy, int w, int h, unsigned char *data)
1445 CODE: 1607 CODE:
… …
1499 glDisable (GL_BLEND); 1661 glDisable (GL_BLEND);
1500 glDisable (GL_TEXTURE_2D); 1662 glDisable (GL_TEXTURE_2D);
1501} 1663}
1502 1664
1503void 1665void
1504fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1666fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1505 PPCODE: 1667 PPCODE:
1506{ 1668{
1507 int vx, vy;
1508 int x, y; 1669 int x, y;
1509 int sw4 = (sw + 3) & ~3; 1670 int sw4 = (sw + 3) & ~3;
1510 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1671 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1511 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1672 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1512 1673
1513 memset (darkness, 255, sw4 * sh); 1674 memset (darkness, 255, sw4 * sh);
1514 SvPOK_only (darkness_sv); 1675 SvPOK_only (darkness_sv);
1515 SvCUR_set (darkness_sv, sw4 * sh); 1676 SvCUR_set (darkness_sv, sw4 * sh);
1516 1677
1517 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1678 mx += self->x;
1518 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1679 my += self->y;
1519 1680
1520 for (y = 0; y < sh; y++) 1681 for (y = 0; y < sh; y++)
1521 if (0 <= y + vy && y + vy < self->rows) 1682 if (0 <= y + my && y + my < self->rows)
1522 { 1683 {
1523 maprow *row = self->row + (y + vy); 1684 maprow *row = self->row + (y + my);
1524 1685
1525 for (x = 0; x < sw; x++) 1686 for (x = 0; x < sw; x++)
1526 if (row->c0 <= x + vx && x + vx < row->c1) 1687 if (row->c0 <= x + mx && x + mx < row->c1)
1527 { 1688 {
1528 mapcell *cell = row->col + (x + vx - row->c0); 1689 mapcell *cell = row->col + (x + mx - row->c0);
1529 1690
1530 darkness[y * sw4 + x] = cell->darkness < 0 1691 darkness[y * sw4 + x] = cell->darkness
1692 ? 255 - (cell->darkness - 1)
1531 ? 255 - FOW_DARKNESS 1693 : 255 - FOW_DARKNESS;
1532 : 255 - cell->darkness;
1533 } 1694 }
1534 } 1695 }
1535 1696
1536 EXTEND (SP, 3); 1697 EXTEND (SP, 3);
1537 PUSHs (sv_2mortal (newSViv (sw4))); 1698 PUSHs (sv_2mortal (newSViv (sw4)));
… …
1652 1813
1653 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; } 1814 if (flags & 1) { face[0] = *data++ << 8; face[0] |= *data++; }
1654 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; } 1815 if (flags & 2) { face[1] = *data++ << 8; face[1] |= *data++; }
1655 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; } 1816 if (flags & 4) { face[2] = *data++ << 8; face[2] |= *data++; }
1656 1817
1657 if (cell->darkness <= 0) 1818 if (cell->darkness == 0)
1658 { 1819 {
1659 cell->darkness = -1; 1820 cell->darkness = 0;
1660 1821
1661 for (z = 0; z <= 2; z++) 1822 for (z = 0; z <= 2; z++)
1662 { 1823 {
1663 cell->face[z] = face[z]; 1824 cell->face[z] = face[z];
1664 1825
… …
1802 const_iv (GL_SEPARABLE_2D), 1963 const_iv (GL_SEPARABLE_2D),
1803 const_iv (GL_CONVOLUTION_2D), 1964 const_iv (GL_CONVOLUTION_2D),
1804 const_iv (GL_CONVOLUTION_BORDER_MODE), 1965 const_iv (GL_CONVOLUTION_BORDER_MODE),
1805 const_iv (GL_CONSTANT_BORDER), 1966 const_iv (GL_CONSTANT_BORDER),
1806 const_iv (GL_LINES), 1967 const_iv (GL_LINES),
1968 const_iv (GL_LINE_STRIP),
1807 const_iv (GL_LINE_LOOP), 1969 const_iv (GL_LINE_LOOP),
1808 const_iv (GL_QUADS), 1970 const_iv (GL_QUADS),
1809 const_iv (GL_QUAD_STRIP), 1971 const_iv (GL_QUAD_STRIP),
1810 const_iv (GL_TRIANGLES), 1972 const_iv (GL_TRIANGLES),
1811 const_iv (GL_TRIANGLE_STRIP), 1973 const_iv (GL_TRIANGLE_STRIP),
… …
2008 2170
2009void glEndList () 2171void glEndList ()
2010 2172
2011void glCallList (int list) 2173void glCallList (int list)
2012 2174
2013

Diff Legend

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