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

Diff Legend

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