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.251 by root, Fri Dec 28 17:28:01 2007 UTC vs.
Revision 1.264 by root, Fri Jul 18 22:32:54 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));
… …
628 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
631 641
632 const_iv (MIX_DEFAULT_FORMAT), 642 const_iv (MIX_DEFAULT_FORMAT),
643
644 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO),
647 const_iv (SDL_INIT_CDROM),
648 const_iv (SDL_INIT_JOYSTICK),
649 const_iv (SDL_INIT_EVERYTHING),
650 const_iv (SDL_INIT_NOPARACHUTE),
651 const_iv (SDL_INIT_EVENTTHREAD),
652
653 const_iv (SDL_GL_RED_SIZE),
654 const_iv (SDL_GL_GREEN_SIZE),
655 const_iv (SDL_GL_BLUE_SIZE),
656 const_iv (SDL_GL_ALPHA_SIZE),
657 const_iv (SDL_GL_DOUBLEBUFFER),
658 const_iv (SDL_GL_BUFFER_SIZE),
659 const_iv (SDL_GL_DEPTH_SIZE),
660 const_iv (SDL_GL_STENCIL_SIZE),
661 const_iv (SDL_GL_ACCUM_RED_SIZE),
662 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
663 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL)
633# undef const_iv 670# undef const_iv
634 }; 671 };
635 672
636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 673 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
666 CODE: 703 CODE:
667{ 704{
668 opengl_fontmap = pango_opengl_font_map_new (); 705 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 706 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); 707 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 708 /*pango_context_set_font_description (opengl_context, default_font);*/
709#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 710 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 712#endif
675} 713}
676 714
677char *
678SDL_GetError () 715char *SDL_GetError ()
679 716
680int 717int SDL_Init (U32 flags)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
682 718
683void 719int SDL_InitSubSystem (U32 flags)
720
721void SDL_QuitSubSystem (U32 flags)
722
684SDL_Quit () 723void SDL_Quit ()
724
725int SDL_GL_SetAttribute (int attr, int value)
726
727int SDL_GL_GetAttribute (int attr)
728 CODE:
729 if (SDL_GL_GetAttribute (attr, &RETVAL))
730 XSRETURN_UNDEF;
731 OUTPUT:
732 RETVAL
685 733
686void 734void
687SDL_ListModes (int rgb, int alpha) 735SDL_ListModes (int rgb, int alpha)
688 PPCODE: 736 PPCODE:
689{ 737{
… …
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 749 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 750 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 751 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 752
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 753 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); 754 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 755
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 756 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 757
713 if (m && m != (SDL_Rect **)-1) 758 if (m && m != (SDL_Rect **)-1)
714 while (*m) 759 while (*m)
715 { 760 {
716 if ((*m)->w >= 800 && (*m)->h >= 480)
717 {
718 AV *av = newAV (); 761 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 762 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 763 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 764 av_push (av, newSViv (rgb));
722 av_push (av, newSViv (alpha)); 765 av_push (av, newSViv (alpha));
723 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 766 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
724 }
725 767
726 ++m; 768 ++m;
727 } 769 }
728} 770}
729 771
… …
762char * 804char *
763SDL_GetKeyName (int sym) 805SDL_GetKeyName (int sym)
764 806
765int 807int
766SDL_GetAppState () 808SDL_GetAppState ()
809
810int
811SDL_GetModState ()
767 812
768void 813void
769poll_events () 814poll_events ()
770 PPCODE: 815 PPCODE:
771{ 816{
… …
781 { 826 {
782 case SDL_KEYDOWN: 827 case SDL_KEYDOWN:
783 case SDL_KEYUP: 828 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 829 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 830 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 831 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 */ 832 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); 833 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 834 break;
790 835
791 case SDL_ACTIVEEVENT: 836 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 837 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 855 x = ev.motion.x;
811 y = ev.motion.y; 856 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 857 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 858 }
814 859
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 860 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 861 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 862 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 863 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 864 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 865 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 866 }
822 break; 867 break;
823 868
824 case SDL_MOUSEBUTTONDOWN: 869 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 870 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 871 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 872
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 873 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 874 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 875 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 876 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
905 } 950 }
906 } 951 }
907#endif 952#endif
908} 953}
909 954
910void 955int
911add_font (char *file) 956add_font (char *file)
912 CODE: 957 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 958 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
959 OUTPUT:
960 RETVAL
914 961
915void 962void
916load_image_inline (SV *image_) 963load_image_inline (SV *image_)
917 ALIAS: 964 ALIAS:
918 load_image_file = 1 965 load_image_file = 1
… …
1313void 1360void
1314cursor_pos (DC::Layout self, int index) 1361cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1362 PPCODE:
1316{ 1363{
1317 PangoRectangle pos; 1364 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, 0, &pos); 1365 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1366
1320 EXTEND (SP, 3); 1367 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE))); 1368 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE))); 1369 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE))); 1370 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
… …
1328 PPCODE: 1375 PPCODE:
1329{ 1376{
1330 int line, x; 1377 int line, x;
1331 1378
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1379 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1380#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1381 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1382 --line;
1336#endif 1383#endif
1337 EXTEND (SP, 2); 1384 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1385 PUSHs (sv_2mortal (newSViv (line)));
… …
1674 uint8_t ext, cmd; 1721 uint8_t ext, cmd;
1675 1722
1676 do 1723 do
1677 { 1724 {
1678 ext = *data++; 1725 ext = *data++;
1679 cmd = ext & 0x3f; 1726 cmd = ext & 0x7f;
1680 1727
1681 if (cmd < 4) 1728 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1; 1729 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health 1730 else if (cmd == 5) // health
1684 { 1731 {
… …
1687 } 1734 }
1688 else if (cmd == 6) // monster width 1735 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1; 1736 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47) 1737 else if (cmd == 0x47)
1691 { 1738 {
1692 if (*data == 4) 1739 if (*data == 1) cell->player = data [1];
1693 ; // decode player count 1740 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1741 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1742 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1694 1743
1695 data += *data + 1; 1744 data += *data + 1;
1696 } 1745 }
1697 else if (cmd == 8) // cell flags 1746 else if (cmd == 8) // cell flags
1698 cell->flags = *data++; 1747 cell->flags = *data++;
… …
1790} 1839}
1791 OUTPUT: 1840 OUTPUT:
1792 RETVAL 1841 RETVAL
1793 1842
1794void 1843void
1795draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1844draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1796 CODE: 1845 CODE:
1797{ 1846{
1798 int x, y, z; 1847 int x, y, z;
1799 1848
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1849 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1850 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) 1851 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1803 smooth_key skey; 1852 smooth_key skey;
1804 1853 int pl_x, pl_y;
1854 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 1855 rc_t *rc = rc_alloc ();
1806 rc_key_t key; 1856 rc_key_t key;
1807 rc_array_t *arr; 1857 rc_array_t *arr;
1858
1859 pl_tex.name = 0;
1808 1860
1809 // thats current max. sorry. 1861 // thats current max. sorry.
1810 if (sw > 255) sw = 255; 1862 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 1863 if (sh > 255) sh = 255;
1812 1864
… …
1867 tileid tile = cell->tile [z]; 1919 tileid tile = cell->tile [z];
1868 1920
1869 if (tile) 1921 if (tile)
1870 { 1922 {
1871 maptex tex = self->tex [tile]; 1923 maptex tex = self->tex [tile];
1872 int px, py; 1924 int px = (x + 1) * T - tex.w;
1925 int py = (y + 1) * T - tex.h;
1873 1926
1874 if (key.texname != tex.name) 1927 if (key.texname != tex.name)
1875 { 1928 {
1876 if (!tex.name) 1929 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 1930 tex = self->tex [2]; /* missing, replace by noface */
1878 1931
1879 key.texname = tex.name; 1932 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 1933 arr = rc_array (rc, &key);
1881 } 1934 }
1882 1935
1883 px = (x + 1) * T - tex.w; 1936 if (expect_false (cell->player == player) && expect_false (z == 2))
1884 py = (y + 1) * T - tex.h; 1937 {
1938 pl_x = px;
1939 pl_y = py;
1940 pl_tex = tex;
1941 continue;
1942 }
1885 1943
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1944 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1945 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); 1946 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); 1947 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890 1948
1891 if (cell->flags && z == 2) 1949 if (expect_false (cell->flags) && expect_false (z == 2))
1892 { 1950 {
1893 // overlays such as the speech bubble, probably more to come 1951 // overlays such as the speech bubble, probably more to come
1894 if (cell->flags & 1) 1952 if (cell->flags & 1)
1895 { 1953 {
1896 maptex tex = self->tex [1]; 1954 maptex tex = self->tex [1];
… …
2033 glDisable (GL_TEXTURE_2D); 2091 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2092 key.texname = -1;
2035 } 2093 }
2036 2094
2037 hv_clear (smooth); 2095 hv_clear (smooth);
2096 }
2097
2098 if (pl_tex.name)
2099 {
2100 maptex tex = pl_tex;
2101 int px = pl_x + pdx;
2102 int py = pl_y + pdy;
2103
2104 key.texname = tex.name;
2105 arr = rc_array (rc, &key);
2106
2107 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2108 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2109 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2110 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2111
2112 rc_draw (rc);
2038 } 2113 }
2039 2114
2040 glDisable (GL_BLEND); 2115 glDisable (GL_BLEND);
2041 rc_free (rc); 2116 rc_free (rc);
2042 2117
… …
2279 else 2354 else
2280 *data++ = 0; 2355 *data++ = 0;
2281 } 2356 }
2282 } 2357 }
2283 2358
2359 /* if size is w*h + 5 then no data has been found */
2360 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2361 {
2284 SvPOK_only (data_sv); 2362 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2363 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2364 }
2365
2286 RETVAL = data_sv; 2366 RETVAL = data_sv;
2287} 2367}
2288 OUTPUT: 2368 OUTPUT:
2289 RETVAL 2369 RETVAL
2290 2370
2291void 2371void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2372set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2373 PPCODE:
2294{ 2374{
2295 int x, y, z; 2375 int x, y, z;
2296 int w, h; 2376 int w, h;
2297 int x1, y1; 2377 int x1, y1;
2378 STRLEN len;
2379 uint8_t *data, *end;
2380
2381 len = SvLEN (data_sv);
2382 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2383 data = SvPVbyte_nolen (data_sv);
2384 end = data + len + 8;
2385
2386 if (len < 5)
2387 XSRETURN_EMPTY;
2298 2388
2299 if (*data++ != 0) 2389 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2390 XSRETURN_EMPTY; /* version mismatch */
2301 2391
2302 w = *data++ << 8; w |= *data++; 2392 w = *data++ << 8; w |= *data++;
… …
2317 { 2407 {
2318 maprow *row = map_get_row (self, y); 2408 maprow *row = map_get_row (self, y);
2319 2409
2320 for (x = x0; x < x1; x++) 2410 for (x = x0; x < x1; x++)
2321 { 2411 {
2412 uint8_t flags;
2413
2414 if (data + 7 >= end)
2415 XSRETURN_EMPTY;
2416
2322 uint8_t flags = *data++; 2417 flags = *data++;
2323 2418
2324 if (flags) 2419 if (flags)
2325 { 2420 {
2326 mapcell *cell = row_get_cell (row, x); 2421 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2422 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2425 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2426 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2427
2333 if (cell->darkness == 0) 2428 if (cell->darkness == 0)
2334 { 2429 {
2335 cell->darkness = 0; 2430 /*cell->darkness = 0;*/
2431 EXTEND (SP, 3);
2336 2432
2337 for (z = 0; z <= 2; z++) 2433 for (z = 0; z <= 2; z++)
2338 { 2434 {
2339 tileid t = tile [z]; 2435 tileid t = tile [z];
2340 2436
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2437 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2438 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2439 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2440 need_texid (self, t);
2345 } 2441 }
2346 2442
2347 cell->tile [z] = t; 2443 cell->tile [z] = t;
2348 } 2444 }

Diff Legend

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