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.250 by root, Fri Dec 28 16:09:03 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#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),
633# undef const_iv 652# undef const_iv
634 }; 653 };
635 654
636 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; )
637 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 656 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
666 CODE: 685 CODE:
667{ 686{
668 opengl_fontmap = pango_opengl_font_map_new (); 687 opengl_fontmap = pango_opengl_font_map_new ();
669 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);
670 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap); 689 opengl_context = pango_opengl_font_map_create_context ((PangoOpenGLFontMap *)opengl_fontmap);
671#if defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 15, 2) 690 /*pango_context_set_font_description (opengl_context, default_font);*/
691#if PANGO_VERSION_CHECK (1, 15, 2)
672 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 692 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
673 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 693 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
674#endif 694#endif
675} 695}
676 696
677char *
678SDL_GetError () 697char *SDL_GetError ()
679 698
680int 699int SDL_Init (U32 flags)
681SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
682 700
683void 701int SDL_InitSubSystem (U32 flags)
702
703void SDL_QuitSubSystem (U32 flags)
704
684SDL_Quit () 705void SDL_Quit ()
685 706
686void 707void
687SDL_ListModes (int rgb, int alpha) 708SDL_ListModes (int rgb, int alpha)
688 PPCODE: 709 PPCODE:
689{ 710{
… …
711 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 732 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
712 733
713 if (m && m != (SDL_Rect **)-1) 734 if (m && m != (SDL_Rect **)-1)
714 while (*m) 735 while (*m)
715 { 736 {
716 if ((*m)->w >= 800 && (*m)->h >= 480)
717 {
718 AV *av = newAV (); 737 AV *av = newAV ();
719 av_push (av, newSViv ((*m)->w)); 738 av_push (av, newSViv ((*m)->w));
720 av_push (av, newSViv ((*m)->h)); 739 av_push (av, newSViv ((*m)->h));
721 av_push (av, newSViv (rgb)); 740 av_push (av, newSViv (rgb));
722 av_push (av, newSViv (alpha)); 741 av_push (av, newSViv (alpha));
723 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 742 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
724 }
725 743
726 ++m; 744 ++m;
727 } 745 }
728} 746}
729 747
… …
762char * 780char *
763SDL_GetKeyName (int sym) 781SDL_GetKeyName (int sym)
764 782
765int 783int
766SDL_GetAppState () 784SDL_GetAppState ()
785
786int
787SDL_GetModState ()
767 788
768void 789void
769poll_events () 790poll_events ()
770 PPCODE: 791 PPCODE:
771{ 792{
… …
781 { 802 {
782 case SDL_KEYDOWN: 803 case SDL_KEYDOWN:
783 case SDL_KEYUP: 804 case SDL_KEYUP:
784 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 805 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
785 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 806 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
786 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);
787 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 */
788 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 809 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
789 break; 810 break;
790 811
791 case SDL_ACTIVEEVENT: 812 case SDL_ACTIVEEVENT:
792 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 813 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
810 x = ev.motion.x; 831 x = ev.motion.x;
811 y = ev.motion.y; 832 y = ev.motion.y;
812 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 833 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
813 } 834 }
814 835
815 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 836 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
816 hv_store (hv, "state", 5, newSViv (state), 0); 837 hv_store (hv, "state", 5, newSViv (state), 0);
817 hv_store (hv, "x", 1, newSViv (x), 0); 838 hv_store (hv, "x", 1, newSViv (x), 0);
818 hv_store (hv, "y", 1, newSViv (y), 0); 839 hv_store (hv, "y", 1, newSViv (y), 0);
819 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 840 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
820 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 841 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
821 } 842 }
822 break; 843 break;
823 844
824 case SDL_MOUSEBUTTONDOWN: 845 case SDL_MOUSEBUTTONDOWN:
825 case SDL_MOUSEBUTTONUP: 846 case SDL_MOUSEBUTTONUP:
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState ()), 0); 847 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0);
827 848
828 hv_store (hv, "button", 6, newSViv (ev.button.button), 0); 849 hv_store (hv, "button", 6, newSViv (ev.button.button), 0);
829 hv_store (hv, "state", 5, newSViv (ev.button.state), 0); 850 hv_store (hv, "state", 5, newSViv (ev.button.state), 0);
830 hv_store (hv, "x", 1, newSViv (ev.button.x), 0); 851 hv_store (hv, "x", 1, newSViv (ev.button.x), 0);
831 hv_store (hv, "y", 1, newSViv (ev.button.y), 0); 852 hv_store (hv, "y", 1, newSViv (ev.button.y), 0);
… …
905 } 926 }
906 } 927 }
907#endif 928#endif
908} 929}
909 930
910void 931int
911add_font (char *file) 932add_font (char *file)
912 CODE: 933 CODE:
913 FcConfigAppFontAddFile (0, (const FcChar8 *)file); 934 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
935 OUTPUT:
936 RETVAL
914 937
915void 938void
916load_image_inline (SV *image_) 939load_image_inline (SV *image_)
917 ALIAS: 940 ALIAS:
918 load_image_file = 1 941 load_image_file = 1
… …
1312 1335
1313void 1336void
1314cursor_pos (DC::Layout self, int index) 1337cursor_pos (DC::Layout self, int index)
1315 PPCODE: 1338 PPCODE:
1316{ 1339{
1317 PangoRectangle strong_pos; 1340 PangoRectangle pos;
1318 pango_layout_get_cursor_pos (self->pl, index, &strong_pos, 0); 1341 pango_layout_get_cursor_pos (self->pl, index, &pos, 0);
1319 1342
1320 EXTEND (SP, 3); 1343 EXTEND (SP, 3);
1321 PUSHs (sv_2mortal (newSViv (strong_pos.x / PANGO_SCALE))); 1344 PUSHs (sv_2mortal (newSViv (pos.x / PANGO_SCALE)));
1322 PUSHs (sv_2mortal (newSViv (strong_pos.y / PANGO_SCALE))); 1345 PUSHs (sv_2mortal (newSViv (pos.y / PANGO_SCALE)));
1323 PUSHs (sv_2mortal (newSViv (strong_pos.height / PANGO_SCALE))); 1346 PUSHs (sv_2mortal (newSViv (pos.height / PANGO_SCALE)));
1324} 1347}
1325 1348
1326void 1349void
1327index_to_line_x (DC::Layout self, int index, int trailing = 0) 1350index_to_line_x (DC::Layout self, int index, int trailing = 0)
1328 PPCODE: 1351 PPCODE:
1329{ 1352{
1330 int line, x; 1353 int line, x;
1331 1354
1332 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);
1333#if !(defined (PANGO_VERSION_CHECK) && PANGO_VERSION_CHECK (1, 17, 3)) 1356#if !PANGO_VERSION_CHECK (1, 17, 3)
1334 /* pango bug: line is between 1..numlines, not 0..numlines-1 */ 1357 /* pango bug: line is between 1..numlines, not 0..numlines-1 */
1335 --line; 1358 --line;
1336#endif 1359#endif
1337 EXTEND (SP, 2); 1360 EXTEND (SP, 2);
1338 PUSHs (sv_2mortal (newSViv (line))); 1361 PUSHs (sv_2mortal (newSViv (line)));
… …
1674 uint8_t ext, cmd; 1697 uint8_t ext, cmd;
1675 1698
1676 do 1699 do
1677 { 1700 {
1678 ext = *data++; 1701 ext = *data++;
1679 cmd = ext & 0x3f; 1702 cmd = ext & 0x7f;
1680 1703
1681 if (cmd < 4) 1704 if (cmd < 4)
1682 cell->darkness = 255 - ext * 64 + 1; 1705 cell->darkness = 255 - ext * 64 + 1;
1683 else if (cmd == 5) // health 1706 else if (cmd == 5) // health
1684 { 1707 {
… …
1687 } 1710 }
1688 else if (cmd == 6) // monster width 1711 else if (cmd == 6) // monster width
1689 cell->stat_width = *data++ + 1; 1712 cell->stat_width = *data++ + 1;
1690 else if (cmd == 0x47) 1713 else if (cmd == 0x47)
1691 { 1714 {
1692 if (*data == 4) 1715 if (*data == 1) cell->player = data [1];
1693 ; // 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);
1694 1719
1695 data += *data + 1; 1720 data += *data + 1;
1696 } 1721 }
1697 else if (cmd == 8) // cell flags 1722 else if (cmd == 8) // cell flags
1698 cell->flags = *data++; 1723 cell->flags = *data++;
… …
1790} 1815}
1791 OUTPUT: 1816 OUTPUT:
1792 RETVAL 1817 RETVAL
1793 1818
1794void 1819void
1795draw (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)
1796 CODE: 1821 CODE:
1797{ 1822{
1798 int x, y, z; 1823 int x, y, z;
1799 1824
1800 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1825 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1801 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
1802 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)
1803 smooth_key skey; 1828 smooth_key skey;
1804 1829 int pl_x, pl_y;
1830 maptex pl_tex;
1805 rc_t *rc = rc_alloc (); 1831 rc_t *rc = rc_alloc ();
1806 rc_key_t key; 1832 rc_key_t key;
1807 rc_array_t *arr; 1833 rc_array_t *arr;
1834
1835 pl_tex.name = 0;
1808 1836
1809 // thats current max. sorry. 1837 // thats current max. sorry.
1810 if (sw > 255) sw = 255; 1838 if (sw > 255) sw = 255;
1811 if (sh > 255) sh = 255; 1839 if (sh > 255) sh = 255;
1812 1840
… …
1867 tileid tile = cell->tile [z]; 1895 tileid tile = cell->tile [z];
1868 1896
1869 if (tile) 1897 if (tile)
1870 { 1898 {
1871 maptex tex = self->tex [tile]; 1899 maptex tex = self->tex [tile];
1872 int px, py; 1900 int px = (x + 1) * T - tex.w;
1901 int py = (y + 1) * T - tex.h;
1873 1902
1874 if (key.texname != tex.name) 1903 if (key.texname != tex.name)
1875 { 1904 {
1876 if (!tex.name) 1905 if (!tex.name)
1877 tex = self->tex [2]; /* missing, replace by noface */ 1906 tex = self->tex [2]; /* missing, replace by noface */
1878 1907
1879 key.texname = tex.name; 1908 key.texname = tex.name;
1880 arr = rc_array (rc, &key); 1909 arr = rc_array (rc, &key);
1881 } 1910 }
1882 1911
1883 px = (x + 1) * T - tex.w; 1912 if (expect_false (cell->player == player) && expect_false (z == 2))
1884 py = (y + 1) * T - tex.h; 1913 {
1914 pl_x = px;
1915 pl_y = py;
1916 pl_tex = tex;
1917 continue;
1918 }
1885 1919
1886 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 1920 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1887 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);
1888 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);
1889 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);
1890 1924
1891 if (cell->flags && z == 2) 1925 if (expect_false (cell->flags) && expect_false (z == 2))
1892 { 1926 {
1893 // overlays such as the speech bubble, probably more to come 1927 // overlays such as the speech bubble, probably more to come
1894 if (cell->flags & 1) 1928 if (cell->flags & 1)
1895 { 1929 {
1896 maptex tex = self->tex [1]; 1930 maptex tex = self->tex [1];
… …
2033 glDisable (GL_TEXTURE_2D); 2067 glDisable (GL_TEXTURE_2D);
2034 key.texname = -1; 2068 key.texname = -1;
2035 } 2069 }
2036 2070
2037 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);
2038 } 2089 }
2039 2090
2040 glDisable (GL_BLEND); 2091 glDisable (GL_BLEND);
2041 rc_free (rc); 2092 rc_free (rc);
2042 2093
… …
2279 else 2330 else
2280 *data++ = 0; 2331 *data++ = 0;
2281 } 2332 }
2282 } 2333 }
2283 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 {
2284 SvPOK_only (data_sv); 2338 SvPOK_only (data_sv);
2285 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2339 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2340 }
2341
2286 RETVAL = data_sv; 2342 RETVAL = data_sv;
2287} 2343}
2288 OUTPUT: 2344 OUTPUT:
2289 RETVAL 2345 RETVAL
2290 2346
2291void 2347void
2292set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2348set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2293 PPCODE: 2349 PPCODE:
2294{ 2350{
2295 int x, y, z; 2351 int x, y, z;
2296 int w, h; 2352 int w, h;
2297 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;
2298 2364
2299 if (*data++ != 0) 2365 if (*data++ != 0)
2300 XSRETURN_EMPTY; /* version mismatch */ 2366 XSRETURN_EMPTY; /* version mismatch */
2301 2367
2302 w = *data++ << 8; w |= *data++; 2368 w = *data++ << 8; w |= *data++;
… …
2317 { 2383 {
2318 maprow *row = map_get_row (self, y); 2384 maprow *row = map_get_row (self, y);
2319 2385
2320 for (x = x0; x < x1; x++) 2386 for (x = x0; x < x1; x++)
2321 { 2387 {
2388 uint8_t flags;
2389
2390 if (data + 7 >= end)
2391 XSRETURN_EMPTY;
2392
2322 uint8_t flags = *data++; 2393 flags = *data++;
2323 2394
2324 if (flags) 2395 if (flags)
2325 { 2396 {
2326 mapcell *cell = row_get_cell (row, x); 2397 mapcell *cell = row_get_cell (row, x);
2327 tileid tile[3] = { 0, 0, 0 }; 2398 tileid tile[3] = { 0, 0, 0 };
… …
2330 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2401 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2331 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2402 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2332 2403
2333 if (cell->darkness == 0) 2404 if (cell->darkness == 0)
2334 { 2405 {
2335 cell->darkness = 0; 2406 /*cell->darkness = 0;*/
2407 EXTEND (SP, 3);
2336 2408
2337 for (z = 0; z <= 2; z++) 2409 for (z = 0; z <= 2; z++)
2338 { 2410 {
2339 tileid t = tile [z]; 2411 tileid t = tile [z];
2340 2412
2341 if (t >= self->texs || (t && !self->tex [t].name)) 2413 if (t >= self->texs || (t && !self->tex [t].name))
2342 { 2414 {
2343 XPUSHs (sv_2mortal (newSViv (t))); 2415 PUSHs (sv_2mortal (newSViv (t)));
2344 need_texid (self, t); 2416 need_texid (self, t);
2345 } 2417 }
2346 2418
2347 cell->tile [z] = t; 2419 cell->tile [z] = t;
2348 } 2420 }

Diff Legend

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