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.153 by root, Tue Sep 19 22:02:38 2006 UTC vs.
Revision 1.167 by root, Sat Dec 9 02:21:25 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
… …
315 310
316 cell = row->col + x - row->c0; 311 cell = row->col + x - row->c0;
317 312
318 cell->darkness = 0; 313 cell->darkness = 0;
319 cell->stat_hp = 0; 314 cell->stat_hp = 0;
315 cell->flags = 0;
316 cell->player = 0;
320 } 317 }
321 } 318 }
322} 319}
323 320
324static void 321static void
… …
361 n |= n >> 8; 358 n |= n >> 8;
362 n |= n >> 16; 359 n |= n >> 16;
363 360
364 return n + 1; 361 return n + 1;
365} 362}
363
364/* SDL should provide this, really. */
365#define SDLK_MODIFIER_MIN 300
366#define SDLK_MODIFIER_MAX 314
366 367
367MODULE = CFPlus PACKAGE = CFPlus 368MODULE = CFPlus PACKAGE = CFPlus
368 369
369PROTOTYPES: ENABLE 370PROTOTYPES: ENABLE
370 371
… …
374 static const struct { 375 static const struct {
375 const char *name; 376 const char *name;
376 IV iv; 377 IV iv;
377 } *civ, const_iv[] = { 378 } *civ, const_iv[] = {
378# define const_iv(name) { # name, (IV)name } 379# define const_iv(name) { # name, (IV)name }
380 const_iv (SDLK_MODIFIER_MIN),
381 const_iv (SDLK_MODIFIER_MAX),
382
379 const_iv (SDL_ACTIVEEVENT), 383 const_iv (SDL_ACTIVEEVENT),
380 const_iv (SDL_KEYDOWN), 384 const_iv (SDL_KEYDOWN),
381 const_iv (SDL_KEYUP), 385 const_iv (SDL_KEYUP),
382 const_iv (SDL_MOUSEMOTION), 386 const_iv (SDL_MOUSEMOTION),
383 const_iv (SDL_MOUSEBUTTONDOWN), 387 const_iv (SDL_MOUSEBUTTONDOWN),
… …
392 const_iv (SDL_EVENT_RESERVEDA), 396 const_iv (SDL_EVENT_RESERVEDA),
393 const_iv (SDL_EVENT_RESERVEDB), 397 const_iv (SDL_EVENT_RESERVEDB),
394 const_iv (SDL_VIDEORESIZE), 398 const_iv (SDL_VIDEORESIZE),
395 const_iv (SDL_VIDEOEXPOSE), 399 const_iv (SDL_VIDEOEXPOSE),
396 const_iv (SDL_USEREVENT), 400 const_iv (SDL_USEREVENT),
401
402 const_iv (SDL_APPINPUTFOCUS),
403 const_iv (SDL_APPMOUSEFOCUS),
404 const_iv (SDL_APPACTIVE),
405
397 const_iv (SDLK_KP0), 406 const_iv (SDLK_KP0),
398 const_iv (SDLK_KP1), 407 const_iv (SDLK_KP1),
399 const_iv (SDLK_KP2), 408 const_iv (SDLK_KP2),
400 const_iv (SDLK_KP3), 409 const_iv (SDLK_KP3),
401 const_iv (SDLK_KP4), 410 const_iv (SDLK_KP4),
… …
456 const_iv (SDLK_BREAK), 465 const_iv (SDLK_BREAK),
457 const_iv (SDLK_MENU), 466 const_iv (SDLK_MENU),
458 const_iv (SDLK_POWER), 467 const_iv (SDLK_POWER),
459 const_iv (SDLK_EURO), 468 const_iv (SDLK_EURO),
460 const_iv (SDLK_UNDO), 469 const_iv (SDLK_UNDO),
470
461 const_iv (KMOD_NONE), 471 const_iv (KMOD_NONE),
472 const_iv (KMOD_SHIFT),
462 const_iv (KMOD_LSHIFT), 473 const_iv (KMOD_LSHIFT),
463 const_iv (KMOD_RSHIFT), 474 const_iv (KMOD_RSHIFT),
475 const_iv (KMOD_CTRL),
464 const_iv (KMOD_LCTRL), 476 const_iv (KMOD_LCTRL),
465 const_iv (KMOD_RCTRL), 477 const_iv (KMOD_RCTRL),
478 const_iv (KMOD_ALT),
466 const_iv (KMOD_LALT), 479 const_iv (KMOD_LALT),
467 const_iv (KMOD_RALT), 480 const_iv (KMOD_RALT),
481 const_iv (KMOD_META),
468 const_iv (KMOD_LMETA), 482 const_iv (KMOD_LMETA),
469 const_iv (KMOD_RMETA), 483 const_iv (KMOD_RMETA),
470 const_iv (KMOD_NUM), 484 const_iv (KMOD_NUM),
471 const_iv (KMOD_CAPS), 485 const_iv (KMOD_CAPS),
472 const_iv (KMOD_MODE), 486 const_iv (KMOD_MODE),
473 const_iv (KMOD_CTRL),
474 const_iv (KMOD_SHIFT),
475 const_iv (KMOD_ALT),
476 const_iv (KMOD_META)
477# undef const_iv 487# undef const_iv
478 }; 488 };
479 489
480 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 490 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
481 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 491 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
492
493 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
494 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
482} 495}
483 496
484int 497int
485in_destruct () 498in_destruct ()
486 CODE: 499 CODE:
… …
590 case SDL_KEYDOWN: 603 case SDL_KEYDOWN:
591 case SDL_KEYUP: 604 case SDL_KEYUP:
592 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 605 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
593 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 606 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
594 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 607 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0);
608 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */
595 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 609 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
596 break; 610 break;
597 611
598 case SDL_ACTIVEEVENT: 612 case SDL_ACTIVEEVENT:
599 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 613 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
647lowdelay (int fd, int val = 1) 661lowdelay (int fd, int val = 1)
648 CODE: 662 CODE:
649#ifndef _WIN32 663#ifndef _WIN32
650 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)); 664 setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val));
651#endif 665#endif
666
667void
668win32_proxy_info ()
669 PPCODE:
670{
671#ifdef _WIN32
672 char buffer[2048];
673 DWORD buflen;
674
675 EXTEND (SP, 3);
676
677 buflen = sizeof (buffer);
678 if (InternetQueryOption (0, INTERNET_OPTION_PROXY, (void *)buffer, &buflen))
679 if (((INTERNET_PROXY_INFO *)buffer)->dwAccessType == INTERNET_OPEN_TYPE_PROXY)
680 {
681 PUSHs (newSVpv (((INTERNET_PROXY_INFO *)buffer)->lpszProxy, 0));
682
683 buflen = sizeof (buffer);
684 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_USERNAME, (void *)buffer, &buflen))
685 {
686 PUSHs (newSVpv (buffer, 0));
687
688 buflen = sizeof (buffer);
689 if (InternetQueryOption (0, INTERNET_OPTION_PROXY_PASSWORD, (void *)buffer, &buflen))
690 PUSHs (newSVpv (buffer, 0));
691 }
692 }
693#endif
694}
652 695
653void 696void
654add_font (char *file) 697add_font (char *file)
655 CODE: 698 CODE:
656 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 699 FcConfigAppFontAddFile (0, (const FcChar8 *)file);
… …
760 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR); 803 MessageBox (0, message, "Crossfire+ Fatal Error", MB_OK | MB_ICONERROR);
761#endif 804#endif
762 _exit (1); 805 _exit (1);
763 806
764void 807void
765_exit (int retval) 808_exit (int retval = 0)
766 CODE: 809 CODE:
810#ifdef WIN32
811 ExitThread (retval); // unclean, please beam me up
812#else
767 _exit (retval); 813 _exit (retval);
814#endif
768 815
769MODULE = CFPlus PACKAGE = CFPlus::Font 816MODULE = CFPlus PACKAGE = CFPlus::Font
770 817
771CFPlus::Font 818CFPlus::Font
772new_from_file (SV *class, char *path, int id = 0) 819new_from_file (SV *class, char *path, int id = 0)
… …
1019xy_to_index (CFPlus::Layout self, int x, int y) 1066xy_to_index (CFPlus::Layout self, int x, int y)
1020 CODE: 1067 CODE:
1021{ 1068{
1022 int index, trailing; 1069 int index, trailing;
1023 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing); 1070 pango_layout_xy_to_index (self->pl, x * PANGO_SCALE, y * PANGO_SCALE, &index, &trailing);
1024 RETVAL = index; 1071 RETVAL = index + trailing;
1025} 1072}
1026 OUTPUT: 1073 OUTPUT:
1027 RETVAL 1074 RETVAL
1028 1075
1029void 1076void
… …
1035 1082
1036 EXTEND (SP, 3); 1083 EXTEND (SP, 3);
1037 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1084 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE)));
1038 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1085 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE)));
1039 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1086 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE)));
1087}
1088
1089void
1090index_to_line_x (CFPlus::Layout self, int index, int trailing = 0)
1091 PPCODE:
1092{
1093 int line, x;
1094
1095 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1096 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1097
1098 EXTEND (SP, 2);
1099 PUSHs (sv_2mortal (newSViv (line - 1)));
1100 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1101}
1102
1103void
1104line_x_to_index (CFPlus::Layout self, int line, int x)
1105 PPCODE:
1106{
1107 PangoLayoutLine *lp;
1108 int index, trailing;
1109
1110 if (line < 0)
1111 XSRETURN_EMPTY;
1112
1113 if (!(lp = pango_layout_get_line (self->pl, line)))
1114 XSRETURN_EMPTY; /* do better */
1115
1116 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1117
1118 EXTEND (SP, 2);
1119 if (GIMME_V == G_SCALAR)
1120 PUSHs (sv_2mortal (newSViv (index + trailing)));
1121 else
1122 {
1123 PUSHs (sv_2mortal (newSViv (index)));
1124 PUSHs (sv_2mortal (newSViv (trailing)));
1125 }
1040} 1126}
1041 1127
1042void 1128void
1043render (CFPlus::Layout self, float x, float y, int flags = 0) 1129render (CFPlus::Layout self, float x, float y, int flags = 0)
1044 PPCODE: 1130 PPCODE:
… …
1138} 1224}
1139 1225
1140MODULE = CFPlus PACKAGE = CFPlus::Map 1226MODULE = CFPlus PACKAGE = CFPlus::Map
1141 1227
1142CFPlus::Map 1228CFPlus::Map
1143new (SV *class, int map_width, int map_height) 1229new (SV *class)
1144 CODE: 1230 CODE:
1145 New (0, RETVAL, 1, struct map); 1231 New (0, RETVAL, 1, struct map);
1146 RETVAL->x = 0; 1232 RETVAL->x = 0;
1147 RETVAL->y = 0; 1233 RETVAL->y = 0;
1148 RETVAL->w = map_width; 1234 RETVAL->w = 0;
1149 RETVAL->h = map_height; 1235 RETVAL->h = 0;
1150 RETVAL->ox = 0; 1236 RETVAL->ox = 0;
1151 RETVAL->oy = 0; 1237 RETVAL->oy = 0;
1152 RETVAL->faces = 8192; 1238 RETVAL->faces = 8192;
1153 Newz (0, RETVAL->face, RETVAL->faces, mapface); 1239 Newz (0, RETVAL->face, RETVAL->faces, mapface);
1154 RETVAL->texs = 8192; 1240 RETVAL->texs = 8192;
… …
1165 map_clear (self); 1251 map_clear (self);
1166 Safefree (self->face); 1252 Safefree (self->face);
1167 Safefree (self->tex); 1253 Safefree (self->tex);
1168 Safefree (self); 1254 Safefree (self);
1169} 1255}
1256
1257void
1258resize (CFPlus::Map self, int map_width, int map_height)
1259 CODE:
1260 self->w = map_width;
1261 self->h = map_height;
1170 1262
1171void 1263void
1172clear (CFPlus::Map self) 1264clear (CFPlus::Map self)
1173 CODE: 1265 CODE:
1174 map_clear (self); 1266 map_clear (self);
… …
1244void 1336void
1245scroll (CFPlus::Map self, int dx, int dy) 1337scroll (CFPlus::Map self, int dx, int dy)
1246 CODE: 1338 CODE:
1247{ 1339{
1248 if (dx > 0) 1340 if (dx > 0)
1249 map_blank (self, self->x, self->y, dx - 1, self->h); 1341 map_blank (self, self->x, self->y, dx, self->h);
1250 else if (dx < 0) 1342 else if (dx < 0)
1251 map_blank (self, self->x + self->w + dx + 1, self->y, 1 - dx, self->h); 1343 map_blank (self, self->x + self->w + dx + 1, self->y, -dx, self->h);
1252 1344
1253 if (dy > 0) 1345 if (dy > 0)
1254 map_blank (self, self->x, self->y, self->w, dy - 1); 1346 map_blank (self, self->x, self->y, self->w, dy);
1255 else if (dy < 0) 1347 else if (dy < 0)
1256 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, 1 - dy); 1348 map_blank (self, self->x, self->y + self->h + dy + 1, self->w, -dy);
1257 1349
1258 self->ox += dx; self->x += dx; 1350 self->ox += dx; self->x += dx;
1259 self->oy += dy; self->y += dy; 1351 self->oy += dy; self->y += dy;
1260 1352
1261 while (self->y < 0) 1353 while (self->y < 0)
… …
1287 1379
1288 if (flags & 15) 1380 if (flags & 15)
1289 { 1381 {
1290 if (!cell->darkness) 1382 if (!cell->darkness)
1291 { 1383 {
1384 memset (cell, 0, sizeof (*cell));
1292 cell->darkness = 256; 1385 cell->darkness = 256;
1293 cell->face [0] = 0;
1294 cell->face [1] = 0;
1295 cell->face [2] = 0;
1296 } 1386 }
1297 1387
1298 //TODO: don't trust server data to be in-range(!) 1388 //TODO: don't trust server data to be in-range(!)
1299 1389
1300 if (flags & 8) 1390 if (flags & 8)
… …
1351 { 1441 {
1352 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2; 1442 cell->face [2] = self->face [(data [0] << 8) + data [1]]; data += 2;
1353 } 1443 }
1354 } 1444 }
1355 else 1445 else
1356 {
1357 cell->darkness = 0; 1446 cell->darkness = 0;
1358 cell->stat_hp = 0;
1359 }
1360 } 1447 }
1361} 1448}
1362 1449
1363SV * 1450SV *
1364mapmap (CFPlus::Map self, int x0, int y0, int w, int h) 1451mapmap (CFPlus::Map self, int x0, int y0, int w, int h)
… …
1419} 1506}
1420 OUTPUT: 1507 OUTPUT:
1421 RETVAL 1508 RETVAL
1422 1509
1423void 1510void
1424draw (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1511draw (CFPlus::Map self, int mx, int my, int sw, int sh)
1425 CODE: 1512 CODE:
1426{ 1513{
1427 int vx, vy;
1428 int x, y, z; 1514 int x, y, z;
1429 int last_name; 1515 int last_name;
1430 mapface face; 1516 mapface face;
1431
1432 vx = self->x + self->w / 2 - sw / 2 - shift_x;
1433 vy = self->y + self->h / 2 - sh / 2 - shift_y;
1434
1435 /*
1436 int vx = self->vx = self->w >= sw
1437 ? self->x + (self->w - sw) / 2
1438 : MIN (self->x, MAX (self->x + self->w - sw + 1, self->vx));
1439
1440 int vy = self->vy = self->h >= sh
1441 ? self->y + (self->h - sh) / 2
1442 : MIN (self->y, MAX (self->y + self->h - sh + 1, self->vy));
1443 */
1444 1517
1445 glColor4ub (255, 255, 255, 255); 1518 glColor4ub (255, 255, 255, 255);
1446 1519
1447 glEnable (GL_BLEND); 1520 glEnable (GL_BLEND);
1448 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 1521 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
… …
1451 1524
1452 glBegin (GL_QUADS); 1525 glBegin (GL_QUADS);
1453 1526
1454 last_name = 0; 1527 last_name = 0;
1455 1528
1529 mx += self->x;
1530 my += self->y;
1531
1456 for (z = 0; z < 3; z++) 1532 for (z = 0; z < 3; z++)
1457 for (y = 0; y < sh; y++) 1533 for (y = 0; y < sh; y++)
1458 if (0 <= y + vy && y + vy < self->rows) 1534 if (0 <= y + my && y + my < self->rows)
1459 { 1535 {
1460 maprow *row = self->row + (y + vy); 1536 maprow *row = self->row + (y + my);
1461 1537
1462 for (x = 0; x < sw; x++) 1538 for (x = 0; x < sw; x++)
1463 if (row->c0 <= x + vx && x + vx < row->c1) 1539 if (row->c0 <= x + mx && x + mx < row->c1)
1464 { 1540 {
1465 mapcell *cell = row->col + (x + vx - row->c0); 1541 mapcell *cell = row->col + (x + mx - row->c0);
1466 1542
1467 face = cell->face [z]; 1543 face = cell->face [z];
1468 1544
1469 if (face && face < self->texs) 1545 if (face && face < self->texs)
1470 { 1546 {
… …
1511 glDisable (GL_TEXTURE_2D); 1587 glDisable (GL_TEXTURE_2D);
1512 glDisable (GL_BLEND); 1588 glDisable (GL_BLEND);
1513 1589
1514 // top layer: overlays such as the health bar 1590 // top layer: overlays such as the health bar
1515 for (y = 0; y < sh; y++) 1591 for (y = 0; y < sh; y++)
1516 if (0 <= y + vy && y + vy < self->rows) 1592 if (0 <= y + my && y + my < self->rows)
1517 { 1593 {
1518 maprow *row = self->row + (y + vy); 1594 maprow *row = self->row + (y + my);
1519 1595
1520 for (x = 0; x < sw; x++) 1596 for (x = 0; x < sw; x++)
1521 if (row->c0 <= x + vx && x + vx < row->c1) 1597 if (row->c0 <= x + mx && x + mx < row->c1)
1522 { 1598 {
1523 mapcell *cell = row->col + (x + vx - row->c0); 1599 mapcell *cell = row->col + (x + mx - row->c0);
1524 1600
1525 int px = x * 32; 1601 int px = x * 32;
1526 int py = y * 32; 1602 int py = y * 32;
1527 1603
1528 if (cell->stat_hp) 1604 if (cell->stat_hp)
… …
1602 glDisable (GL_BLEND); 1678 glDisable (GL_BLEND);
1603 glDisable (GL_TEXTURE_2D); 1679 glDisable (GL_TEXTURE_2D);
1604} 1680}
1605 1681
1606void 1682void
1607fow_texture (CFPlus::Map self, int shift_x, int shift_y, int x0, int y0, int sw, int sh) 1683fow_texture (CFPlus::Map self, int mx, int my, int sw, int sh)
1608 PPCODE: 1684 PPCODE:
1609{ 1685{
1610 int vx, vy;
1611 int x, y; 1686 int x, y;
1612 int sw4 = (sw + 3) & ~3; 1687 int sw4 = (sw + 3) & ~3;
1613 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh)); 1688 SV *darkness_sv = sv_2mortal (newSV (sw4 * sh));
1614 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv); 1689 uint8_t *darkness = (uint8_t *)SvPVX (darkness_sv);
1615 1690
1616 memset (darkness, 255, sw4 * sh); 1691 memset (darkness, 255, sw4 * sh);
1617 SvPOK_only (darkness_sv); 1692 SvPOK_only (darkness_sv);
1618 SvCUR_set (darkness_sv, sw4 * sh); 1693 SvCUR_set (darkness_sv, sw4 * sh);
1619 1694
1620 vx = self->x + (self->w - sw + 1) / 2 - shift_x; 1695 mx += self->x;
1621 vy = self->y + (self->h - sh + 1) / 2 - shift_y; 1696 my += self->y;
1622 1697
1623 for (y = 0; y < sh; y++) 1698 for (y = 0; y < sh; y++)
1624 if (0 <= y + vy && y + vy < self->rows) 1699 if (0 <= y + my && y + my < self->rows)
1625 { 1700 {
1626 maprow *row = self->row + (y + vy); 1701 maprow *row = self->row + (y + my);
1627 1702
1628 for (x = 0; x < sw; x++) 1703 for (x = 0; x < sw; x++)
1629 if (row->c0 <= x + vx && x + vx < row->c1) 1704 if (row->c0 <= x + mx && x + mx < row->c1)
1630 { 1705 {
1631 mapcell *cell = row->col + (x + vx - row->c0); 1706 mapcell *cell = row->col + (x + mx - row->c0);
1632 1707
1633 darkness[y * sw4 + x] = cell->darkness 1708 darkness[y * sw4 + x] = cell->darkness
1634 ? 255 - (cell->darkness - 1) 1709 ? 255 - (cell->darkness - 1)
1635 : 255 - FOW_DARKNESS; 1710 : 255 - FOW_DARKNESS;
1636 } 1711 }

Diff Legend

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