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.258 by root, Thu Apr 10 14:35:50 2008 UTC vs.
Revision 1.281 by root, Thu Dec 4 23:58:20 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 16
73 87
74#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
75#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
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 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{
… …
223 int w, h; 233 int w, h;
224 float s, t; 234 float s, t;
225 uint8_t r, g, b, a; 235 uint8_t r, g, b, a;
226 tileid smoothtile; 236 tileid smoothtile;
227 uint8_t smoothlevel; 237 uint8_t smoothlevel;
238 uint8_t unused; /* set to zero on use */
228} maptex; 239} maptex;
229 240
230typedef struct { 241typedef struct {
231 uint32_t player; 242 uint32_t player;
232 tileid tile[3]; 243 tileid tile[3];
… …
364 self->oy = 0; 375 self->oy = 0;
365 self->row = 0; 376 self->row = 0;
366 self->rows = 0; 377 self->rows = 0;
367} 378}
368 379
380#define CELL_CLEAR(cell) \
381 do { \
382 if ((cell)->player) \
383 (cell)->tile [2] = 0; \
384 (cell)->darkness = 0; \
385 (cell)->stat_hp = 0; \
386 (cell)->flags = 0; \
387 (cell)->player = 0; \
388 } while (0)
389
369static void 390static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 391map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 392{
372 int x, y; 393 int x, y;
373 maprow *row; 394 maprow *row;
… …
387 if (x >= row->c1) 408 if (x >= row->c1)
388 break; 409 break;
389 410
390 cell = row->col + x - row->c0; 411 cell = row->col + x - row->c0;
391 412
392 cell->darkness = 0; 413 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 414 }
397 } 415 }
398} 416}
399 417
400typedef struct { 418typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 529 if (!svp || !SvTRUE (*svp))
512 return 0; 530 return 0;
513 531
514 return 1; 532 return 1;
515} 533}
534
535/******************************************************************************/
536
537/* process keyboard modifiers */
538static int
539mod_munge (int mod)
540{
541 mod &= MOD_MASK;
542
543 if (mod & (KMOD_META | KMOD_ALT))
544 mod |= KMOD_LRAM;
545
546 return mod;
547}
548
549static void
550deliantra_main ()
551{
552 char *argv[] = { 0 };
553 call_argv ("::main", G_DISCARD | G_VOID, argv);
554}
555
556#ifdef __MACOSX__
557 /* to due surprising braindamage on the side of SDL design, we
558 * do some mind-boggling hack here: SDL requires a custom main()
559 * on OS X, so... we provide one and call the original main(), which,
560 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
561 * and which calls our main (== SDL_main) back.
562 */
563 extern C_LINKAGE int
564 main (int argc, char *argv[])
565 {
566 deliantra_main ();
567 }
568
569 #undef main
570
571 extern C_LINKAGE int main (int argc, char *argv[]);
572
573 static void
574 SDL_braino (void)
575 {
576 char *argv[] = { "deliantra client", 0 };
577 (main) (1, argv);
578 }
579#else
580 static void
581 SDL_braino (void)
582 {
583 deliantra_main ();
584 }
585#endif
516 586
517MODULE = Deliantra::Client PACKAGE = DC 587MODULE = Deliantra::Client PACKAGE = DC
518 588
519PROTOTYPES: ENABLE 589PROTOTYPES: ENABLE
520 590
… …
549 const_iv (SDL_USEREVENT), 619 const_iv (SDL_USEREVENT),
550 620
551 const_iv (SDL_APPINPUTFOCUS), 621 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 622 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 623 const_iv (SDL_APPACTIVE),
624
625
626 const_iv (SDLK_UNKNOWN),
627 const_iv (SDLK_FIRST),
628 const_iv (SDLK_BACKSPACE),
629 const_iv (SDLK_TAB),
630 const_iv (SDLK_CLEAR),
631 const_iv (SDLK_RETURN),
632 const_iv (SDLK_PAUSE),
633 const_iv (SDLK_ESCAPE),
634 const_iv (SDLK_SPACE),
635 const_iv (SDLK_EXCLAIM),
636 const_iv (SDLK_QUOTEDBL),
637 const_iv (SDLK_HASH),
638 const_iv (SDLK_DOLLAR),
639 const_iv (SDLK_AMPERSAND),
640 const_iv (SDLK_QUOTE),
641 const_iv (SDLK_LEFTPAREN),
642 const_iv (SDLK_RIGHTPAREN),
643 const_iv (SDLK_ASTERISK),
644 const_iv (SDLK_PLUS),
645 const_iv (SDLK_COMMA),
646 const_iv (SDLK_MINUS),
647 const_iv (SDLK_PERIOD),
648 const_iv (SDLK_SLASH),
649 const_iv (SDLK_0),
650 const_iv (SDLK_1),
651 const_iv (SDLK_2),
652 const_iv (SDLK_3),
653 const_iv (SDLK_4),
654 const_iv (SDLK_5),
655 const_iv (SDLK_6),
656 const_iv (SDLK_7),
657 const_iv (SDLK_8),
658 const_iv (SDLK_9),
659 const_iv (SDLK_COLON),
660 const_iv (SDLK_SEMICOLON),
661 const_iv (SDLK_LESS),
662 const_iv (SDLK_EQUALS),
663 const_iv (SDLK_GREATER),
664 const_iv (SDLK_QUESTION),
665 const_iv (SDLK_AT),
666
667 const_iv (SDLK_LEFTBRACKET),
668 const_iv (SDLK_BACKSLASH),
669 const_iv (SDLK_RIGHTBRACKET),
670 const_iv (SDLK_CARET),
671 const_iv (SDLK_UNDERSCORE),
672 const_iv (SDLK_BACKQUOTE),
673 const_iv (SDLK_DELETE),
554 674
555 const_iv (SDLK_FIRST), 675 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 676 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 677 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 678 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 754 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 755 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 756 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 757 const_iv (KMOD_MODE),
638 758
759 const_iv (KMOD_LRAM),
760
639 const_iv (MIX_DEFAULT_FORMAT), 761 const_iv (MIX_DEFAULT_FORMAT),
762
763 const_iv (SDL_INIT_TIMER),
764 const_iv (SDL_INIT_AUDIO),
765 const_iv (SDL_INIT_VIDEO),
766 const_iv (SDL_INIT_CDROM),
767 const_iv (SDL_INIT_JOYSTICK),
768 const_iv (SDL_INIT_EVERYTHING),
769 const_iv (SDL_INIT_NOPARACHUTE),
770 const_iv (SDL_INIT_EVENTTHREAD),
771
772 const_iv (SDL_GL_RED_SIZE),
773 const_iv (SDL_GL_GREEN_SIZE),
774 const_iv (SDL_GL_BLUE_SIZE),
775 const_iv (SDL_GL_ALPHA_SIZE),
776 const_iv (SDL_GL_DOUBLEBUFFER),
777 const_iv (SDL_GL_BUFFER_SIZE),
778 const_iv (SDL_GL_DEPTH_SIZE),
779 const_iv (SDL_GL_STENCIL_SIZE),
780 const_iv (SDL_GL_ACCUM_RED_SIZE),
781 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
782 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
783 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
784 const_iv (SDL_GL_STEREO),
785 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
786 const_iv (SDL_GL_MULTISAMPLESAMPLES),
787 const_iv (SDL_GL_ACCELERATED_VISUAL),
788 const_iv (SDL_GL_SWAP_CONTROL),
789
790 const_iv (FOW_DARKNESS)
640# undef const_iv 791# undef const_iv
641 }; 792 };
642 793
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 794 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 795 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 831 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 832 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 833#endif
683} 834}
684 835
685char *
686SDL_GetError () 836char *SDL_GetError ()
687 837
688int 838void SDL_braino ()
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 839
691void 840int SDL_Init (U32 flags)
841
842int SDL_InitSubSystem (U32 flags)
843
844void SDL_QuitSubSystem (U32 flags)
845
692SDL_Quit () 846void SDL_Quit ()
847
848int SDL_GL_SetAttribute (int attr, int value)
849
850int SDL_GL_GetAttribute (int attr)
851 CODE:
852 if (SDL_GL_GetAttribute (attr, &RETVAL))
853 XSRETURN_UNDEF;
854 OUTPUT:
855 RETVAL
693 856
694void 857void
695SDL_ListModes (int rgb, int alpha) 858SDL_ListModes (int rgb, int alpha)
696 PPCODE: 859 PPCODE:
697{ 860{
… …
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 872 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 873 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 874 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 875
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 876 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); 877 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 878
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 879 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 880
721 if (m && m != (SDL_Rect **)-1) 881 if (m && m != (SDL_Rect **)-1)
722 while (*m) 882 while (*m)
723 { 883 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 884 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 885 {
726 AV *av = newAV (); 886 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 887 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 888 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 889 av_push (av, newSViv (rgb));
… …
792 { 952 {
793 case SDL_KEYDOWN: 953 case SDL_KEYDOWN:
794 case SDL_KEYUP: 954 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 955 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 956 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); 957 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 */ 958 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); 959 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 960 break;
801 961
802 case SDL_ACTIVEEVENT: 962 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 963 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
821 x = ev.motion.x; 981 x = ev.motion.x;
822 y = ev.motion.y; 982 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 983 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 984 }
825 985
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 986 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 987 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 988 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 989 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 990 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 991 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1047#if DEBUG 1207#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1208 VALGRIND_DO_LEAK_CHECK;
1049#endif 1209#endif
1050} 1210}
1051 1211
1212int
1213SvREFCNT (SV *sv)
1214 CODE:
1215 RETVAL = SvREFCNT (sv);
1216 OUTPUT:
1217 RETVAL
1218
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1219MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1220
1054PROTOTYPES: DISABLE 1221PROTOTYPES: DISABLE
1055 1222
1056DC::Font 1223DC::Font
… …
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1767 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1768 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1769 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1770 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 1771}
1772
1773void
1774expire_textures (DC::Map self, int texid, int count)
1775 PPCODE:
1776 for (; texid < self->texs && count; ++texid, --count)
1777 {
1778 maptex *tex = self->tex + texid;
1779
1780 if (tex->name)
1781 {
1782 if (tex->unused)
1783 {
1784 tex->name = 0;
1785 tex->unused = 0,
1786 XPUSHs (sv_2mortal (newSViv (texid)));
1787 }
1788 else
1789 tex->unused = 1;
1790 }
1791 }
1605 1792
1606int 1793int
1607ox (DC::Map self) 1794ox (DC::Map self)
1608 ALIAS: 1795 ALIAS:
1609 oy = 1 1796 oy = 1
… …
1687 uint8_t ext, cmd; 1874 uint8_t ext, cmd;
1688 1875
1689 do 1876 do
1690 { 1877 {
1691 ext = *data++; 1878 ext = *data++;
1692 cmd = ext & 0x3f; 1879 cmd = ext & 0x7f;
1693 1880
1694 if (cmd < 4) 1881 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 1882 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health 1883 else if (cmd == 5) // health
1697 { 1884 {
… …
1700 } 1887 }
1701 else if (cmd == 6) // monster width 1888 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 1889 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 1890 else if (cmd == 0x47)
1704 { 1891 {
1705 if (*data == 4) 1892 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 1893 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1894 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1895 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 1896
1708 data += *data + 1; 1897 data += *data + 1;
1709 } 1898 }
1710 else if (cmd == 8) // cell flags 1899 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 1900 cell->flags = *data++;
… …
1728 cell->tile [z] = self->face2tile [face]; 1917 cell->tile [z] = self->face2tile [face];
1729 1918
1730 if (cell->tile [z]) 1919 if (cell->tile [z])
1731 { 1920 {
1732 maptex *tex = self->tex + cell->tile [z]; 1921 maptex *tex = self->tex + cell->tile [z];
1922 tex->unused = 0;
1733 if (!tex->name) 1923 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 1924 av_push (missing, newSViv (cell->tile [z]));
1735 1925
1736 if (tex->smoothtile) 1926 if (tex->smoothtile)
1737 { 1927 {
1738 maptex *smooth = self->tex + tex->smoothtile; 1928 maptex *smooth = self->tex + tex->smoothtile;
1929 smooth->unused = 0;
1739 if (!smooth->name) 1930 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 1931 av_push (missing, newSViv (tex->smoothtile));
1741 } 1932 }
1742 } 1933 }
1743 } 1934 }
1744 } 1935 }
1745 else 1936 else
1746 cell->darkness = 0; 1937 CELL_CLEAR (cell);
1747 } 1938 }
1748} 1939}
1749 OUTPUT: 1940 OUTPUT:
1750 RETVAL 1941 RETVAL
1751 1942
… …
1803} 1994}
1804 OUTPUT: 1995 OUTPUT:
1805 RETVAL 1996 RETVAL
1806 1997
1807void 1998void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 1999draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 2000 CODE:
1810{ 2001{
1811 int x, y, z; 2002 int x, y, z;
1812 2003
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2004 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2005 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) 2006 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 2007 smooth_key skey;
1817 2008 int pl_x, pl_y;
2009 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2010 rc_t *rc = rc_alloc ();
1819 rc_key_t key; 2011 rc_key_t key;
1820 rc_array_t *arr; 2012 rc_array_t *arr;
2013
2014 pl_tex.name = 0;
1821 2015
1822 // thats current max. sorry. 2016 // thats current max. sorry.
1823 if (sw > 255) sw = 255; 2017 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2018 if (sh > 255) sh = 255;
1825 2019
… …
1880 tileid tile = cell->tile [z]; 2074 tileid tile = cell->tile [z];
1881 2075
1882 if (tile) 2076 if (tile)
1883 { 2077 {
1884 maptex tex = self->tex [tile]; 2078 maptex tex = self->tex [tile];
1885 int px, py; 2079 int px = (x + 1) * T - tex.w;
2080 int py = (y + 1) * T - tex.h;
1886 2081
1887 if (key.texname != tex.name) 2082 if (key.texname != tex.name)
1888 { 2083 {
2084 self->tex [tile].unused = 0;
2085
1889 if (!tex.name) 2086 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2087 tex = self->tex [2]; /* missing, replace by noface */
1891 2088
1892 key.texname = tex.name; 2089 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2090 arr = rc_array (rc, &key);
1894 } 2091 }
1895 2092
1896 px = (x + 1) * T - tex.w; 2093 if (expect_false (cell->player == player) && expect_false (z == 2))
1897 py = (y + 1) * T - tex.h; 2094 {
2095 pl_x = px;
2096 pl_y = py;
2097 pl_tex = tex;
2098 continue;
2099 }
1898 2100
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2101 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2102 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); 2103 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); 2104 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903 2105
1904 if (cell->flags && z == 2) 2106 if (expect_false (cell->flags) && expect_false (z == 2))
1905 { 2107 {
1906 // overlays such as the speech bubble, probably more to come 2108 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1) 2109 if (cell->flags & 1)
1908 { 2110 {
1909 maptex tex = self->tex [1]; 2111 maptex tex = self->tex [1];
… …
2010 { 2212 {
2011 // this time avoiding texture state changes 2213 // this time avoiding texture state changes
2012 // save gobs of state changes. 2214 // save gobs of state changes.
2013 if (key.texname != tex.name) 2215 if (key.texname != tex.name)
2014 { 2216 {
2217 self->tex [skey->tile].unused = 0;
2218
2015 glEnd (); 2219 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2220 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2221 glBegin (GL_QUADS);
2018 } 2222 }
2019 2223
… …
2048 } 2252 }
2049 2253
2050 hv_clear (smooth); 2254 hv_clear (smooth);
2051 } 2255 }
2052 2256
2257 if (pl_tex.name)
2258 {
2259 maptex tex = pl_tex;
2260 int px = pl_x + sdx;
2261 int py = pl_y + sdy;
2262
2263 key.texname = tex.name;
2264 arr = rc_array (rc, &key);
2265
2266 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2267 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2268 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2269 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2270
2271 rc_draw (rc);
2272 }
2273
2053 glDisable (GL_BLEND); 2274 glDisable (GL_BLEND);
2054 rc_free (rc); 2275 rc_free (rc);
2055 2276
2056 // top layer: overlays such as the health bar 2277 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2278 for (y = 0; y < sh; y++)
… …
2064 { 2285 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2286 mapcell *cell = row->col + (x + mx - row->c0);
2066 2287
2067 int px = x * T; 2288 int px = x * T;
2068 int py = y * T; 2289 int py = y * T;
2290
2291 if (expect_false (cell->player == player))
2292 {
2293 px += sdx;
2294 py += sdy;
2295 }
2069 2296
2070 if (cell->stat_hp) 2297 if (cell->stat_hp)
2071 { 2298 {
2072 int width = cell->stat_width * T; 2299 int width = cell->stat_width * T;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2300 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2389 SvCUR_set (darkness3_sv, sw34 * sh3);
2163 2390
2164 mx += self->x - 1; 2391 mx += self->x - 1;
2165 my += self->y - 1; 2392 my += self->y - 1;
2166 2393
2167 memset (darkness1, 255, sw1 * sh1); 2394 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2168 2395
2169 for (y = 0; y < sh1; y++) 2396 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2397 if (0 <= y + my && y + my < self->rows)
2171 { 2398 {
2172 maprow *row = self->row + (y + my); 2399 maprow *row = self->row + (y + my);
… …
2292 else 2519 else
2293 *data++ = 0; 2520 *data++ = 0;
2294 } 2521 }
2295 } 2522 }
2296 2523
2524 /* if size is w*h + 5 then no data has been found */
2525 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2526 {
2297 SvPOK_only (data_sv); 2527 SvPOK_only (data_sv);
2298 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2528 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2529 }
2530
2299 RETVAL = data_sv; 2531 RETVAL = data_sv;
2300} 2532}
2301 OUTPUT: 2533 OUTPUT:
2302 RETVAL 2534 RETVAL
2303 2535
2304void 2536void
2305set_rect (DC::Map self, int x0, int y0, uint8_t *data) 2537set_rect (DC::Map self, int x0, int y0, SV *data_sv)
2306 PPCODE: 2538 PPCODE:
2307{ 2539{
2308 int x, y, z; 2540 int x, y, z;
2309 int w, h; 2541 int w, h;
2310 int x1, y1; 2542 int x1, y1;
2543 STRLEN len;
2544 uint8_t *data, *end;
2545
2546 len = SvLEN (data_sv);
2547 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2548 data = SvPVbyte_nolen (data_sv);
2549 end = data + len + 8;
2550
2551 if (len < 5)
2552 XSRETURN_EMPTY;
2311 2553
2312 if (*data++ != 0) 2554 if (*data++ != 0)
2313 XSRETURN_EMPTY; /* version mismatch */ 2555 XSRETURN_EMPTY; /* version mismatch */
2314 2556
2315 w = *data++ << 8; w |= *data++; 2557 w = *data++ << 8; w |= *data++;
… …
2330 { 2572 {
2331 maprow *row = map_get_row (self, y); 2573 maprow *row = map_get_row (self, y);
2332 2574
2333 for (x = x0; x < x1; x++) 2575 for (x = x0; x < x1; x++)
2334 { 2576 {
2577 uint8_t flags;
2578
2579 if (data + 7 >= end)
2580 XSRETURN_EMPTY;
2581
2335 uint8_t flags = *data++; 2582 flags = *data++;
2336 2583
2337 if (flags) 2584 if (flags)
2338 { 2585 {
2339 mapcell *cell = row_get_cell (row, x); 2586 mapcell *cell = row_get_cell (row, x);
2340 tileid tile[3] = { 0, 0, 0 }; 2587 tileid tile[3] = { 0, 0, 0 };
… …
2343 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; } 2590 if (flags & 2) { tile[1] = *data++ << 8; tile[1] |= *data++; }
2344 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; } 2591 if (flags & 4) { tile[2] = *data++ << 8; tile[2] |= *data++; }
2345 2592
2346 if (cell->darkness == 0) 2593 if (cell->darkness == 0)
2347 { 2594 {
2348 cell->darkness = 0; 2595 /*cell->darkness = 0;*/
2596 EXTEND (SP, 3);
2349 2597
2350 for (z = 0; z <= 2; z++) 2598 for (z = 0; z <= 2; z++)
2351 { 2599 {
2352 tileid t = tile [z]; 2600 tileid t = tile [z];
2353 2601
2354 if (t >= self->texs || (t && !self->tex [t].name)) 2602 if (t >= self->texs || (t && !self->tex [t].name))
2355 { 2603 {
2356 XPUSHs (sv_2mortal (newSViv (t))); 2604 PUSHs (sv_2mortal (newSViv (t)));
2357 need_texid (self, t); 2605 need_texid (self, t);
2358 } 2606 }
2359 2607
2360 cell->tile [z] = t; 2608 cell->tile [z] = t;
2361 } 2609 }
… …
2793void glRotate (float angle, float x, float y, float z) 3041void glRotate (float angle, float x, float y, float z)
2794 CODE: 3042 CODE:
2795 glRotatef (angle, x, y, z); 3043 glRotatef (angle, x, y, z);
2796 3044
2797void glColor (float r, float g, float b, float a = 1.0) 3045void glColor (float r, float g, float b, float a = 1.0)
3046 PROTOTYPE: @
2798 ALIAS: 3047 ALIAS:
2799 glColor_premultiply = 1 3048 glColor_premultiply = 1
2800 CODE: 3049 CODE:
2801 if (ix) 3050 if (ix)
2802 { 3051 {

Diff Legend

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