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.253 by root, Fri Dec 28 20:59:14 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
… …
72 85
73#define MIN_FONT_HEIGHT 10 86#define MIN_FONT_HEIGHT 10
74 87
75/* mask out modifiers we are not interested in */ 88/* mask out modifiers we are not interested in */
76#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
77
78#if 0
79# define PARACHUTE SDL_INIT_NOPARACHUTE
80#else
81# define PARACHUTE 0
82#endif
83 90
84static AV *texture_av; 91static AV *texture_av;
85 92
86static struct 93static struct
87{ 94{
… …
181 188
182static void 189static void
183layout_update_font (DC__Layout self) 190layout_update_font (DC__Layout self)
184{ 191{
185 /* 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
186 * reasonably well with bitstream vera 193 * reasonably well with dejavu/bistream fonts
187 */ 194 */
188 PangoFontDescription *font = self->font ? self->font : default_font; 195 PangoFontDescription *font = self->font ? self->font : default_font;
189 196
190 pango_font_description_set_absolute_size (font, 197 pango_font_description_set_absolute_size (font,
191 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10)); 198 MAX (MIN_FONT_HEIGHT, self->base_height) * (PANGO_SCALE * 8 / 10));
… …
360 self->oy = 0; 367 self->oy = 0;
361 self->row = 0; 368 self->row = 0;
362 self->rows = 0; 369 self->rows = 0;
363} 370}
364 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
365static void 382static void
366map_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)
367{ 384{
368 int x, y; 385 int x, y;
369 maprow *row; 386 maprow *row;
… …
383 if (x >= row->c1) 400 if (x >= row->c1)
384 break; 401 break;
385 402
386 cell = row->col + x - row->c0; 403 cell = row->col + x - row->c0;
387 404
388 cell->darkness = 0; 405 CELL_CLEAR (cell);
389 cell->stat_hp = 0;
390 cell->flags = 0;
391 cell->player = 0;
392 } 406 }
393 } 407 }
394} 408}
395 409
396typedef struct { 410typedef struct {
… …
631 const_iv (KMOD_NUM), 645 const_iv (KMOD_NUM),
632 const_iv (KMOD_CAPS), 646 const_iv (KMOD_CAPS),
633 const_iv (KMOD_MODE), 647 const_iv (KMOD_MODE),
634 648
635 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)
636# undef const_iv 679# undef const_iv
637 }; 680 };
638 681
639 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; )
640 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 683 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
658 701
659NV floor (NV x) 702NV floor (NV x)
660 703
661NV ceil (NV x) 704NV ceil (NV x)
662 705
706NV ceilabs (NV x)
707 CODE:
708 RETVAL = x < 0. ? - ceil (-x) : ceil (x);
709 OUTPUT:
710 RETVAL
711
663IV minpot (UV n) 712IV minpot (UV n)
664 713
665IV popcount (UV n) 714IV popcount (UV n)
666 715
667void 716void
… …
669 CODE: 718 CODE:
670{ 719{
671 opengl_fontmap = pango_opengl_font_map_new (); 720 opengl_fontmap = pango_opengl_font_map_new ();
672 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);
673 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 722 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
674#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)
675 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 725 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
676 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 726 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
677#endif 727#endif
678} 728}
679 729
680char *
681SDL_GetError () 730char *SDL_GetError ()
682 731
683int 732int SDL_Init (U32 flags)
684SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
685 733
686void 734int SDL_InitSubSystem (U32 flags)
735
736void SDL_QuitSubSystem (U32 flags)
737
687SDL_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
688 748
689void 749void
690SDL_ListModes (int rgb, int alpha) 750SDL_ListModes (int rgb, int alpha)
691 PPCODE: 751 PPCODE:
692{ 752{
… …
704 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 764 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
705 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 765 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
706 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 766 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
707 767
708 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 768 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
709#if SDL_VERSION_ATLEAST(1,2,10)
710 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
711 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 769 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
712#endif
713 770
714 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 771 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
715 772
716 if (m && m != (SDL_Rect **)-1) 773 if (m && m != (SDL_Rect **)-1)
717 while (*m) 774 while (*m)
718 { 775 {
719 if ((*m)->w >= 800 && (*m)->h >= 480) 776 if ((*m)->w >= 400 && (*m)->h >= 300)
720 { 777 {
721 AV *av = newAV (); 778 AV *av = newAV ();
722 av_push (av, newSViv ((*m)->w)); 779 av_push (av, newSViv ((*m)->w));
723 av_push (av, newSViv ((*m)->h)); 780 av_push (av, newSViv ((*m)->h));
724 av_push (av, newSViv (rgb)); 781 av_push (av, newSViv (rgb));
… …
765char * 822char *
766SDL_GetKeyName (int sym) 823SDL_GetKeyName (int sym)
767 824
768int 825int
769SDL_GetAppState () 826SDL_GetAppState ()
827
828int
829SDL_GetModState ()
770 830
771void 831void
772poll_events () 832poll_events ()
773 PPCODE: 833 PPCODE:
774{ 834{
… …
908 } 968 }
909 } 969 }
910#endif 970#endif
911} 971}
912 972
913void 973int
914add_font (char *file) 974add_font (char *file)
915 CODE: 975 CODE:
916 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 976 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
977 OUTPUT:
978 RETVAL
917 979
918void 980void
919load_image_inline (SV *image_) 981load_image_inline (SV *image_)
920 ALIAS: 982 ALIAS:
921 load_image_file = 1 983 load_image_file = 1
… …
1331 PPCODE: 1393 PPCODE:
1332{ 1394{
1333 int line, x; 1395 int line, x;
1334 1396
1335 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);
1336#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1398#if !PANGO_VERSION_CHECK (1, 17, 3)
1337 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1399 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1338 --line; 1400 --line;
1339#endif 1401#endif
1340 EXTEND (SP, 2); 1402 EXTEND (SP, 2);
1341 PUSHs (sv_2mortal (newSViv (line))); 1403 PUSHs (sv_2mortal (newSViv (line)));
… …
1677 uint8_t ext, cmd; 1739 uint8_t ext, cmd;
1678 1740
1679 do 1741 do
1680 { 1742 {
1681 ext = *data++; 1743 ext = *data++;
1682 cmd = ext & 0x3f; 1744 cmd = ext & 0x7f;
1683 1745
1684 if (cmd < 4) 1746 if (cmd < 4)
1685 cell->darkness = 255 - ext * 64 + 1; 1747 cell->darkness = 255 - ext * 64 + 1;
1686 else if (cmd == 5) // health 1748 else if (cmd == 5) // health
1687 { 1749 {
… …
1690 } 1752 }
1691 else if (cmd == 6) // monster width 1753 else if (cmd == 6) // monster width
1692 cell->stat_width = *data++ + 1; 1754 cell->stat_width = *data++ + 1;
1693 else if (cmd == 0x47) 1755 else if (cmd == 0x47)
1694 { 1756 {
1695 if (*data == 4) 1757 if (*data == 1) cell->player = data [1];
1696 ; // 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);
1697 1761
1698 data += *data + 1; 1762 data += *data + 1;
1699 } 1763 }
1700 else if (cmd == 8) // cell flags 1764 else if (cmd == 8) // cell flags
1701 cell->flags = *data++; 1765 cell->flags = *data++;
… …
1731 } 1795 }
1732 } 1796 }
1733 } 1797 }
1734 } 1798 }
1735 else 1799 else
1736 cell->darkness = 0; 1800 CELL_CLEAR (cell);
1737 } 1801 }
1738} 1802}
1739 OUTPUT: 1803 OUTPUT:
1740 RETVAL 1804 RETVAL
1741 1805
… …
1793} 1857}
1794 OUTPUT: 1858 OUTPUT:
1795 RETVAL 1859 RETVAL
1796 1860
1797void 1861void
1798draw (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)
1799 CODE: 1863 CODE:
1800{ 1864{
1801 int x, y, z; 1865 int x, y, z;
1802 1866
1803 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1867 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1804 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
1805 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)
1806 smooth_key skey; 1870 smooth_key skey;
1807 1871 int pl_x, pl_y;
1872 maptex pl_tex;
1808 rc_t *rc = rc_alloc (); 1873 rc_t *rc = rc_alloc ();
1809 rc_key_t key; 1874 rc_key_t key;
1810 rc_array_t *arr; 1875 rc_array_t *arr;
1876
1877 pl_tex.name = 0;
1811 1878
1812 // thats current max. sorry. 1879 // thats current max. sorry.
1813 if (sw > 255) sw = 255; 1880 if (sw > 255) sw = 255;
1814 if (sh > 255) sh = 255; 1881 if (sh > 255) sh = 255;
1815 1882
… …
1870 tileid tile = cell->tile [z]; 1937 tileid tile = cell->tile [z];
1871 1938
1872 if (tile) 1939 if (tile)
1873 { 1940 {
1874 maptex tex = self->tex [tile]; 1941 maptex tex = self->tex [tile];
1875 int px, py; 1942 int px = (x + 1) * T - tex.w;
1943 int py = (y + 1) * T - tex.h;
1876 1944
1877 if (key.texname != tex.name) 1945 if (key.texname != tex.name)
1878 { 1946 {
1879 if (!tex.name) 1947 if (!tex.name)
1880 tex = self->tex [2]; /* missing, replace by noface */ 1948 tex = self->tex [2]; /* missing, replace by noface */
1881 1949
1882 key.texname = tex.name; 1950 key.texname = tex.name;
1883 arr = rc_array (rc, &key); 1951 arr = rc_array (rc, &key);
1884 } 1952 }
1885 1953
1886 px = (x + 1) * T - tex.w; 1954 if (expect_false (cell->player == player) && expect_false (z == 2))
1887 py = (y + 1) * T - tex.h; 1955 {
1956 pl_x = px;
1957 pl_y = py;
1958 pl_tex = tex;
1959 continue;
1960 }
1888 1961
1889 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1962 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1890 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);
1891 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);
1892 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);
1893 1966
1894 if (cell->flags && z == 2) 1967 if (expect_false (cell->flags) && expect_false (z == 2))
1895 { 1968 {
1896 // overlays such as the speech bubble, probably more to come 1969 // overlays such as the speech bubble, probably more to come
1897 if (cell->flags & 1) 1970 if (cell->flags & 1)
1898 { 1971 {
1899 maptex tex = self->tex [1]; 1972 maptex tex = self->tex [1];
… …
2038 } 2111 }
2039 2112
2040 hv_clear (smooth); 2113 hv_clear (smooth);
2041 } 2114 }
2042 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
2043 glDisable (GL_BLEND); 2133 glDisable (GL_BLEND);
2044 rc_free (rc); 2134 rc_free (rc);
2045 2135
2046 // top layer: overlays such as the health bar 2136 // top layer: overlays such as the health bar
2047 for (y = 0; y < sh; y++) 2137 for (y = 0; y < sh; y++)
… …
2152 SvCUR_set (darkness3_sv, sw34 * sh3); 2242 SvCUR_set (darkness3_sv, sw34 * sh3);
2153 2243
2154 mx += self->x - 1; 2244 mx += self->x - 1;
2155 my += self->y - 1; 2245 my += self->y - 1;
2156 2246
2157 memset (darkness1, 255, sw1 * sh1); 2247 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2158 2248
2159 for (y = 0; y < sh1; y++) 2249 for (y = 0; y < sh1; y++)
2160 if (0 <= y + my && y + my < self->rows) 2250 if (0 <= y + my && y + my < self->rows)
2161 { 2251 {
2162 maprow *row = self->row + (y + my); 2252 maprow *row = self->row + (y + my);
… …
2282 else 2372 else
2283 *data++ = 0; 2373 *data++ = 0;
2284 } 2374 }
2285 } 2375 }
2286 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 {
2287 SvPOK_only (data_sv); 2380 SvPOK_only (data_sv);
2288 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2381 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2382 }
2383
2289 RETVAL = data_sv; 2384 RETVAL = data_sv;
2290} 2385}
2291 OUTPUT: 2386 OUTPUT:
2292 RETVAL 2387 RETVAL
2293 2388
2294void 2389void
2295set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2390set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2296 PPCODE: 2391 PPCODE:
2297{ 2392{
2298 int x, y, z; 2393 int x, y, z;
2299 int w, h; 2394 int w, h;
2300 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;
2301 2406
2302 if (*data++ != 0) 2407 if (*data++ != 0)
2303 XSRETURN_EMPTY; /* version mismatch */ 2408 XSRETURN_EMPTY; /* version mismatch */
2304 2409
2305 w = *data++ << 8; w |= *data++; 2410 w = *data++ << 8; w |= *data++;
… …
2320 { 2425 {
2321 maprow *row = map_get_row (self, y); 2426 maprow *row = map_get_row (self, y);
2322 2427
2323 for (x = x0; x < x1; x++) 2428 for (x = x0; x < x1; x++)
2324 { 2429 {
2430 uint8_t flags;
2431
2432 if (data + 7 >= end)
2433 XSRETURN_EMPTY;
2434
2325 uint8_t flags = *data++; 2435 flags = *data++;
2326 2436
2327 if (flags) 2437 if (flags)
2328 { 2438 {
2329 mapcell *cell = row_get_cell (row, x); 2439 mapcell *cell = row_get_cell (row, x);
2330 tileid tile[3] = { 0, 0, 0 }; 2440 tileid tile[3] = { 0, 0, 0 };
… …
2333 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2443 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2334 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2444 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2335 2445
2336 if (cell->darkness == 0) 2446 if (cell->darkness == 0)
2337 { 2447 {
2338 cell->darkness = 0; 2448 /*cell->darkness = 0;*/
2449 EXTEND (SP, 3);
2339 2450
2340 for (z = 0; z <= 2; z++) 2451 for (z = 0; z <= 2; z++)
2341 { 2452 {
2342 tileid t = tile [z]; 2453 tileid t = tile [z];
2343 2454
2344 if (t >= self->texs || (t && !self->tex [t].name)) 2455 if (t >= self->texs || (t && !self->tex [t].name))
2345 { 2456 {
2346 XPUSHs (sv_2mortal (newSViv (t))); 2457 PUSHs (sv_2mortal (newSViv (t)));
2347 need_texid (self, t); 2458 need_texid (self, t);
2348 } 2459 }
2349 2460
2350 cell->tile [z] = t; 2461 cell->tile [z] = t;
2351 } 2462 }

Diff Legend

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