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.254 by root, Sun Jan 6 18:12:20 2008 UTC vs.
Revision 1.270 by root, Sun Jul 20 15:05:13 2008 UTC

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

Diff Legend

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