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.250 by root, Fri Dec 28 16:09:03 2007 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 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#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2)) 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)
52# define pango_layout_get_line_readonly pango_layout_get_line_readonly 56# define pango_layout_get_line_readonly pango_layout_get_line
53# define pango_layout_get_lines_readonly pango_layout_get_lines_readonly 57# define pango_layout_get_lines_readonly pango_layout_get_lines
54# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line_readonly 58# define pango_layout_iter_get_line_readonly pango_layout_iter_get_line
55# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run_readonly 59# define pango_layout_iter_get_run_readonly pango_layout_iter_get_run
56#endif 60#endif
57 61
58#ifndef _WIN32 62#ifndef _WIN32
59# include <sys/types.h> 63# include <sys/types.h>
60# include <sys/socket.h> 64# include <sys/socket.h>
61# include <netinet/in.h> 65# include <netinet/in.h>
62# include <netinet/tcp.h> 66# include <netinet/tcp.h>
63# include <inttypes.h> 67# include <inttypes.h>
64#endif 68#endif
65 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
66#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
67 80
68#define FOW_DARKNESS 32 81#define FOW_DARKNESS 32
69 82
70#define MAP_EXTEND_X 32 83#define MAP_EXTEND_X 32
71#define MAP_EXTEND_Y 512 84#define MAP_EXTEND_Y 512
72 85
73#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
74 87
75#if 0 88/* mask out modifiers we are not interested in */
76# define PARACHUTE SDL_INIT_NOPARACHUTE 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77#else
78# define PARACHUTE 0
79#endif
80 90
81static AV *texture_av; 91static AV *texture_av;
82 92
83static struct 93static struct
84{ 94{
… …
178 188
179static void 189static void
180layout_update_font (DC__Layout self) 190layout_update_font (DC__Layout self)
181{ 191{
182 /* 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
183 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
184 */ 194 */
185 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
186 196
187 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
188 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
357 self->oy = 0; 367 self->oy = 0;
358 self->row = 0; 368 self->row = 0;
359 self->rows = 0; 369 self->rows = 0;
360} 370}
361 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
362static void 382static void
363map_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)
364{ 384{
365 int x, y; 385 int x, y;
366 maprow *row; 386 maprow *row;
… …
380 if (x >= row->c1) 400 if (x >= row->c1)
381 break; 401 break;
382 402
383 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
384 404
385 cell->darkness = 0; 405 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 406 }
390 } 407 }
391} 408}
392 409
393typedef struct { 410typedef struct {
… …
628 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
631 648
632 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)
633# undef const_iv 679# undef const_iv
634 }; 680 };
635 681
636 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; )
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
655 701
656NV floor (NV x) 702NV floor (NV x)
657 703
658NV ceil (NV x) 704NV ceil (NV x)
659 705
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
660IV minpot (UV n) 712IV minpot (UV n)
661 713
662IV popcount (UV n) 714IV popcount (UV n)
663 715
664void 716void
… …
666 CODE: 718 CODE:
667{ 719{
668 opengl_fontmap = pango_opengl_font_map_new (); 720 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 721 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 722 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 723 /*pango_context_set_font_description (opengl_context, default_font);*/
724#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 725 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 727#endif
675} 728}
676 729
677char *
678SDL_GetError () 730char *SDL_GetError ()
679 731
680int 732int SDL_Init (U32 flags)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
682 733
683void 734int SDL_InitSubSystem (U32 flags)
735
736void SDL_QuitSubSystem (U32 flags)
737
684SDL_Quit () 738void SDL_Quit ()
739
740int SDL_GL_SetAttribute (int attr, int value)
741
742int SDL_GL_GetAttribute (int attr)
743 CODE:
744 if (SDL_GL_GetAttribute (attr, &RETVAL))
745 XSRETURN_UNDEF;
746 OUTPUT:
747 RETVAL
685 748
686void 749void
687SDL_ListModes (int rgb, int alpha) 750SDL_ListModes (int rgb, int alpha)
688 PPCODE: 751 PPCODE:
689{ 752{
… …
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 764 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 765 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 766 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 767
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 768 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
706#if SDL_VERSION_ATLEAST(1,2,10)
707 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
708 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 769 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 770
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 771 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 772
713 if (m && m != (SDL_Rect **)-1) 773 if (m && m != (SDL_Rect **)-1)
714 while (*m) 774 while (*m)
715 { 775 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 776 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 777 {
718 AV *av = newAV (); 778 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 779 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 780 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 781 av_push (av, newSViv (rgb));
… …
763SDL_GetKeyName (int sym) 823SDL_GetKeyName (int sym)
764 824
765int 825int
766SDL_GetAppState () 826SDL_GetAppState ()
767 827
828int
829SDL_GetModState ()
830
768void 831void
769poll_events () 832poll_events ()
770 PPCODE: 833 PPCODE:
771{ 834{
772 SDL_Event ev; 835 SDL_Event ev;
… …
781 { 844 {
782 case SDL_KEYDOWN: 845 case SDL_KEYDOWN:
783 case SDL_KEYUP: 846 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 847 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 848 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 849 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0);
787 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState ()), 0); /* current mode */ 850 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 851 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 852 break;
790 853
791 case SDL_ACTIVEEVENT: 854 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 855 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 873 x = ev.motion.x;
811 y = ev.motion.y; 874 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 875 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 876 }
814 877
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 878 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 879 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 880 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 881 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 882 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 883 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 884 }
822 break; 885 break;
823 886
824 case SDL_MOUSEBUTTONDOWN: 887 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 888 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 889 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 890
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 891 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 892 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 893 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 894 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
905 } 968 }
906 } 969 }
907#endif 970#endif
908} 971}
909 972
910void 973int
911add_font (char *file) 974add_font (char *file)
912 CODE: 975 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT:
978 RETVAL
914 979
915void 980void
916load_image_inline (SV *image_) 981load_image_inline (SV *image_)
917 ALIAS: 982 ALIAS:
918 load_image_file = 1 983 load_image_file = 1
… …
1312 1377
1313void 1378void
1314cursor_pos (DC::Layout self, int index) 1379cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1380 PPCODE:
1316{ 1381{
1317 PangoRectangle strong_pos; 1382 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1383 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1384
1320 EXTEND (SP, 3); 1385 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1386 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1387 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1388 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324} 1389}
1325 1390
1326void 1391void
1327index_to_line_x (DC::Layout self, int index, int trailing = 0) 1392index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328 PPCODE: 1393 PPCODE:
1329{ 1394{
1330 int line, x; 1395 int line, x;
1331 1396
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1397 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1398#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1399 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1400 --line;
1336#endif 1401#endif
1337 EXTEND (SP, 2); 1402 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1403 PUSHs (sv_2mortal (newSViv (line)));
… …
1674 uint8_t ext, cmd; 1739 uint8_t ext, cmd;
1675 1740
1676 do 1741 do
1677 { 1742 {
1678 ext = *data++; 1743 ext = *data++;
1679 cmd = ext & 0x3f; 1744 cmd = ext & 0x7f;
1680 1745
1681 if (cmd < 4) 1746 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1; 1747 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health 1748 else if (cmd == 5) // health
1684 { 1749 {
… …
1687 } 1752 }
1688 else if (cmd == 6) // monster width 1753 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1; 1754 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47) 1755 else if (cmd == 0x47)
1691 { 1756 {
1692 if (*data == 4) 1757 if (*data == 1) cell->player = data [1];
1693 ; // decode player count 1758 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1759 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1760 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1694 1761
1695 data += *data + 1; 1762 data += *data + 1;
1696 } 1763 }
1697 else if (cmd == 8) // cell flags 1764 else if (cmd == 8) // cell flags
1698 cell->flags = *data++; 1765 cell->flags = *data++;
… …
1728 } 1795 }
1729 } 1796 }
1730 } 1797 }
1731 } 1798 }
1732 else 1799 else
1733 cell->darkness = 0; 1800 CELL_CLEAR (cell);
1734 } 1801 }
1735} 1802}
1736 OUTPUT: 1803 OUTPUT:
1737 RETVAL 1804 RETVAL
1738 1805
… …
1790} 1857}
1791 OUTPUT: 1858 OUTPUT:
1792 RETVAL 1859 RETVAL
1793 1860
1794void 1861void
1795draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1862draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1796 CODE: 1863 CODE:
1797{ 1864{
1798 int x, y, z; 1865 int x, y, z;
1799 1866
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1868 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1802 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1869 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1803 smooth_key skey; 1870 smooth_key skey;
1804 1871 int pl_x, pl_y;
1872 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 1873 rc_t *rc = rc_alloc ();
1806 rc_key_t key; 1874 rc_key_t key;
1807 rc_array_t *arr; 1875 rc_array_t *arr;
1876
1877 pl_tex.name = 0;
1808 1878
1809 // thats current max. sorry. 1879 // thats current max. sorry.
1810 if (sw > 255) sw = 255; 1880 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 1881 if (sh > 255) sh = 255;
1812 1882
… …
1867 tileid tile = cell->tile [z]; 1937 tileid tile = cell->tile [z];
1868 1938
1869 if (tile) 1939 if (tile)
1870 { 1940 {
1871 maptex tex = self->tex [tile]; 1941 maptex tex = self->tex [tile];
1872 int px, py; 1942 int px = (x + 1) * T - tex.w;
1943 int py = (y + 1) * T - tex.h;
1873 1944
1874 if (key.texname != tex.name) 1945 if (key.texname != tex.name)
1875 { 1946 {
1876 if (!tex.name) 1947 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 1948 tex = self->tex [2]; /* missing, replace by noface */
1878 1949
1879 key.texname = tex.name; 1950 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 1951 arr = rc_array (rc, &key);
1881 } 1952 }
1882 1953
1883 px = (x + 1) * T - tex.w; 1954 if (expect_false (cell->player == player) && expect_false (z == 2))
1884 py = (y + 1) * T - tex.h; 1955 {
1956 pl_x = px;
1957 pl_y = py;
1958 pl_tex = tex;
1959 continue;
1960 }
1885 1961
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1963 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1888 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1964 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1889 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1965 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890 1966
1891 if (cell->flags && z == 2) 1967 if (expect_false (cell->flags) && expect_false (z == 2))
1892 { 1968 {
1893 // overlays such as the speech bubble, probably more to come 1969 // overlays such as the speech bubble, probably more to come
1894 if (cell->flags & 1) 1970 if (cell->flags & 1)
1895 { 1971 {
1896 maptex tex = self->tex [1]; 1972 maptex tex = self->tex [1];
… …
2035 } 2111 }
2036 2112
2037 hv_clear (smooth); 2113 hv_clear (smooth);
2038 } 2114 }
2039 2115
2116 if (pl_tex.name)
2117 {
2118 maptex tex = pl_tex;
2119 int px = pl_x + sdx;
2120 int py = pl_y + sdy;
2121
2122 key.texname = tex.name;
2123 arr = rc_array (rc, &key);
2124
2125 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2126 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2127 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2128 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2129
2130 rc_draw (rc);
2131 }
2132
2040 glDisable (GL_BLEND); 2133 glDisable (GL_BLEND);
2041 rc_free (rc); 2134 rc_free (rc);
2042 2135
2043 // top layer: overlays such as the health bar 2136 // top layer: overlays such as the health bar
2044 for (y = 0; y < sh; y++) 2137 for (y = 0; y < sh; y++)
… …
2149 SvCUR_set (darkness3_sv, sw34 * sh3); 2242 SvCUR_set (darkness3_sv, sw34 * sh3);
2150 2243
2151 mx += self->x - 1; 2244 mx += self->x - 1;
2152 my += self->y - 1; 2245 my += self->y - 1;
2153 2246
2154 memset (darkness1, 255, sw1 * sh1); 2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2155 2248
2156 for (y = 0; y < sh1; y++) 2249 for (y = 0; y < sh1; y++)
2157 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2158 { 2251 {
2159 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
… …
2279 else 2372 else
2280 *data++ = 0; 2373 *data++ = 0;
2281 } 2374 }
2282 } 2375 }
2283 2376
2377 /* if size is w*h + 5 then no data has been found */
2378 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2379 {
2284 SvPOK_only (data_sv); 2380 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 }
2383
2286 RETVAL = data_sv; 2384 RETVAL = data_sv;
2287} 2385}
2288 OUTPUT: 2386 OUTPUT:
2289 RETVAL 2387 RETVAL
2290 2388
2291void 2389void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2390set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2391 PPCODE:
2294{ 2392{
2295 int x, y, z; 2393 int x, y, z;
2296 int w, h; 2394 int w, h;
2297 int x1, y1; 2395 int x1, y1;
2396 STRLEN len;
2397 uint8_t *data, *end;
2398
2399 len = SvLEN (data_sv);
2400 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2401 data = SvPVbyte_nolen (data_sv);
2402 end = data + len + 8;
2403
2404 if (len < 5)
2405 XSRETURN_EMPTY;
2298 2406
2299 if (*data++ != 0) 2407 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2408 XSRETURN_EMPTY; /* version mismatch */
2301 2409
2302 w = *data++ << 8; w |= *data++; 2410 w = *data++ << 8; w |= *data++;
… …
2317 { 2425 {
2318 maprow *row = map_get_row (self, y); 2426 maprow *row = map_get_row (self, y);
2319 2427
2320 for (x = x0; x < x1; x++) 2428 for (x = x0; x < x1; x++)
2321 { 2429 {
2430 uint8_t flags;
2431
2432 if (data + 7 >= end)
2433 XSRETURN_EMPTY;
2434
2322 uint8_t flags = *data++; 2435 flags = *data++;
2323 2436
2324 if (flags) 2437 if (flags)
2325 { 2438 {
2326 mapcell *cell = row_get_cell (row, x); 2439 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2440 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2443 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2444 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2445
2333 if (cell->darkness == 0) 2446 if (cell->darkness == 0)
2334 { 2447 {
2335 cell->darkness = 0; 2448 /*cell->darkness = 0;*/
2449 EXTEND (SP, 3);
2336 2450
2337 for (z = 0; z <= 2; z++) 2451 for (z = 0; z <= 2; z++)
2338 { 2452 {
2339 tileid t = tile [z]; 2453 tileid t = tile [z];
2340 2454
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2455 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2456 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2457 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2458 need_texid (self, t);
2345 } 2459 }
2346 2460
2347 cell->tile [z] = t; 2461 cell->tile [z] = t;
2348 } 2462 }

Diff Legend

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