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.277 by root, Mon Sep 1 06:18:09 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
… …
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 95
82#if 0 96#define KMOD_LRAM 0x10000 // our extension
83# define PARACHUTE SDL_INIT_NOPARACHUTE
84#else
85# define PARACHUTE 0
86#endif
87 97
88static AV *texture_av; 98static AV *texture_av;
89 99
90static struct 100static struct
91{ 101{
… …
364 self->oy = 0; 374 self->oy = 0;
365 self->row = 0; 375 self->row = 0;
366 self->rows = 0; 376 self->rows = 0;
367} 377}
368 378
379#define CELL_CLEAR(cell) \
380 do { \
381 if ((cell)->player) \
382 (cell)->tile [2] = 0; \
383 (cell)->darkness = 0; \
384 (cell)->stat_hp = 0; \
385 (cell)->flags = 0; \
386 (cell)->player = 0; \
387 } while (0)
388
369static void 389static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 390map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 391{
372 int x, y; 392 int x, y;
373 maprow *row; 393 maprow *row;
… …
387 if (x >= row->c1) 407 if (x >= row->c1)
388 break; 408 break;
389 409
390 cell = row->col + x - row->c0; 410 cell = row->col + x - row->c0;
391 411
392 cell->darkness = 0; 412 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 413 }
397 } 414 }
398} 415}
399 416
400typedef struct { 417typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 528 if (!svp || !SvTRUE (*svp))
512 return 0; 529 return 0;
513 530
514 return 1; 531 return 1;
515} 532}
533
534/******************************************************************************/
535
536/* process keyboard modifiers */
537static int
538mod_munge (int mod)
539{
540 mod &= MOD_MASK;
541
542 if (mod & (KMOD_META | KMOD_ALT))
543 mod |= KMOD_LRAM;
544
545 return mod;
546}
547
548static void
549deliantra_main ()
550{
551 char *argv[] = { 0 };
552 call_argv ("::main", G_DISCARD | G_VOID, argv);
553}
554
555#ifdef __MACOSX__
556 /* to due surprising braindamage on the side of SDL design, we
557 * do some mind-boggling hack here: SDL requires a custom main()
558 * on OS X, so... we provide one and call the original main(), which,
559 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
560 * and which calls our main (== SDL_main) back.
561 */
562 extern C_LINKAGE int
563 main (int argc, char *argv[])
564 {
565 deliantra_main ();
566 }
567
568 #undef main
569
570 extern C_LINKAGE int main (int argc, char *argv[]);
571
572 static void
573 SDL_braino (void)
574 {
575 char *argv[] = { "deliantra client", 0 };
576 (main) (1, argv);
577 }
578#else
579 static void
580 SDL_braino (void)
581 {
582 deliantra_main ();
583 }
584#endif
516 585
517MODULE = Deliantra::Client PACKAGE = DC 586MODULE = Deliantra::Client PACKAGE = DC
518 587
519PROTOTYPES: ENABLE 588PROTOTYPES: ENABLE
520 589
… …
549 const_iv (SDL_USEREVENT), 618 const_iv (SDL_USEREVENT),
550 619
551 const_iv (SDL_APPINPUTFOCUS), 620 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 621 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 622 const_iv (SDL_APPACTIVE),
623
624
625 const_iv (SDLK_UNKNOWN),
626 const_iv (SDLK_FIRST),
627 const_iv (SDLK_BACKSPACE),
628 const_iv (SDLK_TAB),
629 const_iv (SDLK_CLEAR),
630 const_iv (SDLK_RETURN),
631 const_iv (SDLK_PAUSE),
632 const_iv (SDLK_ESCAPE),
633 const_iv (SDLK_SPACE),
634 const_iv (SDLK_EXCLAIM),
635 const_iv (SDLK_QUOTEDBL),
636 const_iv (SDLK_HASH),
637 const_iv (SDLK_DOLLAR),
638 const_iv (SDLK_AMPERSAND),
639 const_iv (SDLK_QUOTE),
640 const_iv (SDLK_LEFTPAREN),
641 const_iv (SDLK_RIGHTPAREN),
642 const_iv (SDLK_ASTERISK),
643 const_iv (SDLK_PLUS),
644 const_iv (SDLK_COMMA),
645 const_iv (SDLK_MINUS),
646 const_iv (SDLK_PERIOD),
647 const_iv (SDLK_SLASH),
648 const_iv (SDLK_0),
649 const_iv (SDLK_1),
650 const_iv (SDLK_2),
651 const_iv (SDLK_3),
652 const_iv (SDLK_4),
653 const_iv (SDLK_5),
654 const_iv (SDLK_6),
655 const_iv (SDLK_7),
656 const_iv (SDLK_8),
657 const_iv (SDLK_9),
658 const_iv (SDLK_COLON),
659 const_iv (SDLK_SEMICOLON),
660 const_iv (SDLK_LESS),
661 const_iv (SDLK_EQUALS),
662 const_iv (SDLK_GREATER),
663 const_iv (SDLK_QUESTION),
664 const_iv (SDLK_AT),
665
666 const_iv (SDLK_LEFTBRACKET),
667 const_iv (SDLK_BACKSLASH),
668 const_iv (SDLK_RIGHTBRACKET),
669 const_iv (SDLK_CARET),
670 const_iv (SDLK_UNDERSCORE),
671 const_iv (SDLK_BACKQUOTE),
672 const_iv (SDLK_DELETE),
554 673
555 const_iv (SDLK_FIRST), 674 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 675 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 676 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 677 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 753 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 754 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 755 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 756 const_iv (KMOD_MODE),
638 757
758 const_iv (KMOD_LRAM),
759
639 const_iv (MIX_DEFAULT_FORMAT), 760 const_iv (MIX_DEFAULT_FORMAT),
761
762 const_iv (SDL_INIT_TIMER),
763 const_iv (SDL_INIT_AUDIO),
764 const_iv (SDL_INIT_VIDEO),
765 const_iv (SDL_INIT_CDROM),
766 const_iv (SDL_INIT_JOYSTICK),
767 const_iv (SDL_INIT_EVERYTHING),
768 const_iv (SDL_INIT_NOPARACHUTE),
769 const_iv (SDL_INIT_EVENTTHREAD),
770
771 const_iv (SDL_GL_RED_SIZE),
772 const_iv (SDL_GL_GREEN_SIZE),
773 const_iv (SDL_GL_BLUE_SIZE),
774 const_iv (SDL_GL_ALPHA_SIZE),
775 const_iv (SDL_GL_DOUBLEBUFFER),
776 const_iv (SDL_GL_BUFFER_SIZE),
777 const_iv (SDL_GL_DEPTH_SIZE),
778 const_iv (SDL_GL_STENCIL_SIZE),
779 const_iv (SDL_GL_ACCUM_RED_SIZE),
780 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
781 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
782 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
783 const_iv (SDL_GL_STEREO),
784 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
785 const_iv (SDL_GL_MULTISAMPLESAMPLES),
786 const_iv (SDL_GL_ACCELERATED_VISUAL),
787 const_iv (SDL_GL_SWAP_CONTROL),
788
789 const_iv (FOW_DARKNESS)
640# undef const_iv 790# undef const_iv
641 }; 791 };
642 792
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 793 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 794 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 830 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 831 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 832#endif
683} 833}
684 834
685char *
686SDL_GetError () 835char *SDL_GetError ()
687 836
688int 837void SDL_braino ()
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 838
691void 839int SDL_Init (U32 flags)
840
841int SDL_InitSubSystem (U32 flags)
842
843void SDL_QuitSubSystem (U32 flags)
844
692SDL_Quit () 845void SDL_Quit ()
846
847int SDL_GL_SetAttribute (int attr, int value)
848
849int SDL_GL_GetAttribute (int attr)
850 CODE:
851 if (SDL_GL_GetAttribute (attr, &RETVAL))
852 XSRETURN_UNDEF;
853 OUTPUT:
854 RETVAL
693 855
694void 856void
695SDL_ListModes (int rgb, int alpha) 857SDL_ListModes (int rgb, int alpha)
696 PPCODE: 858 PPCODE:
697{ 859{
… …
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 871 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 874
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 875 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); 876 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 877
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 878 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 879
721 if (m && m != (SDL_Rect **)-1) 880 if (m && m != (SDL_Rect **)-1)
722 while (*m) 881 while (*m)
723 { 882 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 883 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 884 {
726 AV *av = newAV (); 885 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 886 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 887 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 888 av_push (av, newSViv (rgb));
… …
792 { 951 {
793 case SDL_KEYDOWN: 952 case SDL_KEYDOWN:
794 case SDL_KEYUP: 953 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 954 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 955 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
797 hv_store (hv, "mod", 3, newSViv (ev.key.keysym.mod & MOD_MASK), 0); 956 hv_store (hv, "mod", 3, newSViv (mod_munge (ev.key.keysym.mod)), 0);
798 hv_store (hv, "cmod", 4, newSViv (SDL_GetModState () & MOD_MASK), 0); /* current mode */ 957 hv_store (hv, "cmod", 4, newSViv (mod_munge (SDL_GetModState ())), 0); /* current mode */
799 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 958 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 959 break;
801 960
802 case SDL_ACTIVEEVENT: 961 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 962 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
821 x = ev.motion.x; 980 x = ev.motion.x;
822 y = ev.motion.y; 981 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 982 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 983 }
825 984
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 985 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 986 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 987 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 988 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 989 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 990 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1687 uint8_t ext, cmd; 1846 uint8_t ext, cmd;
1688 1847
1689 do 1848 do
1690 { 1849 {
1691 ext = *data++; 1850 ext = *data++;
1692 cmd = ext & 0x3f; 1851 cmd = ext & 0x7f;
1693 1852
1694 if (cmd < 4) 1853 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 1854 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health 1855 else if (cmd == 5) // health
1697 { 1856 {
… …
1700 } 1859 }
1701 else if (cmd == 6) // monster width 1860 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 1861 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 1862 else if (cmd == 0x47)
1704 { 1863 {
1705 if (*data == 4) 1864 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 1865 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1866 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1867 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 1868
1708 data += *data + 1; 1869 data += *data + 1;
1709 } 1870 }
1710 else if (cmd == 8) // cell flags 1871 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 1872 cell->flags = *data++;
… …
1741 } 1902 }
1742 } 1903 }
1743 } 1904 }
1744 } 1905 }
1745 else 1906 else
1746 cell->darkness = 0; 1907 CELL_CLEAR (cell);
1747 } 1908 }
1748} 1909}
1749 OUTPUT: 1910 OUTPUT:
1750 RETVAL 1911 RETVAL
1751 1912
… …
1803} 1964}
1804 OUTPUT: 1965 OUTPUT:
1805 RETVAL 1966 RETVAL
1806 1967
1807void 1968void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1969draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 1970 CODE:
1810{ 1971{
1811 int x, y, z; 1972 int x, y, z;
1812 1973
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 1974 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 1975 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) 1976 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 1977 smooth_key skey;
1817 1978 int pl_x, pl_y;
1979 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 1980 rc_t *rc = rc_alloc ();
1819 rc_key_t key; 1981 rc_key_t key;
1820 rc_array_t *arr; 1982 rc_array_t *arr;
1983
1984 pl_tex.name = 0;
1821 1985
1822 // thats current max. sorry. 1986 // thats current max. sorry.
1823 if (sw > 255) sw = 255; 1987 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 1988 if (sh > 255) sh = 255;
1825 1989
… …
1880 tileid tile = cell->tile [z]; 2044 tileid tile = cell->tile [z];
1881 2045
1882 if (tile) 2046 if (tile)
1883 { 2047 {
1884 maptex tex = self->tex [tile]; 2048 maptex tex = self->tex [tile];
1885 int px, py; 2049 int px = (x + 1) * T - tex.w;
2050 int py = (y + 1) * T - tex.h;
1886 2051
1887 if (key.texname != tex.name) 2052 if (key.texname != tex.name)
1888 { 2053 {
1889 if (!tex.name) 2054 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2055 tex = self->tex [2]; /* missing, replace by noface */
1891 2056
1892 key.texname = tex.name; 2057 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2058 arr = rc_array (rc, &key);
1894 } 2059 }
1895 2060
1896 px = (x + 1) * T - tex.w; 2061 if (expect_false (cell->player == player) && expect_false (z == 2))
1897 py = (y + 1) * T - tex.h; 2062 {
2063 pl_x = px;
2064 pl_y = py;
2065 pl_tex = tex;
2066 continue;
2067 }
1898 2068
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2069 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2070 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); 2071 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); 2072 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903 2073
1904 if (cell->flags && z == 2) 2074 if (expect_false (cell->flags) && expect_false (z == 2))
1905 { 2075 {
1906 // overlays such as the speech bubble, probably more to come 2076 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1) 2077 if (cell->flags & 1)
1908 { 2078 {
1909 maptex tex = self->tex [1]; 2079 maptex tex = self->tex [1];
… …
2048 } 2218 }
2049 2219
2050 hv_clear (smooth); 2220 hv_clear (smooth);
2051 } 2221 }
2052 2222
2223 if (pl_tex.name)
2224 {
2225 maptex tex = pl_tex;
2226 int px = pl_x + sdx;
2227 int py = pl_y + sdy;
2228
2229 key.texname = tex.name;
2230 arr = rc_array (rc, &key);
2231
2232 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2233 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2234 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2235 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2236
2237 rc_draw (rc);
2238 }
2239
2053 glDisable (GL_BLEND); 2240 glDisable (GL_BLEND);
2054 rc_free (rc); 2241 rc_free (rc);
2055 2242
2056 // top layer: overlays such as the health bar 2243 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2244 for (y = 0; y < sh; y++)
… …
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2349 SvCUR_set (darkness3_sv, sw34 * sh3);
2163 2350
2164 mx += self->x - 1; 2351 mx += self->x - 1;
2165 my += self->y - 1; 2352 my += self->y - 1;
2166 2353
2167 memset (darkness1, 255, sw1 * sh1); 2354 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2168 2355
2169 for (y = 0; y < sh1; y++) 2356 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2357 if (0 <= y + my && y + my < self->rows)
2171 { 2358 {
2172 maprow *row = self->row + (y + my); 2359 maprow *row = self->row + (y + my);
… …
2292 else 2479 else
2293 *data++ = 0; 2480 *data++ = 0;
2294 } 2481 }
2295 } 2482 }
2296 2483
2484 /* if size is w*h + 5 then no data has been found */
2297 if (data - (uint8_t *)SvPVX (data_sv) == w * h + 5) 2485 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 { 2486 {
2304 SvPOK_only (data_sv); 2487 SvPOK_only (data_sv);
2305 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2488 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2306 RETVAL = data_sv;
2307 } 2489 }
2490
2491 RETVAL = data_sv;
2308} 2492}
2309 OUTPUT: 2493 OUTPUT:
2310 RETVAL 2494 RETVAL
2311 2495
2312void 2496void
… …
2318 int x1, y1; 2502 int x1, y1;
2319 STRLEN len; 2503 STRLEN len;
2320 uint8_t *data, *end; 2504 uint8_t *data, *end;
2321 2505
2322 len = SvLEN (data_sv); 2506 len = SvLEN (data_sv);
2323 SvGROW (data_sv, len + 7); // reserve at least 7+ bytes more 2507 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2324 data = SvPVbyte_nolen (data_sv); 2508 data = SvPVbyte_nolen (data_sv);
2325 end = data + len + 7; 2509 end = data + len + 8;
2326 2510
2327 if (len < 5) 2511 if (len < 5)
2328 XSRETURN_EMPTY; 2512 XSRETURN_EMPTY;
2329 2513
2330 if (*data++ != 0) 2514 if (*data++ != 0)
… …
2366 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2550 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2367 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2551 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2368 2552
2369 if (cell->darkness == 0) 2553 if (cell->darkness == 0)
2370 { 2554 {
2371 cell->darkness = 0; 2555 /*cell->darkness = 0;*/
2556 EXTEND (SP, 3);
2372 2557
2373 for (z = 0; z <= 2; z++) 2558 for (z = 0; z <= 2; z++)
2374 { 2559 {
2375 tileid t = tile [z]; 2560 tileid t = tile [z];
2376 2561
2377 if (t >= self->texs || (t && !self->tex [t].name)) 2562 if (t >= self->texs || (t && !self->tex [t].name))
2378 { 2563 {
2379 XPUSHs (sv_2mortal (newSViv (t))); 2564 PUSHs (sv_2mortal (newSViv (t)));
2380 need_texid (self, t); 2565 need_texid (self, t);
2381 } 2566 }
2382 2567
2383 cell->tile [z] = t; 2568 cell->tile [z] = t;
2384 } 2569 }

Diff Legend

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