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.252 by root, Fri Dec 28 17:30:33 2007 UTC vs.
Revision 1.267 by root, Sun Jul 20 02:55:36 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 (cell)->darkness = 0; \
375 (cell)->stat_hp = 0; \
376 (cell)->flags = 0; \
377 (cell)->player = 0; \
378 } while (0)
379
362static void 380static void
363map_blank (DC__Map self, int x0, int y0, int w, int h) 381map_blank (DC__Map self, int x0, int y0, int w, int h)
364{ 382{
365 int x, y; 383 int x, y;
366 maprow *row; 384 maprow *row;
… …
380 if (x >= row->c1) 398 if (x >= row->c1)
381 break; 399 break;
382 400
383 cell = row->col + x - row->c0; 401 cell = row->col + x - row->c0;
384 402
385 cell->darkness = 0; 403 CELL_CLEAR (cell);
386 cell->stat_hp = 0;
387 cell->flags = 0;
388 cell->player = 0;
389 } 404 }
390 } 405 }
391} 406}
392 407
393typedef struct { 408typedef struct {
… …
628 const_iv (KMOD_NUM), 643 const_iv (KMOD_NUM),
629 const_iv (KMOD_CAPS), 644 const_iv (KMOD_CAPS),
630 const_iv (KMOD_MODE), 645 const_iv (KMOD_MODE),
631 646
632 const_iv (MIX_DEFAULT_FORMAT), 647 const_iv (MIX_DEFAULT_FORMAT),
648
649 const_iv (SDL_INIT_TIMER),
650 const_iv (SDL_INIT_AUDIO),
651 const_iv (SDL_INIT_VIDEO),
652 const_iv (SDL_INIT_CDROM),
653 const_iv (SDL_INIT_JOYSTICK),
654 const_iv (SDL_INIT_EVERYTHING),
655 const_iv (SDL_INIT_NOPARACHUTE),
656 const_iv (SDL_INIT_EVENTTHREAD),
657
658 const_iv (SDL_GL_RED_SIZE),
659 const_iv (SDL_GL_GREEN_SIZE),
660 const_iv (SDL_GL_BLUE_SIZE),
661 const_iv (SDL_GL_ALPHA_SIZE),
662 const_iv (SDL_GL_DOUBLEBUFFER),
663 const_iv (SDL_GL_BUFFER_SIZE),
664 const_iv (SDL_GL_DEPTH_SIZE),
665 const_iv (SDL_GL_STENCIL_SIZE),
666 const_iv (SDL_GL_ACCUM_RED_SIZE),
667 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
668 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
669 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
670 const_iv (SDL_GL_STEREO),
671 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
672 const_iv (SDL_GL_MULTISAMPLESAMPLES),
673 const_iv (SDL_GL_ACCELERATED_VISUAL),
674 const_iv (SDL_GL_SWAP_CONTROL)
633# undef const_iv 675# undef const_iv
634 }; 676 };
635 677
636 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 678 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 679 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
666 CODE: 708 CODE:
667{ 709{
668 opengl_fontmap = pango_opengl_font_map_new (); 710 opengl_fontmap = pango_opengl_font_map_new ();
669 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 711 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); 712 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 713 /*pango_context_set_font_description (opengl_context, default_font);*/
714#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 715 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 716 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 717#endif
675} 718}
676 719
677char *
678SDL_GetError () 720char *SDL_GetError ()
679 721
680int 722int SDL_Init (U32 flags)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
682 723
683void 724int SDL_InitSubSystem (U32 flags)
725
726void SDL_QuitSubSystem (U32 flags)
727
684SDL_Quit () 728void SDL_Quit ()
729
730int SDL_GL_SetAttribute (int attr, int value)
731
732int SDL_GL_GetAttribute (int attr)
733 CODE:
734 if (SDL_GL_GetAttribute (attr, &RETVAL))
735 XSRETURN_UNDEF;
736 OUTPUT:
737 RETVAL
685 738
686void 739void
687SDL_ListModes (int rgb, int alpha) 740SDL_ListModes (int rgb, int alpha)
688 PPCODE: 741 PPCODE:
689{ 742{
… …
701 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 754 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
702 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 755 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
703 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 756 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
704 757
705 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 758 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); 759 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
709#endif
710 760
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 761 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 762
713 if (m && m != (SDL_Rect **)-1) 763 if (m && m != (SDL_Rect **)-1)
714 while (*m) 764 while (*m)
715 { 765 {
716 if ((*m)->w >= 800 && (*m)->h >= 480) 766 if ((*m)->w >= 400 && (*m)->h >= 300)
717 { 767 {
718 AV *av = newAV (); 768 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 769 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 770 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 771 av_push (av, newSViv (rgb));
… …
763SDL_GetKeyName (int sym) 813SDL_GetKeyName (int sym)
764 814
765int 815int
766SDL_GetAppState () 816SDL_GetAppState ()
767 817
818int
819SDL_GetModState ()
820
768void 821void
769poll_events () 822poll_events ()
770 PPCODE: 823 PPCODE:
771{ 824{
772 SDL_Event ev; 825 SDL_Event ev;
… …
781 { 834 {
782 case SDL_KEYDOWN: 835 case SDL_KEYDOWN:
783 case SDL_KEYUP: 836 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 837 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 838 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 839 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 */ 840 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); 841 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 842 break;
790 843
791 case SDL_ACTIVEEVENT: 844 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 845 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 863 x = ev.motion.x;
811 y = ev.motion.y; 864 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 865 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 866 }
814 867
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 868 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 869 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 870 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 871 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 872 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 873 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 874 }
822 break; 875 break;
823 876
824 case SDL_MOUSEBUTTONDOWN: 877 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 878 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 879 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 880
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 881 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 882 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 883 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 884 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
905 } 958 }
906 } 959 }
907#endif 960#endif
908} 961}
909 962
910void 963int
911add_font (char *file) 964add_font (char *file)
912 CODE: 965 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 966 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
967 OUTPUT:
968 RETVAL
914 969
915void 970void
916load_image_inline (SV *image_) 971load_image_inline (SV *image_)
917 ALIAS: 972 ALIAS:
918 load_image_file = 1 973 load_image_file = 1
… …
1328 PPCODE: 1383 PPCODE:
1329{ 1384{
1330 int line, x; 1385 int line, x;
1331 1386
1332 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1387 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1388#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1389 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1390 --line;
1336#endif 1391#endif
1337 EXTEND (SP, 2); 1392 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1393 PUSHs (sv_2mortal (newSViv (line)));
… …
1674 uint8_t ext, cmd; 1729 uint8_t ext, cmd;
1675 1730
1676 do 1731 do
1677 { 1732 {
1678 ext = *data++; 1733 ext = *data++;
1679 cmd = ext & 0x3f; 1734 cmd = ext & 0x7f;
1680 1735
1681 if (cmd < 4) 1736 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1; 1737 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health 1738 else if (cmd == 5) // health
1684 { 1739 {
… …
1687 } 1742 }
1688 else if (cmd == 6) // monster width 1743 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1; 1744 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47) 1745 else if (cmd == 0x47)
1691 { 1746 {
1692 if (*data == 4) 1747 if (*data == 1) cell->player = data [1];
1693 ; // decode player count 1748 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1749 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1750 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1694 1751
1695 data += *data + 1; 1752 data += *data + 1;
1696 } 1753 }
1697 else if (cmd == 8) // cell flags 1754 else if (cmd == 8) // cell flags
1698 cell->flags = *data++; 1755 cell->flags = *data++;
… …
1728 } 1785 }
1729 } 1786 }
1730 } 1787 }
1731 } 1788 }
1732 else 1789 else
1733 cell->darkness = 0; 1790 CELL_CLEAR (cell);
1734 } 1791 }
1735} 1792}
1736 OUTPUT: 1793 OUTPUT:
1737 RETVAL 1794 RETVAL
1738 1795
… …
1790} 1847}
1791 OUTPUT: 1848 OUTPUT:
1792 RETVAL 1849 RETVAL
1793 1850
1794void 1851void
1795draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1852draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1796 CODE: 1853 CODE:
1797{ 1854{
1798 int x, y, z; 1855 int x, y, z;
1799 1856
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1857 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1858 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) 1859 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1803 smooth_key skey; 1860 smooth_key skey;
1804 1861 int pl_x, pl_y;
1862 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 1863 rc_t *rc = rc_alloc ();
1806 rc_key_t key; 1864 rc_key_t key;
1807 rc_array_t *arr; 1865 rc_array_t *arr;
1866
1867 pl_tex.name = 0;
1808 1868
1809 // thats current max. sorry. 1869 // thats current max. sorry.
1810 if (sw > 255) sw = 255; 1870 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 1871 if (sh > 255) sh = 255;
1812 1872
… …
1867 tileid tile = cell->tile [z]; 1927 tileid tile = cell->tile [z];
1868 1928
1869 if (tile) 1929 if (tile)
1870 { 1930 {
1871 maptex tex = self->tex [tile]; 1931 maptex tex = self->tex [tile];
1872 int px, py; 1932 int px = (x + 1) * T - tex.w;
1933 int py = (y + 1) * T - tex.h;
1873 1934
1874 if (key.texname != tex.name) 1935 if (key.texname != tex.name)
1875 { 1936 {
1876 if (!tex.name) 1937 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 1938 tex = self->tex [2]; /* missing, replace by noface */
1878 1939
1879 key.texname = tex.name; 1940 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 1941 arr = rc_array (rc, &key);
1881 } 1942 }
1882 1943
1883 px = (x + 1) * T - tex.w; 1944 if (expect_false (cell->player == player) && expect_false (z == 2))
1884 py = (y + 1) * T - tex.h; 1945 {
1946 pl_x = px;
1947 pl_y = py;
1948 pl_tex = tex;
1949 continue;
1950 }
1885 1951
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1952 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1953 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); 1954 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); 1955 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1890 1956
1891 if (cell->flags && z == 2) 1957 if (expect_false (cell->flags) && expect_false (z == 2))
1892 { 1958 {
1893 // overlays such as the speech bubble, probably more to come 1959 // overlays such as the speech bubble, probably more to come
1894 if (cell->flags & 1) 1960 if (cell->flags & 1)
1895 { 1961 {
1896 maptex tex = self->tex [1]; 1962 maptex tex = self->tex [1];
… …
2033 glDisable (GL_TEXTURE_2D); 2099 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2100 key.texname = -1;
2035 } 2101 }
2036 2102
2037 hv_clear (smooth); 2103 hv_clear (smooth);
2104 }
2105
2106 if (pl_tex.name)
2107 {
2108 maptex tex = pl_tex;
2109 int px = pl_x + sdx;
2110 int py = pl_y + sdy;
2111
2112 key.texname = tex.name;
2113 arr = rc_array (rc, &key);
2114
2115 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2116 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2117 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2118 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2119
2120 rc_draw (rc);
2038 } 2121 }
2039 2122
2040 glDisable (GL_BLEND); 2123 glDisable (GL_BLEND);
2041 rc_free (rc); 2124 rc_free (rc);
2042 2125
… …
2279 else 2362 else
2280 *data++ = 0; 2363 *data++ = 0;
2281 } 2364 }
2282 } 2365 }
2283 2366
2367 /* if size is w*h + 5 then no data has been found */
2368 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2369 {
2284 SvPOK_only (data_sv); 2370 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2371 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2372 }
2373
2286 RETVAL = data_sv; 2374 RETVAL = data_sv;
2287} 2375}
2288 OUTPUT: 2376 OUTPUT:
2289 RETVAL 2377 RETVAL
2290 2378
2291void 2379void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2380set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2381 PPCODE:
2294{ 2382{
2295 int x, y, z; 2383 int x, y, z;
2296 int w, h; 2384 int w, h;
2297 int x1, y1; 2385 int x1, y1;
2386 STRLEN len;
2387 uint8_t *data, *end;
2388
2389 len = SvLEN (data_sv);
2390 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2391 data = SvPVbyte_nolen (data_sv);
2392 end = data + len + 8;
2393
2394 if (len < 5)
2395 XSRETURN_EMPTY;
2298 2396
2299 if (*data++ != 0) 2397 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2398 XSRETURN_EMPTY; /* version mismatch */
2301 2399
2302 w = *data++ << 8; w |= *data++; 2400 w = *data++ << 8; w |= *data++;
… …
2317 { 2415 {
2318 maprow *row = map_get_row (self, y); 2416 maprow *row = map_get_row (self, y);
2319 2417
2320 for (x = x0; x < x1; x++) 2418 for (x = x0; x < x1; x++)
2321 { 2419 {
2420 uint8_t flags;
2421
2422 if (data + 7 >= end)
2423 XSRETURN_EMPTY;
2424
2322 uint8_t flags = *data++; 2425 flags = *data++;
2323 2426
2324 if (flags) 2427 if (flags)
2325 { 2428 {
2326 mapcell *cell = row_get_cell (row, x); 2429 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2430 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2433 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2434 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2435
2333 if (cell->darkness == 0) 2436 if (cell->darkness == 0)
2334 { 2437 {
2335 cell->darkness = 0; 2438 /*cell->darkness = 0;*/
2439 EXTEND (SP, 3);
2336 2440
2337 for (z = 0; z <= 2; z++) 2441 for (z = 0; z <= 2; z++)
2338 { 2442 {
2339 tileid t = tile [z]; 2443 tileid t = tile [z];
2340 2444
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2445 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2446 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2447 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2448 need_texid (self, t);
2345 } 2449 }
2346 2450
2347 cell->tile [z] = t; 2451 cell->tile [z] = t;
2348 } 2452 }

Diff Legend

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