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.262 by root, Wed Jul 16 20:12:27 2008 UTC vs.
Revision 1.289 by root, Wed Dec 24 04:09:26 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
… …
76#define expect_false(expr) expect ((expr) != 0, 0) 81#define expect_false(expr) expect ((expr) != 0, 0)
77#define expect_true(expr) expect ((expr) != 0, 1) 82#define expect_true(expr) expect ((expr) != 0, 1)
78 83
79#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
80 85
81#define FOW_DARKNESS 32 86#define FOW_DARKNESS 64
82 87
83#define MAP_EXTEND_X 32 88#define MAP_EXTEND_X 32
84#define MAP_EXTEND_Y 512 89#define MAP_EXTEND_Y 512
85 90
86#define MIN_FONT_HEIGHT 10 91#define MIN_FONT_HEIGHT 10
87 92
88/* mask out modifiers we are not interested in */ 93/* mask out modifiers we are not interested in */
89#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META) 94#define MOD_MASK (KMOD_CTRL | KMOD_SHIFT | KMOD_ALT | KMOD_META)
90 95
91#if 1 96#define KMOD_LRAM 0x10000 // our extension
92# define PARACHUTE SDL_INIT_NOPARACHUTE 97
93#else 98#define TEXID_SPEECH 1
94# define PARACHUTE 0 99#define TEXID_NOFACE 2
95#endif 100#define TEXID_HIDDEN 3
96 101
97static AV *texture_av; 102static AV *texture_av;
98 103
99static struct 104static struct
100{ 105{
… …
232 int w, h; 237 int w, h;
233 float s, t; 238 float s, t;
234 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
235 tileid smoothtile; 240 tileid smoothtile;
236 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
237} maptex; 243} maptex;
238 244
239typedef struct { 245typedef struct {
240 uint32_t player; 246 uint32_t player;
241 tileid tile[3]; 247 tileid tile[3];
… …
373 self->oy = 0; 379 self->oy = 0;
374 self->row = 0; 380 self->row = 0;
375 self->rows = 0; 381 self->rows = 0;
376} 382}
377 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
378static void 394static void
379map_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)
380{ 396{
381 int x, y; 397 int x, y;
382 maprow *row; 398 maprow *row;
… …
396 if (x >= row->c1) 412 if (x >= row->c1)
397 break; 413 break;
398 414
399 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
400 416
401 cell->darkness = 0; 417 CELL_CLEAR (cell);
402 cell->stat_hp = 0;
403 cell->flags = 0;
404 cell->player = 0;
405 } 418 }
406 } 419 }
407} 420}
408 421
409typedef struct { 422typedef struct {
… …
520 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
521 return 0; 534 return 0;
522 535
523 return 1; 536 return 1;
524} 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
525 590
526MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
527 592
528PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
529 594
… …
558 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
559 624
560 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
561 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
562 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),
563 678
564 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
565 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
566 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
567 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
643 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
644 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
645 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
646 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
647 762
763 const_iv (KMOD_LRAM),
764
648 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)
649# undef const_iv 795# undef const_iv
650 }; 796 };
651 797
652 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; )
653 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
689 pango_context_set_language (opengl_context, pango_language_from_string ("en")); 835 pango_context_set_language (opengl_context, pango_language_from_string ("en"));
690 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
691#endif 837#endif
692} 838}
693 839
694char *
695SDL_GetError () 840char *SDL_GetError ()
696 841
697int 842void SDL_braino ()
698SDL_Init (U32 flags = SDL_INIT_VIDEO | SDL_INIT_AUDIO | PARACHUTE)
699 843
700void 844int SDL_Init (U32 flags)
845
846int SDL_InitSubSystem (U32 flags)
847
848void SDL_QuitSubSystem (U32 flags)
849
701SDL_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
702 860
703void 861void
704SDL_ListModes (int rgb, int alpha) 862SDL_ListModes (int rgb, int alpha)
705 PPCODE: 863 PPCODE:
706{ 864{
… …
718 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0); 876 SDL_GL_SetAttribute (SDL_GL_ACCUM_GREEN_SIZE, 0);
719 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0); 877 SDL_GL_SetAttribute (SDL_GL_ACCUM_BLUE_SIZE , 0);
720 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0); 878 SDL_GL_SetAttribute (SDL_GL_ACCUM_ALPHA_SIZE, 0);
721 879
722 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1); 880 SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
723#if SDL_VERSION_ATLEAST(1,2,10)
724 SDL_GL_SetAttribute (SDL_GL_ACCELERATED_VISUAL, 1);
725 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1); 881 SDL_GL_SetAttribute (SDL_GL_SWAP_CONTROL, 1);
726#endif
727 882
728 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL); 883 m = SDL_ListModes (0, SDL_FULLSCREEN | SDL_OPENGL);
729 884
730 if (m && m != (SDL_Rect **)-1) 885 if (m && m != (SDL_Rect **)-1)
731 while (*m) 886 while (*m)
732 { 887 {
733 if ((*m)->w >= 800 && (*m)->h >= 480) 888 if ((*m)->w >= 400 && (*m)->h >= 300)
734 { 889 {
735 AV *av = newAV (); 890 AV *av = newAV ();
736 av_push (av, newSViv ((*m)->w)); 891 av_push (av, newSViv ((*m)->w));
737 av_push (av, newSViv ((*m)->h)); 892 av_push (av, newSViv ((*m)->h));
738 av_push (av, newSViv (rgb)); 893 av_push (av, newSViv (rgb));
… …
801 { 956 {
802 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
803 case SDL_KEYUP: 958 case SDL_KEYUP:
804 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
805 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
806 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);
807 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 */
808 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
809 break; 964 break;
810 965
811 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
812 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
830 x = ev.motion.x; 985 x = ev.motion.x;
831 y = ev.motion.y; 986 y = ev.motion.y;
832 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
833 } 988 }
834 989
835 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
836 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
837 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
838 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
839 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
840 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1056#if DEBUG 1211#if DEBUG
1057 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1058#endif 1213#endif
1059} 1214}
1060 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1061MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1062 1224
1063PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1064 1226
1065DC::Font 1227DC::Font
… …
1609 //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);
1610 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1611 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1612 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1613} 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 }
1614 1796
1615int 1797int
1616ox (DC::Map self) 1798ox (DC::Map self)
1617 ALIAS: 1799 ALIAS:
1618 oy = 1 1800 oy = 1
… …
1739 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1740 1922
1741 if (cell->tile [z]) 1923 if (cell->tile [z])
1742 { 1924 {
1743 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1744 if (!tex->name) 1927 if (!tex->name)
1745 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1746 1929
1747 if (tex->smoothtile) 1930 if (tex->smoothtile)
1748 { 1931 {
1749 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1750 if (!smooth->name) 1934 if (!smooth->name)
1751 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1752 } 1936 }
1753 } 1937 }
1754 } 1938 }
1755 } 1939 }
1756 else 1940 else
1757 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1758 } 1942 }
1759} 1943}
1760 OUTPUT: 1944 OUTPUT:
1761 RETVAL 1945 RETVAL
1762 1946
… …
1814} 1998}
1815 OUTPUT: 1999 OUTPUT:
1816 RETVAL 2000 RETVAL
1817 2001
1818void 2002void
1819draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int pdx = 0, int pdy = 0) 2003draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
1820 CODE: 2004 CODE:
1821{ 2005{
1822 int x, y, z; 2006 int x, y, z;
1823 2007
1824 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1825 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
1826 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)
1827 smooth_key skey; 2011 smooth_key skey;
1828 int pl_x, pl_y; 2012 int pl_x, pl_y;
1829 maptex pl_tex; 2013 maptex pl_tex;
1830 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1831 rc_key_t key; 2016 rc_key_t key;
1832 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1833 2018
1834 pl_tex.name = 0; 2019 pl_tex.name = 0;
1835 2020
1836 // thats current max. sorry. 2021 // that's current max. sorry.
1837 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1838 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1839 2024
1840 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1841 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1845 key.g = 255; 2030 key.g = 255;
1846 key.b = 255; 2031 key.b = 255;
1847 key.a = 255; 2032 key.a = 255;
1848 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1849 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1850 key.texname = -1;
1851 2035
1852 mx += self->x; 2036 mx += self->x;
1853 my += self->y; 2037 my += self->y;
1854 2038
1855 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1876 2060
1877 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1878 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1879 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1880 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1881 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1882 { 2069 {
1883 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1884 2072
1885 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1886 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1887 { 2075 {
1888 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1894 tileid tile = cell->tile [z]; 2082 tileid tile = cell->tile [z];
1895 2083
1896 if (tile) 2084 if (tile)
1897 { 2085 {
1898 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1899 int px = (x + 1) * T - tex.w; 2087 int px, py;
1900 int py = (y + 1) * T - tex.h;
1901 2088
1902 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1903 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1904 if (!tex.name) 2093 if (!tex.name)
1905 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1906 2095
1907 key.texname = tex.name; 2096 key.texname = tex.name;
1908 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1909 } 2098 }
2099
2100 px = (x + 1) * T - tex.w;
2101 py = (y + 1) * T - tex.h;
1910 2102
1911 if (expect_false (cell->player == player) && expect_false (z == 2)) 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
1912 { 2104 {
1913 pl_x = px; 2105 pl_x = px;
1914 pl_y = py; 2106 pl_y = py;
… …
1919 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1920 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);
1921 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);
1922 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);
1923 2115
1924 if (expect_false (cell->flags) && expect_false (z == 2))
1925 {
1926 // overlays such as the speech bubble, probably more to come
1927 if (cell->flags & 1)
1928 {
1929 maptex tex = self->tex [1];
1930 int px = x * T + T * 2 / 32;
1931 int py = y * T - T * 6 / 32;
1932
1933 if (tex.name)
1934 {
1935 if (key.texname != tex.name)
1936 {
1937 key.texname = tex.name;
1938 arr = rc_array (rc, &key);
1939 }
1940
1941 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1942 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1943 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1944 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1945 }
1946 }
1947 }
1948
1949 // update smooth hash 2116 // update smooth hash
1950 if (tex.smoothtile) 2117 if (tex.smoothtile)
1951 { 2118 {
1952 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
1953 skey.level = tex.smoothlevel; 2120 skey.level = tex.smoothlevel;
… …
1981 // corners 2148 // corners
1982 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);
1983 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);
1984 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);
1985 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 }
1986 } 2190 }
1987 } 2191 }
1988 } 2192 }
1989 } 2193 }
1990 2194
… …
2030 { 2234 {
2031 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
2032 // save gobs of state changes. 2236 // save gobs of state changes.
2033 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2034 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2035 glEnd (); 2241 glEnd ();
2036 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2037 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2038 } 2244 }
2039 2245
… …
2071 } 2277 }
2072 2278
2073 if (pl_tex.name) 2279 if (pl_tex.name)
2074 { 2280 {
2075 maptex tex = pl_tex; 2281 maptex tex = pl_tex;
2076 int px = pl_x + pdx; 2282 int px = pl_x + sdx;
2077 int py = pl_y + pdy; 2283 int py = pl_y + sdy;
2078 2284
2079 key.texname = tex.name; 2285 key.texname = tex.name;
2080 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
2081 2287
2082 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2085 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0); 2291 rc_t2f_v3f (arr, tex.s, 0 , px + tex.w, py , 0);
2086 2292
2087 rc_draw (rc); 2293 rc_draw (rc);
2088 } 2294 }
2089 2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
2090 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2091 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2092 2302
2093 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2094 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2095 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2096 { 2306 {
… …
2101 { 2311 {
2102 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2103 2313
2104 int px = x * T; 2314 int px = x * T;
2105 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 }
2106 2322
2107 if (cell->stat_hp) 2323 if (cell->stat_hp)
2108 { 2324 {
2109 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2110 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2199 SvCUR_set (darkness3_sv, sw34 * sh3); 2415 SvCUR_set (darkness3_sv, sw34 * sh3);
2200 2416
2201 mx += self->x - 1; 2417 mx += self->x - 1;
2202 my += self->y - 1; 2418 my += self->y - 1;
2203 2419
2204 memset (darkness1, 255, sw1 * sh1); 2420 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2205 2421
2206 for (y = 0; y < sh1; y++) 2422 for (y = 0; y < sh1; y++)
2207 if (0 <= y + my && y + my < self->rows) 2423 if (0 <= y + my && y + my < self->rows)
2208 { 2424 {
2209 maprow *row = self->row + (y + my); 2425 maprow *row = self->row + (y + my);
… …
2851void glRotate (float angle, float x, float y, float z) 3067void glRotate (float angle, float x, float y, float z)
2852 CODE: 3068 CODE:
2853 glRotatef (angle, x, y, z); 3069 glRotatef (angle, x, y, z);
2854 3070
2855void glColor (float r, float g, float b, float a = 1.0) 3071void glColor (float r, float g, float b, float a = 1.0)
3072 PROTOTYPE: @
2856 ALIAS: 3073 ALIAS:
2857 glColor_premultiply = 1 3074 glColor_premultiply = 1
2858 CODE: 3075 CODE:
2859 if (ix) 3076 if (ix)
2860 { 3077 {

Diff Legend

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