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.245 by root, Fri Dec 28 15:05:20 2007 UTC vs.
Revision 1.263 by root, Fri Jul 18 21:18:42 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));
… …
621 const_iv (KMOD_NUM), 638 const_iv (KMOD_NUM),
622 const_iv (KMOD_CAPS), 639 const_iv (KMOD_CAPS),
623 const_iv (KMOD_MODE), 640 const_iv (KMOD_MODE),
624 641
625 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),
626# undef const_iv 652# undef const_iv
627 }; 653 };
628 654
629 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 655 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
630 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
659 CODE: 685 CODE:
660{ 686{
661 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
662 pango_opengl_font_map_set_default_substitute ((PangoOpenGLFontMap *)opengl_fontmap, substitute_func, 0, 0); 688 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); 689 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
690 /*pango_context_set_font_description (opengl_context, default_font);*/
691#if PANGO_VERSION_CHECK (1, 15, 2)
692 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
693 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
694#endif
664} 695}
665 696
666char *
667SDL_GetError () 697char *SDL_GetError ()
668 698
669int 699int SDL_Init (U32 flags)
670SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
671 700
672void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
673SDL_Quit () 705void SDL_Quit ()
674 706
675void 707void
676SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
677 PPCODE: 709 PPCODE:
678{ 710{
… …
700 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
701 733
702 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
703 while (*m) 735 while (*m)
704 { 736 {
705 if ((*m)->w >= 800 && (*m)->h >= 480)
706 {
707 AV *av = newAV (); 737 AV *av = newAV ();
708 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
709 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
710 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
711 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
712 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
713 }
714 743
715 ++m; 744 ++m;
716 } 745 }
717} 746}
718 747
… …
751char * 780char *
752SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
753 782
754int 783int
755SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
756 788
757void 789void
758poll_events () 790poll_events ()
759 PPCODE: 791 PPCODE:
760{ 792{
… …
770 { 802 {
771 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
772 case SDL_KEYUP: 804 case SDL_KEYUP:
773 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
774 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
775 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod), 0); 807 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 */ 808 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); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
778 break; 810 break;
779 811
780 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
781 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
799 x = ev.motion.x; 831 x = ev.motion.x;
800 y = ev.motion.y; 832 y = ev.motion.y;
801 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
802 } 834 }
803 835
804 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
805 hv_store (hv, "state", 5, newSViv (state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
806 hv_store (hv, "x", 1, newSViv (x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
807 hv_store (hv, "y", 1, newSViv (y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
808 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
809 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
810 } 842 }
811 break; 843 break;
812 844
813 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
814 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 848
817 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
818 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
819 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
820 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
894 } 926 }
895 } 927 }
896#endif 928#endif
897} 929}
898 930
899void 931int
900add_font (char *file) 932add_font (char *file)
901 CODE: 933 CODE:
902 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
903 937
904void 938void
905load_image_inline (SV *image_) 939load_image_inline (SV *image_)
906 ALIAS: 940 ALIAS:
907 load_image_file = 1 941 load_image_file = 1
… …
1165{ 1199{
1166 PangoLayoutIter *iter = pango_layout_get_iter (self->pl); 1200 PangoLayoutIter *iter = pango_layout_get_iter (self->pl);
1167 1201
1168 do 1202 do
1169 { 1203 {
1170 PangoLayoutRun *run = pango_layout_iter_get_run (iter); 1204 PangoLayoutRun *run = pango_layout_iter_get_run_readonly (iter);
1171 1205
1172 if (run && shape_attr_p (run)) 1206 if (run && shape_attr_p (run))
1173 { 1207 {
1174 PangoRectangle extents; 1208 PangoRectangle extents;
1175 pango_layout_iter_get_run_extents (iter, 0, &extents); 1209 pango_layout_iter_get_run_extents (iter, 0, &extents);
… …
1279int 1313int
1280descent (DC::Layout self) 1314descent (DC::Layout self)
1281 CODE: 1315 CODE:
1282{ 1316{
1283 PangoRectangle rect; 1317 PangoRectangle rect;
1284 PangoLayoutLine *line = pango_layout_get_line (self->pl, 0); 1318 PangoLayoutLine *line = pango_layout_get_line_readonly (self->pl, 0);
1285 pango_layout_line_get_pixel_extents (line, 0, &rect); 1319 pango_layout_line_get_pixel_extents (line, 0, &rect);
1286 RETVAL = PANGO_DESCENT (rect); 1320 RETVAL = PANGO_DESCENT (rect);
1287} 1321}
1288 OUTPUT: 1322 OUTPUT:
1289 RETVAL 1323 RETVAL
… …
1301 1335
1302void 1336void
1303cursor_pos (DC::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1304 PPCODE: 1338 PPCODE:
1305{ 1339{
1306 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1307 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1308 1342
1309 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1310 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1311 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1312 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1313} 1347}
1314 1348
1315void 1349void
1316index_to_line_x (DC::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1317 PPCODE: 1351 PPCODE:
1318{ 1352{
1319 int line, x; 1353 int line, x;
1320 1354
1321 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x); 1355 pango_layout_index_to_line_x (self->pl, index, trailing, &line, &x);
1322
1323#if !PANGO_VERSION_CHECK (1, 17. 3) 1356#if !PANGO_VERSION_CHECK (1, 17, 3)
1324 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1325 --line; 1358 --line;
1326#endif 1359#endif
1327
1328 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1329 PUSHs (sv_2mortal (newSViv (line))); 1361 PUSHs (sv_2mortal (newSViv (line)));
1330 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE))); 1362 PUSHs (sv_2mortal (newSViv (x / PANGO_SCALE)));
1331} 1363}
1332 1364
… …
1338 int index, trailing; 1370 int index, trailing;
1339 1371
1340 if (line < 0) 1372 if (line < 0)
1341 XSRETURN_EMPTY; 1373 XSRETURN_EMPTY;
1342 1374
1343 if (!(lp = pango_layout_get_line (self->pl, line))) 1375 if (!(lp = pango_layout_get_line_readonly (self->pl, line)))
1344 XSRETURN_EMPTY; /* do better */ 1376 XSRETURN_EMPTY; /* do better */
1345 1377
1346 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing); 1378 pango_layout_line_x_to_index (lp, x * PANGO_SCALE, &index, &trailing);
1347 1379
1348 EXTEND (SP, 2); 1380 EXTEND (SP, 2);
… …
1665 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1666 1698
1667 do 1699 do
1668 { 1700 {
1669 ext = *data++; 1701 ext = *data++;
1670 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1671 1703
1672 if (cmd < 4) 1704 if (cmd < 4)
1673 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1674 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1675 { 1707 {
… …
1678 } 1710 }
1679 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1680 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1681 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1682 { 1714 {
1683 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1684 ; // decode player count 1716 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1717 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1718 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1685 1719
1686 data += *data + 1; 1720 data += *data + 1;
1687 } 1721 }
1688 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1689 cell->flags = *data++; 1723 cell->flags = *data++;
… …
1781} 1815}
1782 OUTPUT: 1816 OUTPUT:
1783 RETVAL 1817 RETVAL
1784 1818
1785void 1819void
1786draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1820draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0)
1787 CODE: 1821 CODE:
1788{ 1822{
1789 int x, y, z; 1823 int x, y, z;
1790 1824
1791 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1792 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1826 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1793 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1827 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1794 smooth_key skey; 1828 smooth_key skey;
1795 1829 int pl_x, pl_y;
1830 maptex pl_tex;
1796 rc_t *rc = rc_alloc (); 1831 rc_t *rc = rc_alloc ();
1797 rc_key_t key; 1832 rc_key_t key;
1798 rc_array_t *arr; 1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1799 1836
1800 // thats current max. sorry. 1837 // thats current max. sorry.
1801 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1802 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1803 1840
… …
1858 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1859 1896
1860 if (tile) 1897 if (tile)
1861 { 1898 {
1862 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1863 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1864 1902
1865 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1866 { 1904 {
1867 if (!tex.name) 1905 if (!tex.name)
1868 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1869 1907
1870 key.texname = tex.name; 1908 key.texname = tex.name;
1871 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1872 } 1910 }
1873 1911
1874 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1875 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1876 1919
1877 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1878 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 1921 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1879 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 1922 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1880 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 1923 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1881 1924
1882 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1883 { 1926 {
1884 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1885 if (cell->flags & 1) 1928 if (cell->flags & 1)
1886 { 1929 {
1887 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
… …
2024 glDisable (GL_TEXTURE_2D); 2067 glDisable (GL_TEXTURE_2D);
2025 key.texname = -1; 2068 key.texname = -1;
2026 } 2069 }
2027 2070
2028 hv_clear (smooth); 2071 hv_clear (smooth);
2072 }
2073
2074 if (pl_tex.name)
2075 {
2076 maptex tex = pl_tex;
2077 int px = pl_x + pdx;
2078 int py = pl_y + pdy;
2079
2080 key.texname = tex.name;
2081 arr = rc_array (rc, &key);
2082
2083 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2084 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2085 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2086 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2087
2088 rc_draw (rc);
2029 } 2089 }
2030 2090
2031 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2032 rc_free (rc); 2092 rc_free (rc);
2033 2093
… …
2270 else 2330 else
2271 *data++ = 0; 2331 *data++ = 0;
2272 } 2332 }
2273 } 2333 }
2274 2334
2335 /* if size is w*h + 5 then no data has been found */
2336 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2337 {
2275 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2276 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2277 RETVAL = data_sv; 2342 RETVAL = data_sv;
2278} 2343}
2279 OUTPUT: 2344 OUTPUT:
2280 RETVAL 2345 RETVAL
2281 2346
2282void 2347void
2283set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2284 PPCODE: 2349 PPCODE:
2285{ 2350{
2286 int x, y, z; 2351 int x, y, z;
2287 int w, h; 2352 int w, h;
2288 int x1, y1; 2353 int x1, y1;
2354 STRLEN len;
2355 uint8_t *data, *end;
2356
2357 len = SvLEN (data_sv);
2358 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2359 data = SvPVbyte_nolen (data_sv);
2360 end = data + len + 8;
2361
2362 if (len < 5)
2363 XSRETURN_EMPTY;
2289 2364
2290 if (*data++ != 0) 2365 if (*data++ != 0)
2291 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2292 2367
2293 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
… …
2308 { 2383 {
2309 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2310 2385
2311 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2312 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2313 uint8_t flags = *data++; 2393 flags = *data++;
2314 2394
2315 if (flags) 2395 if (flags)
2316 { 2396 {
2317 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2318 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
… …
2321 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2322 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2323 2403
2324 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2325 { 2405 {
2326 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2327 2408
2328 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2329 { 2410 {
2330 tileid t = tile [z]; 2411 tileid t = tile [z];
2331 2412
2332 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2333 { 2414 {
2334 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2335 need_texid (self, t); 2416 need_texid (self, t);
2336 } 2417 }
2337 2418
2338 cell->tile [z] = t; 2419 cell->tile [z] = t;
2339 } 2420 }

Diff Legend

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