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.260 by root, Tue May 20 20:29:47 2008 UTC vs.
Revision 1.292 by root, Fri Dec 4 15:04:56 2009 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 64
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 97
84#else 98#define TEXID_SPEECH 1
85# define PARACHUTE 0 99#define TEXID_NOFACE 2
86#endif 100#define TEXID_HIDDEN 3
87 101
88static AV *texture_av; 102static AV *texture_av;
89 103
90static struct 104static struct
91{ 105{
… …
223 int w, h; 237 int w, h;
224 float s, t; 238 float s, t;
225 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
226 tileid smoothtile; 240 tileid smoothtile;
227 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
228} maptex; 243} maptex;
229 244
230typedef struct { 245typedef struct {
231 uint32_t player; 246 uint32_t player;
232 tileid tile[3]; 247 tileid tile[3];
… …
364 self->oy = 0; 379 self->oy = 0;
365 self->row = 0; 380 self->row = 0;
366 self->rows = 0; 381 self->rows = 0;
367} 382}
368 383
384#define CELL_CLEAR(cell) \
385 do { \
386 if ((cell)->player) \
387 (cell)->tile [2] = 0; \
388 (cell)->darkness = 0; \
389 (cell)->stat_hp = 0; \
390 (cell)->flags = 0; \
391 (cell)->player = 0; \
392 } while (0)
393
369static void 394static void
370map_blank (DC__Map self, int x0, int y0, int w, int h) 395map_blank (DC__Map self, int x0, int y0, int w, int h)
371{ 396{
372 int x, y; 397 int x, y;
373 maprow *row; 398 maprow *row;
… …
387 if (x >= row->c1) 412 if (x >= row->c1)
388 break; 413 break;
389 414
390 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
391 416
392 cell->darkness = 0; 417 CELL_CLEAR (cell);
393 cell->stat_hp = 0;
394 cell->flags = 0;
395 cell->player = 0;
396 } 418 }
397 } 419 }
398} 420}
399 421
400typedef struct { 422typedef struct {
… …
511 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
512 return 0; 534 return 0;
513 535
514 return 1; 536 return 1;
515} 537}
538
539/******************************************************************************/
540
541/* process keyboard modifiers */
542static int
543mod_munge (int mod)
544{
545 mod &= MOD_MASK;
546
547 if (mod & (KMOD_META | KMOD_ALT))
548 mod |= KMOD_LRAM;
549
550 return mod;
551}
552
553static void
554deliantra_main ()
555{
556 char *argv[] = { 0 };
557 call_argv ("::main", G_DISCARD | G_VOID, argv);
558}
559
560#ifdef __MACOSX__
561 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main()
563 * on OS X, so... we provide one and call the original main(), which,
564 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back.
566 */
567 extern C_LINKAGE int
568 main (int argc, char *argv[])
569 {
570 deliantra_main ();
571 }
572
573 #undef main
574
575 extern C_LINKAGE int main (int argc, char *argv[]);
576
577 static void
578 SDL_braino (void)
579 {
580 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv);
582 }
583#else
584 static void
585 SDL_braino (void)
586 {
587 deliantra_main ();
588 }
589#endif
516 590
517MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
518 592
519PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
520 594
… …
549 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
550 624
551 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
552 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
553 const_iv (SDL_APPACTIVE), 627 const_iv (SDL_APPACTIVE),
628
629
630 const_iv (SDLK_UNKNOWN),
631 const_iv (SDLK_FIRST),
632 const_iv (SDLK_BACKSPACE),
633 const_iv (SDLK_TAB),
634 const_iv (SDLK_CLEAR),
635 const_iv (SDLK_RETURN),
636 const_iv (SDLK_PAUSE),
637 const_iv (SDLK_ESCAPE),
638 const_iv (SDLK_SPACE),
639 const_iv (SDLK_EXCLAIM),
640 const_iv (SDLK_QUOTEDBL),
641 const_iv (SDLK_HASH),
642 const_iv (SDLK_DOLLAR),
643 const_iv (SDLK_AMPERSAND),
644 const_iv (SDLK_QUOTE),
645 const_iv (SDLK_LEFTPAREN),
646 const_iv (SDLK_RIGHTPAREN),
647 const_iv (SDLK_ASTERISK),
648 const_iv (SDLK_PLUS),
649 const_iv (SDLK_COMMA),
650 const_iv (SDLK_MINUS),
651 const_iv (SDLK_PERIOD),
652 const_iv (SDLK_SLASH),
653 const_iv (SDLK_0),
654 const_iv (SDLK_1),
655 const_iv (SDLK_2),
656 const_iv (SDLK_3),
657 const_iv (SDLK_4),
658 const_iv (SDLK_5),
659 const_iv (SDLK_6),
660 const_iv (SDLK_7),
661 const_iv (SDLK_8),
662 const_iv (SDLK_9),
663 const_iv (SDLK_COLON),
664 const_iv (SDLK_SEMICOLON),
665 const_iv (SDLK_LESS),
666 const_iv (SDLK_EQUALS),
667 const_iv (SDLK_GREATER),
668 const_iv (SDLK_QUESTION),
669 const_iv (SDLK_AT),
670
671 const_iv (SDLK_LEFTBRACKET),
672 const_iv (SDLK_BACKSLASH),
673 const_iv (SDLK_RIGHTBRACKET),
674 const_iv (SDLK_CARET),
675 const_iv (SDLK_UNDERSCORE),
676 const_iv (SDLK_BACKQUOTE),
677 const_iv (SDLK_DELETE),
554 678
555 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
556 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
557 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
558 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
634 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
635 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
636 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
637 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
638 762
763 const_iv (KMOD_LRAM),
764
639 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
766
767 const_iv (SDL_INIT_TIMER),
768 const_iv (SDL_INIT_AUDIO),
769 const_iv (SDL_INIT_VIDEO),
770 const_iv (SDL_INIT_CDROM),
771 const_iv (SDL_INIT_JOYSTICK),
772 const_iv (SDL_INIT_EVERYTHING),
773 const_iv (SDL_INIT_NOPARACHUTE),
774 const_iv (SDL_INIT_EVENTTHREAD),
775
776 const_iv (SDL_GL_RED_SIZE),
777 const_iv (SDL_GL_GREEN_SIZE),
778 const_iv (SDL_GL_BLUE_SIZE),
779 const_iv (SDL_GL_ALPHA_SIZE),
780 const_iv (SDL_GL_DOUBLEBUFFER),
781 const_iv (SDL_GL_BUFFER_SIZE),
782 const_iv (SDL_GL_DEPTH_SIZE),
783 const_iv (SDL_GL_STENCIL_SIZE),
784 const_iv (SDL_GL_ACCUM_RED_SIZE),
785 const_iv (SDL_GL_ACCUM_GREEN_SIZE),
786 const_iv (SDL_GL_ACCUM_BLUE_SIZE),
787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
788 const_iv (SDL_GL_STEREO),
789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
791 const_iv (SDL_GL_ACCELERATED_VISUAL),
792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
640# undef const_iv 795# undef const_iv
641 }; 796 };
642 797
643 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 798 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
644 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
680 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
681 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
682#endif 837#endif
683} 838}
684 839
685char *
686SDL_GetError () 840char *SDL_GetError ()
687 841
688int 842void SDL_braino ()
689SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
690 843
691void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
692SDL_Quit () 850void SDL_Quit ()
851
852int SDL_GL_SetAttribute (int attr, int value)
853
854int SDL_GL_GetAttribute (int attr)
855 CODE:
856 if (SDL_GL_GetAttribute (attr, &RETVAL))
857 XSRETURN_UNDEF;
858 OUTPUT:
859 RETVAL
693 860
694void 861void
695SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
696 PPCODE: 863 PPCODE:
697{ 864{
… …
709 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
710 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
711 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
712 879
713 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 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); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
717#endif
718 882
719 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
720 884
721 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
722 while (*m) 886 while (*m)
723 { 887 {
724 if ((*m)->w >= 800 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
725 { 889 {
726 AV *av = newAV (); 890 AV *av = newAV ();
727 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
728 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
729 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
792 { 956 {
793 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
794 case SDL_KEYUP: 958 case SDL_KEYUP:
795 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
796 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 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); 961 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 */ 962 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); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
800 break; 964 break;
801 965
802 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
803 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
821 x = ev.motion.x; 985 x = ev.motion.x;
822 y = ev.motion.y; 986 y = ev.motion.y;
823 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
824 } 988 }
825 989
826 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
827 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
828 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
829 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
830 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
831 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1047#if DEBUG 1211#if DEBUG
1048 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1049#endif 1213#endif
1050} 1214}
1051 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1052MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1053 1224
1054PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1055 1226
1056DC::Font 1227DC::Font
… …
1600 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); 1771 //glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
1601 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1602 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1603 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1604} 1775}
1776
1777void
1778expire_textures (DC::Map self, int texid, int count)
1779 PPCODE:
1780 for (; texid < self->texs && count; ++texid, --count)
1781 {
1782 maptex *tex = self->tex + texid;
1783
1784 if (tex->name)
1785 {
1786 if (tex->unused)
1787 {
1788 tex->name = 0;
1789 tex->unused = 0;
1790 XPUSHs (sv_2mortal (newSViv (texid)));
1791 }
1792 else
1793 tex->unused = 1;
1794 }
1795 }
1605 1796
1606int 1797int
1607ox (DC::Map self) 1798ox (DC::Map self)
1608 ALIAS: 1799 ALIAS:
1609 oy = 1 1800 oy = 1
… …
1687 uint8_t ext, cmd; 1878 uint8_t ext, cmd;
1688 1879
1689 do 1880 do
1690 { 1881 {
1691 ext = *data++; 1882 ext = *data++;
1692 cmd = ext & 0x3f; 1883 cmd = ext & 0x7f;
1693 1884
1694 if (cmd < 4) 1885 if (cmd < 4)
1695 cell->darkness = 255 - ext * 64 + 1; 1886 cell->darkness = 255 - ext * 64 + 1;
1696 else if (cmd == 5) // health 1887 else if (cmd == 5) // health
1697 { 1888 {
… …
1700 } 1891 }
1701 else if (cmd == 6) // monster width 1892 else if (cmd == 6) // monster width
1702 cell->stat_width = *data++ + 1; 1893 cell->stat_width = *data++ + 1;
1703 else if (cmd == 0x47) 1894 else if (cmd == 0x47)
1704 { 1895 {
1705 if (*data == 4) 1896 if (*data == 1) cell->player = data [1];
1706 ; // decode player count 1897 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1898 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1899 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1707 1900
1708 data += *data + 1; 1901 data += *data + 1;
1709 } 1902 }
1710 else if (cmd == 8) // cell flags 1903 else if (cmd == 8) // cell flags
1711 cell->flags = *data++; 1904 cell->flags = *data++;
… …
1728 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1729 1922
1730 if (cell->tile [z]) 1923 if (cell->tile [z])
1731 { 1924 {
1732 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1733 if (!tex->name) 1927 if (!tex->name)
1734 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1735 1929
1736 if (tex->smoothtile) 1930 if (tex->smoothtile)
1737 { 1931 {
1738 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1739 if (!smooth->name) 1934 if (!smooth->name)
1740 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1741 } 1936 }
1742 } 1937 }
1743 } 1938 }
1744 } 1939 }
1745 else 1940 else
1746 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1747 } 1942 }
1748} 1943}
1749 OUTPUT: 1944 OUTPUT:
1750 RETVAL 1945 RETVAL
1751 1946
… …
1803} 1998}
1804 OUTPUT: 1999 OUTPUT:
1805 RETVAL 2000 RETVAL
1806 2001
1807void 2002void
1808draw (DC::Map self, int mx, int my, int sw, int sh, int T) 2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1809 CODE: 2004 CODE:
1810{ 2005{
1811 int x, y, z; 2006 int x, y, z;
1812 2007
1813 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1814 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2009 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) 2010 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
1816 smooth_key skey; 2011 smooth_key skey;
1817 2012 int pl_x, pl_y;
2013 maptex pl_tex;
1818 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1819 rc_key_t key; 2016 rc_key_t key;
1820 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1821 2018
2019 pl_tex.name = 0;
2020
1822 // thats current max. sorry. 2021 // that's current max. sorry.
1823 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1824 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1825 2024
1826 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1827 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1831 key.g = 255; 2030 key.g = 255;
1832 key.b = 255; 2031 key.b = 255;
1833 key.a = 255; 2032 key.a = 255;
1834 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1835 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1836 key.texname = -1;
1837 2035
1838 mx += self->x; 2036 mx += self->x;
1839 my += self->y; 2037 my += self->y;
1840 2038
1841 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1862 2060
1863 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1864 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1865 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1866 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1867 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1868 { 2069 {
1869 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1870 2072
1871 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1872 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1873 { 2075 {
1874 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1884 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1885 int px, py; 2087 int px, py;
1886 2088
1887 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1888 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1889 if (!tex.name) 2093 if (!tex.name)
1890 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1891 2095
1892 key.texname = tex.name; 2096 key.texname = tex.name;
1893 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1894 } 2098 }
1895 2099
1896 px = (x + 1) * T - tex.w; 2100 px = (x + 1) * T - tex.w;
1897 py = (y + 1) * T - tex.h; 2101 py = (y + 1) * T - tex.h;
2102
2103 if (expect_false (cell->player == player) && expect_false (z == 2))
2104 {
2105 pl_x = px;
2106 pl_y = py;
2107 pl_tex = tex;
2108 continue;
2109 }
1898 2110
1899 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1900 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0); 2112 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); 2113 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); 2114 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
1903
1904 if (cell->flags && z == 2)
1905 {
1906 // overlays such as the speech bubble, probably more to come
1907 if (cell->flags & 1)
1908 {
1909 maptex tex = self->tex [1];
1910 int px = x * T + T * 2 / 32;
1911 int py = y * T - T * 6 / 32;
1912
1913 if (tex.name)
1914 {
1915 if (key.texname != tex.name)
1916 {
1917 key.texname = tex.name;
1918 arr = rc_array (rc, &key);
1919 }
1920
1921 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1922 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1923 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1924 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1925 }
1926 }
1927 }
1928 2115
1929 // update smooth hash 2116 // update smooth hash
1930 if (tex.smoothtile) 2117 if (tex.smoothtile)
1931 { 2118 {
1932 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
… …
1961 // corners 2148 // corners
1962 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100); 2149 skey.x = x + 2; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0100);
1963 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200); 2150 skey.x = x ; skey.y = y + 2; smooth_or_bits (smooth, &skey, 0x0200);
1964 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2151 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
1965 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2152 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2153 }
2154 }
2155
2156 if (expect_false (z == 2))
2157 {
2158 /* draw question marks on top of hidden spaces */
2159 if (!cell->darkness)
2160 {
2161 maptex tex = self->tex [TEXID_HIDDEN];
2162 int px = (x + 1) * T - tex.w;
2163 int py = (y + 1) * T - tex.h;
2164
2165 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2166 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2167 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2168 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2169 }
2170
2171 if (expect_false (cell->flags))
2172 {
2173 // overlays such as the speech bubble, probably more to come
2174 if (cell->flags & 1)
2175 {
2176 rc_key_t key_ov = key;
2177 maptex tex = self->tex [TEXID_SPEECH];
2178 rc_array_t *arr;
2179 int px = x * T + T * 2 / 32;
2180 int py = y * T - T * 6 / 32;
2181
2182 key_ov.texname = tex.name;
2183 arr = rc_array (rc_ov, &key_ov);
2184
2185 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2186 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
2187 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
2188 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
2189 }
1966 } 2190 }
1967 } 2191 }
1968 } 2192 }
1969 } 2193 }
1970 2194
… …
2010 { 2234 {
2011 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
2012 // save gobs of state changes. 2236 // save gobs of state changes.
2013 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2014 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2015 glEnd (); 2241 glEnd ();
2016 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2017 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2018 } 2244 }
2019 2245
… …
2048 } 2274 }
2049 2275
2050 hv_clear (smooth); 2276 hv_clear (smooth);
2051 } 2277 }
2052 2278
2279 if (pl_tex.name)
2280 {
2281 maptex tex = pl_tex;
2282 int px = pl_x + sdx;
2283 int py = pl_y + sdy;
2284
2285 key.texname = tex.name;
2286 arr = rc_array (rc, &key);
2287
2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2289 rc_t2f_v3f (arr, 0 , tex.t, px , py + tex.h, 0);
2290 rc_t2f_v3f (arr, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2292
2293 rc_draw (rc);
2294 }
2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
2053 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2054 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2055 2302
2056 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2057 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2058 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2059 { 2306 {
… …
2064 { 2311 {
2065 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2066 2313
2067 int px = x * T; 2314 int px = x * T;
2068 int py = y * T; 2315 int py = y * T;
2316
2317 if (expect_false (cell->player == player))
2318 {
2319 px += sdx;
2320 py += sdy;
2321 }
2069 2322
2070 if (cell->stat_hp) 2323 if (cell->stat_hp)
2071 { 2324 {
2072 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2073 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2113 }; 2366 };
2114 2367
2115 int x, y; 2368 int x, y;
2116 2369
2117 glEnable (GL_TEXTURE_2D); 2370 glEnable (GL_TEXTURE_2D);
2371 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2372 * but the nvidia driver (185.18.14) mishandles alpha textures
2373 * ansd takes the colour from god knows where instead of using
2374 * Cp. MODULATE results in the same colour, but slightly different
2375 * alpha, but atcually gives us the correct colour with nvidia.
2376 */
2118 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2119 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2120 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2121 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2122 2381
2123 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
2130 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2131 2390
2132 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2133 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2134 2393
2135 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2136 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2137 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2138 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2139 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2140 } 2399 }
… …
2162 SvCUR_set (darkness3_sv, sw34 * sh3); 2421 SvCUR_set (darkness3_sv, sw34 * sh3);
2163 2422
2164 mx += self->x - 1; 2423 mx += self->x - 1;
2165 my += self->y - 1; 2424 my += self->y - 1;
2166 2425
2167 memset (darkness1, 255, sw1 * sh1); 2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2168 2427
2169 for (y = 0; y < sh1; y++) 2428 for (y = 0; y < sh1; y++)
2170 if (0 <= y + my && y + my < self->rows) 2429 if (0 <= y + my && y + my < self->rows)
2171 { 2430 {
2172 maprow *row = self->row + (y + my); 2431 maprow *row = self->row + (y + my);
… …
2697 const_iv (GL_NICEST), 2956 const_iv (GL_NICEST),
2698 const_iv (GL_V2F), 2957 const_iv (GL_V2F),
2699 const_iv (GL_V3F), 2958 const_iv (GL_V3F),
2700 const_iv (GL_T2F_V3F), 2959 const_iv (GL_T2F_V3F),
2701 const_iv (GL_T2F_N3F_V3F), 2960 const_iv (GL_T2F_N3F_V3F),
2961 const_iv (GL_FUNC_ADD),
2962 const_iv (GL_FUNC_SUBTRACT),
2963 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2702# undef const_iv 2964# undef const_iv
2703 }; 2965 };
2704 2966
2705 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 2967 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; )
2706 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 2968 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
2713disable_GL_EXT_blend_func_separate () 2975disable_GL_EXT_blend_func_separate ()
2714 CODE: 2976 CODE:
2715 gl.BlendFuncSeparate = 0; 2977 gl.BlendFuncSeparate = 0;
2716 gl.BlendFuncSeparateEXT = 0; 2978 gl.BlendFuncSeparateEXT = 0;
2717 2979
2980void
2981apple_nvidia_bug (int enable)
2982
2718char * 2983char *
2719gl_vendor () 2984gl_vendor ()
2720 CODE: 2985 CODE:
2721 RETVAL = (char *)glGetString (GL_VENDOR); 2986 RETVAL = (char *)glGetString (GL_VENDOR);
2722 OUTPUT: 2987 OUTPUT:
… …
2771 3036
2772void glBlendFuncSeparate (int sa, int da, int saa, int daa) 3037void glBlendFuncSeparate (int sa, int da, int saa, int daa)
2773 CODE: 3038 CODE:
2774 gl_BlendFuncSeparate (sa, da, saa, daa); 3039 gl_BlendFuncSeparate (sa, da, saa, daa);
2775 3040
3041# void glBlendEquation (int se)
3042
2776void glDepthMask (int flag) 3043void glDepthMask (int flag)
2777 3044
2778void glLogicOp (int opcode) 3045void glLogicOp (int opcode)
2779 3046
2780void glColorMask (int red, int green, int blue, int alpha) 3047void glColorMask (int red, int green, int blue, int alpha)
… …
2814void glRotate (float angle, float x, float y, float z) 3081void glRotate (float angle, float x, float y, float z)
2815 CODE: 3082 CODE:
2816 glRotatef (angle, x, y, z); 3083 glRotatef (angle, x, y, z);
2817 3084
2818void glColor (float r, float g, float b, float a = 1.0) 3085void glColor (float r, float g, float b, float a = 1.0)
3086 PROTOTYPE: @
2819 ALIAS: 3087 ALIAS:
2820 glColor_premultiply = 1 3088 glColor_premultiply = 1
2821 CODE: 3089 CODE:
2822 if (ix) 3090 if (ix)
2823 { 3091 {

Diff Legend

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