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.259 by root, Tue May 20 02:47:21 2008 UTC vs.
Revision 1.275 by root, Thu Aug 28 00:53:53 2008 UTC

… …
39#include <SDL_endian.h> 39#include <SDL_endian.h>
40#include <SDL_image.h> 40#include <SDL_image.h>
41#include <SDL_mixer.h> 41#include <SDL_mixer.h>
42#include <SDL_opengl.h> 42#include <SDL_opengl.h>
43 43
44/* work around os x broken headers */
45#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
47#endif
48
44#define PANGO_ENABLE_BACKEND 49#define PANGO_ENABLE_BACKEND
45#define G_DISABLE_CAST_CHECKS 50#define G_DISABLE_CAST_CHECKS
46 51
47#include <glib/gmacros.h> 52#include <glib/gmacros.h>
48 53
… …
65# include <netinet/in.h> 70# include <netinet/in.h>
66# include <netinet/tcp.h> 71# include <netinet/tcp.h>
67# include <inttypes.h> 72# include <inttypes.h>
68#endif 73#endif
69 74
75#if __GNUC__ >= 4
76# define expect(expr,value) __builtin_expect ((expr),(value))
77#else
78# define expect(expr,value) (expr)
79#endif
80
81#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1)
83
70#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
71 85
72#define FOW_DARKNESS 32 86#define FOW_DARKNESS 32
73 87
74#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
… …
76 90
77#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
78 92
79/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
80#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#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 95
88static AV *texture_av; 96static AV *texture_av;
89 97
90static struct 98static struct
91{ 99{
… …
364 self->oy = 0; 372 self->oy = 0;
365 self->row = 0; 373 self->row = 0;
366 self->rows = 0; 374 self->rows = 0;
367} 375}
368 376
377#define CELL_CLEAR(cell) \
378 do { \
379 if ((cell)->player) \
380 (cell)->tile [2] = 0; \
381 (cell)->darkness = 0; \
382 (cell)->stat_hp = 0; \
383 (cell)->flags = 0; \
384 (cell)->player = 0; \
385 } while (0)
386
369static void 387static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 388map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 389{
372 int x, y; 390 int x, y;
373 maprow *row; 391 maprow *row;
… …
387 if (x >= row->c1) 405 if (x >= row->c1)
388 break; 406 break;
389 407
390 cell = row->col + x - row->c0; 408 cell = row->col + x - row->c0;
391 409
392 cell->darkness = 0; 410 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 411 }
397 } 412 }
398} 413}
399 414
400typedef struct { 415typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 526 if (!svp || !SvTRUE (*svp))
512 return 0; 527 return 0;
513 528
514 return 1; 529 return 1;
515} 530}
531
532static void
533deliantra_main ()
534{
535 char *argv[] = { 0 };
536 call_argv ("::main", G_DISCARD | G_VOID, argv);
537}
538
539#ifdef __MACOSX__
540 /* to due surprising braindamage on the side of SDL design, we
541 * do some mind-boggling hack here: SDL requires a custom main()
542 * on OS X, so... we provide one and call the original main(), which,
543 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
544 * and which calls our main (== SDL_main) back.
545 */
546 extern C_LINKAGE int
547 main (int argc, char *argv[])
548 {
549 deliantra_main ();
550 }
551
552 #undef main
553
554 extern C_LINKAGE int main (int argc, char *argv[]);
555
556 static void
557 SDL_braino (void)
558 {
559 char *argv[] = { "deliantra client", 0 };
560 (main) (1, argv);
561 }
562#else
563 static void
564 SDL_braino (void)
565 {
566 deliantra_main ();
567 }
568#endif
516 569
517MODULE = Deliantra::Client PACKAGE = DC 570MODULE = Deliantra::Client PACKAGE = DC
518 571
519PROTOTYPES: ENABLE 572PROTOTYPES: ENABLE
520 573
… …
549 const_iv (SDL_USEREVENT), 602 const_iv (SDL_USEREVENT),
550 603
551 const_iv (SDL_APPINPUTFOCUS), 604 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 605 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 606 const_iv (SDL_APPACTIVE),
607
608
609 const_iv (SDLK_UNKNOWN),
610 const_iv (SDLK_FIRST),
611 const_iv (SDLK_BACKSPACE),
612 const_iv (SDLK_TAB),
613 const_iv (SDLK_CLEAR),
614 const_iv (SDLK_RETURN),
615 const_iv (SDLK_PAUSE),
616 const_iv (SDLK_ESCAPE),
617 const_iv (SDLK_SPACE),
618 const_iv (SDLK_EXCLAIM),
619 const_iv (SDLK_QUOTEDBL),
620 const_iv (SDLK_HASH),
621 const_iv (SDLK_DOLLAR),
622 const_iv (SDLK_AMPERSAND),
623 const_iv (SDLK_QUOTE),
624 const_iv (SDLK_LEFTPAREN),
625 const_iv (SDLK_RIGHTPAREN),
626 const_iv (SDLK_ASTERISK),
627 const_iv (SDLK_PLUS),
628 const_iv (SDLK_COMMA),
629 const_iv (SDLK_MINUS),
630 const_iv (SDLK_PERIOD),
631 const_iv (SDLK_SLASH),
632 const_iv (SDLK_0),
633 const_iv (SDLK_1),
634 const_iv (SDLK_2),
635 const_iv (SDLK_3),
636 const_iv (SDLK_4),
637 const_iv (SDLK_5),
638 const_iv (SDLK_6),
639 const_iv (SDLK_7),
640 const_iv (SDLK_8),
641 const_iv (SDLK_9),
642 const_iv (SDLK_COLON),
643 const_iv (SDLK_SEMICOLON),
644 const_iv (SDLK_LESS),
645 const_iv (SDLK_EQUALS),
646 const_iv (SDLK_GREATER),
647 const_iv (SDLK_QUESTION),
648 const_iv (SDLK_AT),
649
650 const_iv (SDLK_LEFTBRACKET),
651 const_iv (SDLK_BACKSLASH),
652 const_iv (SDLK_RIGHTBRACKET),
653 const_iv (SDLK_CARET),
654 const_iv (SDLK_UNDERSCORE),
655 const_iv (SDLK_BACKQUOTE),
656 const_iv (SDLK_DELETE),
554 657
555 const_iv (SDLK_FIRST), 658 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 659 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 660 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 661 const_iv (SDLK_KP1),
… …
635 const_iv (KMOD_NUM), 738 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 739 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 740 const_iv (KMOD_MODE),
638 741
639 const_iv (MIX_DEFAULT_FORMAT), 742 const_iv (MIX_DEFAULT_FORMAT),
743
744 const_iv (SDL_INIT_TIMER),
745 const_iv (SDL_INIT_AUDIO),
746 const_iv (SDL_INIT_VIDEO),
747 const_iv (SDL_INIT_CDROM),
748 const_iv (SDL_INIT_JOYSTICK),
749 const_iv (SDL_INIT_EVERYTHING),
750 const_iv (SDL_INIT_NOPARACHUTE),
751 const_iv (SDL_INIT_EVENTTHREAD),
752
753 const_iv (SDL_GL_RED_SIZE),
754 const_iv (SDL_GL_GREEN_SIZE),
755 const_iv (SDL_GL_BLUE_SIZE),
756 const_iv (SDL_GL_ALPHA_SIZE),
757 const_iv (SDL_GL_DOUBLEBUFFER),
758 const_iv (SDL_GL_BUFFER_SIZE),
759 const_iv (SDL_GL_DEPTH_SIZE),
760 const_iv (SDL_GL_STENCIL_SIZE),
761 const_iv (SDL_GL_ACCUM_RED_SIZE),
762 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
763 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
764 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
765 const_iv (SDL_GL_STEREO),
766 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
767 const_iv (SDL_GL_MULTISAMPLESAMPLES),
768 const_iv (SDL_GL_ACCELERATED_VISUAL),
769 const_iv (SDL_GL_SWAP_CONTROL),
770
771 const_iv (FOW_DARKNESS)
640# undef const_iv 772# undef const_iv
641 }; 773 };
642 774
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 775 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 776 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 812 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 813 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 814#endif
683} 815}
684 816
685char *
686SDL_GetError () 817char *SDL_GetError ()
687 818
688int 819void SDL_braino ()
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 820
691void 821int SDL_Init (U32 flags)
822
823int SDL_InitSubSystem (U32 flags)
824
825void SDL_QuitSubSystem (U32 flags)
826
692SDL_Quit () 827void SDL_Quit ()
828
829int SDL_GL_SetAttribute (int attr, int value)
830
831int SDL_GL_GetAttribute (int attr)
832 CODE:
833 if (SDL_GL_GetAttribute (attr, &RETVAL))
834 XSRETURN_UNDEF;
835 OUTPUT:
836 RETVAL
693 837
694void 838void
695SDL_ListModes (int rgb, int alpha) 839SDL_ListModes (int rgb, int alpha)
696 PPCODE: 840 PPCODE:
697{ 841{
… …
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 853 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 854 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 855 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 856
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 857 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
714#if SDL_VERSION_ATLEAST(1,2,10)
715 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
716 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 858 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 859
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 860 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 861
721 if (m && m != (SDL_Rect **)-1) 862 if (m && m != (SDL_Rect **)-1)
722 while (*m) 863 while (*m)
723 { 864 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 865 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 866 {
726 AV *av = newAV (); 867 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 868 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 869 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 870 av_push (av, newSViv (rgb));
… …
1687 uint8_t ext, cmd; 1828 uint8_t ext, cmd;
1688 1829
1689 do 1830 do
1690 { 1831 {
1691 ext = *data++; 1832 ext = *data++;
1692 cmd = ext & 0x3f; 1833 cmd = ext & 0x7f;
1693 1834
1694 if (cmd < 4) 1835 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 1836 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health 1837 else if (cmd == 5) // health
1697 { 1838 {
… …
1700 } 1841 }
1701 else if (cmd == 6) // monster width 1842 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 1843 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 1844 else if (cmd == 0x47)
1704 { 1845 {
1705 if (*data == 4) 1846 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 1847 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1848 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1849 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 1850
1708 data += *data + 1; 1851 data += *data + 1;
1709 } 1852 }
1710 else if (cmd == 8) // cell flags 1853 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 1854 cell->flags = *data++;
… …
1741 } 1884 }
1742 } 1885 }
1743 } 1886 }
1744 } 1887 }
1745 else 1888 else
1746 cell->darkness = 0; 1889 CELL_CLEAR (cell);
1747 } 1890 }
1748} 1891}
1749 OUTPUT: 1892 OUTPUT:
1750 RETVAL 1893 RETVAL
1751 1894
… …
1803} 1946}
1804 OUTPUT: 1947 OUTPUT:
1805 RETVAL 1948 RETVAL
1806 1949
1807void 1950void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1951draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 1952 CODE:
1810{ 1953{
1811 int x, y, z; 1954 int x, y, z;
1812 1955
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1956 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1957 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
1815 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 1958 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 1959 smooth_key skey;
1817 1960 int pl_x, pl_y;
1961 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 1962 rc_t *rc = rc_alloc ();
1819 rc_key_t key; 1963 rc_key_t key;
1820 rc_array_t *arr; 1964 rc_array_t *arr;
1965
1966 pl_tex.name = 0;
1821 1967
1822 // thats current max. sorry. 1968 // thats current max. sorry.
1823 if (sw > 255) sw = 255; 1969 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 1970 if (sh > 255) sh = 255;
1825 1971
… …
1880 tileid tile = cell->tile [z]; 2026 tileid tile = cell->tile [z];
1881 2027
1882 if (tile) 2028 if (tile)
1883 { 2029 {
1884 maptex tex = self->tex [tile]; 2030 maptex tex = self->tex [tile];
1885 int px, py; 2031 int px = (x + 1) * T - tex.w;
2032 int py = (y + 1) * T - tex.h;
1886 2033
1887 if (key.texname != tex.name) 2034 if (key.texname != tex.name)
1888 { 2035 {
1889 if (!tex.name) 2036 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2037 tex = self->tex [2]; /* missing, replace by noface */
1891 2038
1892 key.texname = tex.name; 2039 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2040 arr = rc_array (rc, &key);
1894 } 2041 }
1895 2042
1896 px = (x + 1) * T - tex.w; 2043 if (expect_false (cell->player == player) && expect_false (z == 2))
1897 py = (y + 1) * T - tex.h; 2044 {
2045 pl_x = px;
2046 pl_y = py;
2047 pl_tex = tex;
2048 continue;
2049 }
1898 2050
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2051 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2052 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
1901 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0); 2053 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
1902 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2054 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903 2055
1904 if (cell->flags && z == 2) 2056 if (expect_false (cell->flags) && expect_false (z == 2))
1905 { 2057 {
1906 // overlays such as the speech bubble, probably more to come 2058 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1) 2059 if (cell->flags & 1)
1908 { 2060 {
1909 maptex tex = self->tex [1]; 2061 maptex tex = self->tex [1];
… …
2048 } 2200 }
2049 2201
2050 hv_clear (smooth); 2202 hv_clear (smooth);
2051 } 2203 }
2052 2204
2205 if (pl_tex.name)
2206 {
2207 maptex tex = pl_tex;
2208 int px = pl_x + sdx;
2209 int py = pl_y + sdy;
2210
2211 key.texname = tex.name;
2212 arr = rc_array (rc, &key);
2213
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2216 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2218
2219 rc_draw (rc);
2220 }
2221
2053 glDisable (GL_BLEND); 2222 glDisable (GL_BLEND);
2054 rc_free (rc); 2223 rc_free (rc);
2055 2224
2056 // top layer: overlays such as the health bar 2225 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2226 for (y = 0; y < sh; y++)
… …
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2331 SvCUR_set (darkness3_sv, sw34 * sh3);
2163 2332
2164 mx += self->x - 1; 2333 mx += self->x - 1;
2165 my += self->y - 1; 2334 my += self->y - 1;
2166 2335
2167 memset (darkness1, 255, sw1 * sh1); 2336 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2168 2337
2169 for (y = 0; y < sh1; y++) 2338 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2339 if (0 <= y + my && y + my < self->rows)
2171 { 2340 {
2172 maprow *row = self->row + (y + my); 2341 maprow *row = self->row + (y + my);
… …
2292 else 2461 else
2293 *data++ = 0; 2462 *data++ = 0;
2294 } 2463 }
2295 } 2464 }
2296 2465
2466 /* if size is w*h + 5 then no data has been found */
2297 if (data - (uint8_t *)SvPVX (data_sv) == w * h + 5) 2467 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2298 {
2299 SvREFCNT_dec (data_sv);
2300 RETVAL = &PL_sv_undef;
2301 }
2302 else
2303 { 2468 {
2304 SvPOK_only (data_sv); 2469 SvPOK_only (data_sv);
2305 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2470 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2306 RETVAL = data_sv;
2307 } 2471 }
2472
2473 RETVAL = data_sv;
2308} 2474}
2309 OUTPUT: 2475 OUTPUT:
2310 RETVAL 2476 RETVAL
2311 2477
2312void 2478void
… …
2318 int x1, y1; 2484 int x1, y1;
2319 STRLEN len; 2485 STRLEN len;
2320 uint8_t *data, *end; 2486 uint8_t *data, *end;
2321 2487
2322 len = SvLEN (data_sv); 2488 len = SvLEN (data_sv);
2323 SvGROW (data_sv, len + 7); // reserve at least 7+ bytes more 2489 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2324 data = SvPVbyte_nolen (data_sv); 2490 data = SvPVbyte_nolen (data_sv);
2325 end = data + len + 7; 2491 end = data + len + 8;
2326 2492
2327 if (len < 5) 2493 if (len < 5)
2328 XSRETURN_EMPTY; 2494 XSRETURN_EMPTY;
2329 2495
2330 if (*data++ != 0) 2496 if (*data++ != 0)
… …
2366 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2532 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2367 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2533 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2368 2534
2369 if (cell->darkness == 0) 2535 if (cell->darkness == 0)
2370 { 2536 {
2371 cell->darkness = 0; 2537 /*cell->darkness = 0;*/
2538 EXTEND (SP, 3);
2372 2539
2373 for (z = 0; z <= 2; z++) 2540 for (z = 0; z <= 2; z++)
2374 { 2541 {
2375 tileid t = tile [z]; 2542 tileid t = tile [z];
2376 2543
2377 if (t >= self->texs || (t && !self->tex [t].name)) 2544 if (t >= self->texs || (t && !self->tex [t].name))
2378 { 2545 {
2379 XPUSHs (sv_2mortal (newSViv (t))); 2546 PUSHs (sv_2mortal (newSViv (t)));
2380 need_texid (self, t); 2547 need_texid (self, t);
2381 } 2548 }
2382 2549
2383 cell->tile [z] = t; 2550 cell->tile [z] = t;
2384 } 2551 }

Diff Legend

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