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.242 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.269 by root, Sun Jul 20 03:46:02 2008 UTC

… …
46 46
47#include <glib/gmacros.h> 47#include <glib/gmacros.h>
48 48
49#include <pango/pango.h> 49#include <pango/pango.h>
50 50
51#ifndef PANGO_VERSION_CHECK
52# define PANGO_VERSION_CHECK(a,b,c) 0
53#endif
54
55#if !PANGO_VERSION_CHECK (1, 15, 2)
56# define pango_layout_get_line_readonly pango_layout_get_line
57# define pango_layout_get_lines_readonly pango_layout_get_lines
58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
60#endif
61
51#ifndef _WIN32 62#ifndef _WIN32
52# include <sys/types.h> 63# include <sys/types.h>
53# include <sys/socket.h> 64# include <sys/socket.h>
54# include <netinet/in.h> 65# include <netinet/in.h>
55# include <netinet/tcp.h> 66# include <netinet/tcp.h>
56# include <inttypes.h> 67# include <inttypes.h>
57#endif 68#endif
58 69
70#if __GNUC__ >= 4
71# define expect(expr,value) __builtin_expect ((expr),(value))
72#else
73# define expect(expr,value) (expr)
74#endif
75
76#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1)
78
59#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
60 80
61#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
62 82
63#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
64#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
65 85
66#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
67 87
68#if 0 88/* mask out modifiers we are not interested in */
69# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
70#else
71# define PARACHUTE 0
72#endif
73 90
74static AV *texture_av; 91static AV *texture_av;
75 92
76static struct 93static struct
77{ 94{
… …
171 188
172static void 189static void
173layout_update_font (DC__Layout self) 190layout_update_font (DC__Layout self)
174{ 191{
175 /* use a random scale factor to account for unknown descenders, 0.8 works 192 /* use a random scale factor to account for unknown descenders, 0.8 works
176 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
177 */ 194 */
178 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
179 196
180 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
181 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
350 self->oy = 0; 367 self->oy = 0;
351 self->row = 0; 368 self->row = 0;
352 self->rows = 0; 369 self->rows = 0;
353} 370}
354 371
372#define CELL_CLEAR(cell) \
373 do { \
374 if ((cell)->player) \
375 (cell)->tile [2] = 0; \
376 (cell)->darkness = 0; \
377 (cell)->stat_hp = 0; \
378 (cell)->flags = 0; \
379 (cell)->player = 0; \
380 } while (0)
381
355static void 382static void
356map_blank (DC__Map self, int x0, int y0, int w, int h) 383map_blank (DC__Map self, int x0, int y0, int w, int h)
357{ 384{
358 int x, y; 385 int x, y;
359 maprow *row; 386 maprow *row;
… …
373 if (x >= row->c1) 400 if (x >= row->c1)
374 break; 401 break;
375 402
376 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
377 404
378 cell->darkness = 0; 405 CELL_CLEAR (cell);
379 cell->stat_hp = 0;
380 cell->flags = 0;
381 cell->player = 0;
382 } 406 }
383 } 407 }
384} 408}
385 409
386typedef struct { 410typedef struct {
… …
621 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
624 648
625 const_iv (MIX_DEFAULT_FORMAT), 649 const_iv (MIX_DEFAULT_FORMAT),
650
651 const_iv (SDL_INIT_TIMER),
652 const_iv (SDL_INIT_AUDIO),
653 const_iv (SDL_INIT_VIDEO),
654 const_iv (SDL_INIT_CDROM),
655 const_iv (SDL_INIT_JOYSTICK),
656 const_iv (SDL_INIT_EVERYTHING),
657 const_iv (SDL_INIT_NOPARACHUTE),
658 const_iv (SDL_INIT_EVENTTHREAD),
659
660 const_iv (SDL_GL_RED_SIZE),
661 const_iv (SDL_GL_GREEN_SIZE),
662 const_iv (SDL_GL_BLUE_SIZE),
663 const_iv (SDL_GL_ALPHA_SIZE),
664 const_iv (SDL_GL_DOUBLEBUFFER),
665 const_iv (SDL_GL_BUFFER_SIZE),
666 const_iv (SDL_GL_DEPTH_SIZE),
667 const_iv (SDL_GL_STENCIL_SIZE),
668 const_iv (SDL_GL_ACCUM_RED_SIZE),
669 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
670 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
671 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
672 const_iv (SDL_GL_STEREO),
673 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
674 const_iv (SDL_GL_MULTISAMPLESAMPLES),
675 const_iv (SDL_GL_ACCELERATED_VISUAL),
676 const_iv (SDL_GL_SWAP_CONTROL),
677
678 const_iv (FOW_DARKNESS)
626# undef const_iv 679# undef const_iv
627 }; 680 };
628 681
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 682 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 712 CODE:
660{ 713{
661 opengl_fontmap = pango_opengl_font_map_new (); 714 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 715 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
663 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 716 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
717 /*pango_context_set_font_description (opengl_context, default_font);*/
718#if PANGO_VERSION_CHECK (1, 15, 2)
719 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
720 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
721#endif
664} 722}
665 723
666char *
667SDL_GetError () 724char *SDL_GetError ()
668 725
669int 726int SDL_Init (U32 flags)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 727
672void 728int SDL_InitSubSystem (U32 flags)
729
730void SDL_QuitSubSystem (U32 flags)
731
673SDL_Quit () 732void SDL_Quit ()
733
734int SDL_GL_SetAttribute (int attr, int value)
735
736int SDL_GL_GetAttribute (int attr)
737 CODE:
738 if (SDL_GL_GetAttribute (attr, &RETVAL))
739 XSRETURN_UNDEF;
740 OUTPUT:
741 RETVAL
674 742
675void 743void
676SDL_ListModes (int rgb, int alpha) 744SDL_ListModes (int rgb, int alpha)
677 PPCODE: 745 PPCODE:
678{ 746{
… …
690 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 758 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
691 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 759 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
692 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 760 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
693 761
694 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 762 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
695#if SDL_VERSION_ATLEAST(1,2,10)
696 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
697 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 763 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
698#endif
699 764
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 765 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 766
702 if (m && m != (SDL_Rect **)-1) 767 if (m && m != (SDL_Rect **)-1)
703 while (*m) 768 while (*m)
704 { 769 {
705 if ((*m)->w >= 800 && (*m)->h >= 600) 770 if ((*m)->w >= 400 && (*m)->h >= 300)
706 { 771 {
707 AV *av = newAV (); 772 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 773 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 774 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 775 av_push (av, newSViv (rgb));
… …
752SDL_GetKeyName (int sym) 817SDL_GetKeyName (int sym)
753 818
754int 819int
755SDL_GetAppState () 820SDL_GetAppState ()
756 821
822int
823SDL_GetModState ()
824
757void 825void
758poll_events () 826poll_events ()
759 PPCODE: 827 PPCODE:
760{ 828{
761 SDL_Event ev; 829 SDL_Event ev;
… …
770 { 838 {
771 case SDL_KEYDOWN: 839 case SDL_KEYDOWN:
772 case SDL_KEYUP: 840 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 841 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 842 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 843 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
776 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 844 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
777 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 845 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 846 break;
779 847
780 case SDL_ACTIVEEVENT: 848 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 849 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 867 x = ev.motion.x;
800 y = ev.motion.y; 868 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 869 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 870 }
803 871
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 872 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 873 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 874 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 875 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 876 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 877 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 878 }
811 break; 879 break;
812 880
813 case SDL_MOUSEBUTTONDOWN: 881 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 882 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 883 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 884
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 885 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 886 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 887 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 888 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 962 }
895 } 963 }
896#endif 964#endif
897} 965}
898 966
899void 967int
900add_font (char *file) 968add_font (char *file)
901 CODE: 969 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 970 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
971 OUTPUT:
972 RETVAL
903 973
904void 974void
905load_image_inline (SV *image_) 975load_image_inline (SV *image_)
906 ALIAS: 976 ALIAS:
907 load_image_file = 1 977 load_image_file = 1
… …
1165{ 1235{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1236 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1237
1168 do 1238 do
1169 { 1239 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1240 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1241
1172 if (run && shape_attr_p (run)) 1242 if (run && shape_attr_p (run))
1173 { 1243 {
1174 PangoRectangle extents; 1244 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1245 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1349int
1280descent (DC::Layout self) 1350descent (DC::Layout self)
1281 CODE: 1351 CODE:
1282{ 1352{
1283 PangoRectangle rect; 1353 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1354 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1355 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1356 RETVAL = PANGO_DESCENT (rect);
1287} 1357}
1288 OUTPUT: 1358 OUTPUT:
1289 RETVAL 1359 RETVAL
… …
1301 1371
1302void 1372void
1303cursor_pos (DC::Layout self, int index) 1373cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1374 PPCODE:
1305{ 1375{
1306 PangoRectangle strong_pos; 1376 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1377 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1378
1309 EXTEND (SP, 3); 1379 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1380 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1381 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1382 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1383}
1314 1384
1315void 1385void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1386index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1387 PPCODE:
1318{ 1388{
1319 int line, x; 1389 int line, x;
1320 1390
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1391 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1392#if !PANGO_VERSION_CHECK (1, 17, 3)
1322 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1393 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1323 1394 --line;
1395#endif
1324 EXTEND (SP, 2); 1396 EXTEND (SP, 2);
1325 PUSHs (sv_2mortal (newSViv (line - 1))); 1397 PUSHs (sv_2mortal (newSViv (line)));
1326 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1398 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1327} 1399}
1328 1400
1329void 1401void
1330line_x_to_index (DC::Layout self, int line, int x) 1402line_x_to_index (DC::Layout self, int line, int x)
… …
1334 int index, trailing; 1406 int index, trailing;
1335 1407
1336 if (line < 0) 1408 if (line < 0)
1337 XSRETURN_EMPTY; 1409 XSRETURN_EMPTY;
1338 1410
1339 if (!(lp = pango_layout_get_line (self->pl, line))) 1411 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1340 XSRETURN_EMPTY; /* do better */ 1412 XSRETURN_EMPTY; /* do better */
1341 1413
1342 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1414 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1343 1415
1344 EXTEND (SP, 2); 1416 EXTEND (SP, 2);
… …
1661 uint8_t ext, cmd; 1733 uint8_t ext, cmd;
1662 1734
1663 do 1735 do
1664 { 1736 {
1665 ext = *data++; 1737 ext = *data++;
1666 cmd = ext & 0x3f; 1738 cmd = ext & 0x7f;
1667 1739
1668 if (cmd < 4) 1740 if (cmd < 4)
1669 cell->darkness = 255 - ext * 64 + 1; 1741 cell->darkness = 255 - ext * 64 + 1;
1670 else if (cmd == 5) // health 1742 else if (cmd == 5) // health
1671 { 1743 {
… …
1674 } 1746 }
1675 else if (cmd == 6) // monster width 1747 else if (cmd == 6) // monster width
1676 cell->stat_width = *data++ + 1; 1748 cell->stat_width = *data++ + 1;
1677 else if (cmd == 0x47) 1749 else if (cmd == 0x47)
1678 { 1750 {
1679 if (*data == 4) 1751 if (*data == 1) cell->player = data [1];
1680 ; // decode player count 1752 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1753 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1754 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1681 1755
1682 data += *data + 1; 1756 data += *data + 1;
1683 } 1757 }
1684 else if (cmd == 8) // cell flags 1758 else if (cmd == 8) // cell flags
1685 cell->flags = *data++; 1759 cell->flags = *data++;
… …
1715 } 1789 }
1716 } 1790 }
1717 } 1791 }
1718 } 1792 }
1719 else 1793 else
1720 cell->darkness = 0; 1794 CELL_CLEAR (cell);
1721 } 1795 }
1722} 1796}
1723 OUTPUT: 1797 OUTPUT:
1724 RETVAL 1798 RETVAL
1725 1799
… …
1777} 1851}
1778 OUTPUT: 1852 OUTPUT:
1779 RETVAL 1853 RETVAL
1780 1854
1781void 1855void
1782draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1856draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1783 CODE: 1857 CODE:
1784{ 1858{
1785 int x, y, z; 1859 int x, y, z;
1786 1860
1787 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1861 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1788 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1862 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1789 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1863 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1790 smooth_key skey; 1864 smooth_key skey;
1791 1865 int pl_x, pl_y;
1866 maptex pl_tex;
1792 rc_t *rc = rc_alloc (); 1867 rc_t *rc = rc_alloc ();
1793 rc_key_t key; 1868 rc_key_t key;
1794 rc_array_t *arr; 1869 rc_array_t *arr;
1870
1871 pl_tex.name = 0;
1795 1872
1796 // thats current max. sorry. 1873 // thats current max. sorry.
1797 if (sw > 255) sw = 255; 1874 if (sw > 255) sw = 255;
1798 if (sh > 255) sh = 255; 1875 if (sh > 255) sh = 255;
1799 1876
… …
1854 tileid tile = cell->tile [z]; 1931 tileid tile = cell->tile [z];
1855 1932
1856 if (tile) 1933 if (tile)
1857 { 1934 {
1858 maptex tex = self->tex [tile]; 1935 maptex tex = self->tex [tile];
1859 int px, py; 1936 int px = (x + 1) * T - tex.w;
1937 int py = (y + 1) * T - tex.h;
1860 1938
1861 if (key.texname != tex.name) 1939 if (key.texname != tex.name)
1862 { 1940 {
1863 if (!tex.name) 1941 if (!tex.name)
1864 tex = self->tex [2]; /* missing, replace by noface */ 1942 tex = self->tex [2]; /* missing, replace by noface */
1865 1943
1866 key.texname = tex.name; 1944 key.texname = tex.name;
1867 arr = rc_array (rc, &key); 1945 arr = rc_array (rc, &key);
1868 } 1946 }
1869 1947
1870 px = (x + 1) * T - tex.w; 1948 if (expect_false (cell->player == player) && expect_false (z == 2))
1871 py = (y + 1) * T - tex.h; 1949 {
1950 pl_x = px;
1951 pl_y = py;
1952 pl_tex = tex;
1953 continue;
1954 }
1872 1955
1873 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1956 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1874 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1957 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1875 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1958 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1876 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1959 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1877 1960
1878 if (cell->flags && z == 2) 1961 if (expect_false (cell->flags) && expect_false (z == 2))
1879 { 1962 {
1880 // overlays such as the speech bubble, probably more to come 1963 // overlays such as the speech bubble, probably more to come
1881 if (cell->flags & 1) 1964 if (cell->flags & 1)
1882 { 1965 {
1883 maptex tex = self->tex [1]; 1966 maptex tex = self->tex [1];
… …
2022 } 2105 }
2023 2106
2024 hv_clear (smooth); 2107 hv_clear (smooth);
2025 } 2108 }
2026 2109
2110 if (pl_tex.name)
2111 {
2112 maptex tex = pl_tex;
2113 int px = pl_x + sdx;
2114 int py = pl_y + sdy;
2115
2116 key.texname = tex.name;
2117 arr = rc_array (rc, &key);
2118
2119 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2120 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2121 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2122 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2123
2124 rc_draw (rc);
2125 }
2126
2027 glDisable (GL_BLEND); 2127 glDisable (GL_BLEND);
2028 rc_free (rc); 2128 rc_free (rc);
2029 2129
2030 // top layer: overlays such as the health bar 2130 // top layer: overlays such as the health bar
2031 for (y = 0; y < sh; y++) 2131 for (y = 0; y < sh; y++)
… …
2136 SvCUR_set (darkness3_sv, sw34 * sh3); 2236 SvCUR_set (darkness3_sv, sw34 * sh3);
2137 2237
2138 mx += self->x - 1; 2238 mx += self->x - 1;
2139 my += self->y - 1; 2239 my += self->y - 1;
2140 2240
2141 memset (darkness1, 255, sw1 * sh1); 2241 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2142 2242
2143 for (y = 0; y < sh1; y++) 2243 for (y = 0; y < sh1; y++)
2144 if (0 <= y + my && y + my < self->rows) 2244 if (0 <= y + my && y + my < self->rows)
2145 { 2245 {
2146 maprow *row = self->row + (y + my); 2246 maprow *row = self->row + (y + my);
… …
2266 else 2366 else
2267 *data++ = 0; 2367 *data++ = 0;
2268 } 2368 }
2269 } 2369 }
2270 2370
2371 /* if size is w*h + 5 then no data has been found */
2372 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2373 {
2271 SvPOK_only (data_sv); 2374 SvPOK_only (data_sv);
2272 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2375 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2376 }
2377
2273 RETVAL = data_sv; 2378 RETVAL = data_sv;
2274} 2379}
2275 OUTPUT: 2380 OUTPUT:
2276 RETVAL 2381 RETVAL
2277 2382
2278void 2383void
2279set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2384set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2280 PPCODE: 2385 PPCODE:
2281{ 2386{
2282 int x, y, z; 2387 int x, y, z;
2283 int w, h; 2388 int w, h;
2284 int x1, y1; 2389 int x1, y1;
2390 STRLEN len;
2391 uint8_t *data, *end;
2392
2393 len = SvLEN (data_sv);
2394 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2395 data = SvPVbyte_nolen (data_sv);
2396 end = data + len + 8;
2397
2398 if (len < 5)
2399 XSRETURN_EMPTY;
2285 2400
2286 if (*data++ != 0) 2401 if (*data++ != 0)
2287 XSRETURN_EMPTY; /* version mismatch */ 2402 XSRETURN_EMPTY; /* version mismatch */
2288 2403
2289 w = *data++ << 8; w |= *data++; 2404 w = *data++ << 8; w |= *data++;
… …
2304 { 2419 {
2305 maprow *row = map_get_row (self, y); 2420 maprow *row = map_get_row (self, y);
2306 2421
2307 for (x = x0; x < x1; x++) 2422 for (x = x0; x < x1; x++)
2308 { 2423 {
2424 uint8_t flags;
2425
2426 if (data + 7 >= end)
2427 XSRETURN_EMPTY;
2428
2309 uint8_t flags = *data++; 2429 flags = *data++;
2310 2430
2311 if (flags) 2431 if (flags)
2312 { 2432 {
2313 mapcell *cell = row_get_cell (row, x); 2433 mapcell *cell = row_get_cell (row, x);
2314 tileid tile[3] = { 0, 0, 0 }; 2434 tileid tile[3] = { 0, 0, 0 };
… …
2317 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2437 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2318 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2438 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2319 2439
2320 if (cell->darkness == 0) 2440 if (cell->darkness == 0)
2321 { 2441 {
2322 cell->darkness = 0; 2442 /*cell->darkness = 0;*/
2443 EXTEND (SP, 3);
2323 2444
2324 for (z = 0; z <= 2; z++) 2445 for (z = 0; z <= 2; z++)
2325 { 2446 {
2326 tileid t = tile [z]; 2447 tileid t = tile [z];
2327 2448
2328 if (t >= self->texs || (t && !self->tex [t].name)) 2449 if (t >= self->texs || (t && !self->tex [t].name))
2329 { 2450 {
2330 XPUSHs (sv_2mortal (newSViv (t))); 2451 PUSHs (sv_2mortal (newSViv (t)));
2331 need_texid (self, t); 2452 need_texid (self, t);
2332 } 2453 }
2333 2454
2334 cell->tile [z] = t; 2455 cell->tile [z] = t;
2335 } 2456 }
… …
2846void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column) 2967void glSeparableFilter2D (int target, int internalformat, int width, int height, int format, int type, char *row, char *column)
2847 CODE: 2968 CODE:
2848 if (gl.SeparableFilter2D) 2969 if (gl.SeparableFilter2D)
2849 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column); 2970 gl.SeparableFilter2D (target, internalformat, width, height, format, type, row, column);
2850 2971
2851void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data) 2972void glTexImage2D (int target, int level, int internalformat, int width, int height, int border, int format, int type, char *data = 0)
2852 2973
2853void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border) 2974void glCopyTexImage2D (int target, int level, int internalformat, int x, int y, int width, int height, int border)
2854 2975
2855void glDrawPixels (int width, int height, int format, int type, char *pixels) 2976void glDrawPixels (int width, int height, int format, int type, char *pixels)
2856 2977

Diff Legend

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