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.265 by root, Fri Jul 18 22:56:11 2008 UTC vs.
Revision 1.290 by root, Wed Nov 4 14:40:51 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
… …
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)
95
96#define KMOD_LRAM 0x10000 // our extension
97
98#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2
100#define TEXID_HIDDEN 3
90 101
91static AV *texture_av; 102static AV *texture_av;
92 103
93static struct 104static struct
94{ 105{
… …
226 int w, h; 237 int w, h;
227 float s, t; 238 float s, t;
228 uint8_t r, g, b, a; 239 uint8_t r, g, b, a;
229 tileid smoothtile; 240 tileid smoothtile;
230 uint8_t smoothlevel; 241 uint8_t smoothlevel;
242 uint8_t unused; /* set to zero on use */
231} maptex; 243} maptex;
232 244
233typedef struct { 245typedef struct {
234 uint32_t player; 246 uint32_t player;
235 tileid tile[3]; 247 tileid tile[3];
… …
367 self->oy = 0; 379 self->oy = 0;
368 self->row = 0; 380 self->row = 0;
369 self->rows = 0; 381 self->rows = 0;
370} 382}
371 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
372static void 394static void
373map_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)
374{ 396{
375 int x, y; 397 int x, y;
376 maprow *row; 398 maprow *row;
… …
390 if (x >= row->c1) 412 if (x >= row->c1)
391 break; 413 break;
392 414
393 cell = row->col + x - row->c0; 415 cell = row->col + x - row->c0;
394 416
395 cell->darkness = 0; 417 CELL_CLEAR (cell);
396 cell->stat_hp = 0;
397 cell->flags = 0;
398 cell->player = 0;
399 } 418 }
400 } 419 }
401} 420}
402 421
403typedef struct { 422typedef struct {
… …
514 if (!svp || !SvTRUE (*svp)) 533 if (!svp || !SvTRUE (*svp))
515 return 0; 534 return 0;
516 535
517 return 1; 536 return 1;
518} 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
519 590
520MODULE = Deliantra::Client PACKAGE = DC 591MODULE = Deliantra::Client PACKAGE = DC
521 592
522PROTOTYPES: ENABLE 593PROTOTYPES: ENABLE
523 594
… …
552 const_iv (SDL_USEREVENT), 623 const_iv (SDL_USEREVENT),
553 624
554 const_iv (SDL_APPINPUTFOCUS), 625 const_iv (SDL_APPINPUTFOCUS),
555 const_iv (SDL_APPMOUSEFOCUS), 626 const_iv (SDL_APPMOUSEFOCUS),
556 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),
557 678
558 const_iv (SDLK_FIRST), 679 const_iv (SDLK_FIRST),
559 const_iv (SDLK_LAST), 680 const_iv (SDLK_LAST),
560 const_iv (SDLK_KP0), 681 const_iv (SDLK_KP0),
561 const_iv (SDLK_KP1), 682 const_iv (SDLK_KP1),
… …
637 const_iv (KMOD_RMETA), 758 const_iv (KMOD_RMETA),
638 const_iv (KMOD_NUM), 759 const_iv (KMOD_NUM),
639 const_iv (KMOD_CAPS), 760 const_iv (KMOD_CAPS),
640 const_iv (KMOD_MODE), 761 const_iv (KMOD_MODE),
641 762
763 const_iv (KMOD_LRAM),
764
642 const_iv (MIX_DEFAULT_FORMAT), 765 const_iv (MIX_DEFAULT_FORMAT),
643 766
644 const_iv (SDL_INIT_TIMER), 767 const_iv (SDL_INIT_TIMER),
645 const_iv (SDL_INIT_AUDIO), 768 const_iv (SDL_INIT_AUDIO),
646 const_iv (SDL_INIT_VIDEO), 769 const_iv (SDL_INIT_VIDEO),
… …
664 const_iv (SDL_GL_ACCUM_ALPHA_SIZE), 787 const_iv (SDL_GL_ACCUM_ALPHA_SIZE),
665 const_iv (SDL_GL_STEREO), 788 const_iv (SDL_GL_STEREO),
666 const_iv (SDL_GL_MULTISAMPLEBUFFERS), 789 const_iv (SDL_GL_MULTISAMPLEBUFFERS),
667 const_iv (SDL_GL_MULTISAMPLESAMPLES), 790 const_iv (SDL_GL_MULTISAMPLESAMPLES),
668 const_iv (SDL_GL_ACCELERATED_VISUAL), 791 const_iv (SDL_GL_ACCELERATED_VISUAL),
669 const_iv (SDL_GL_SWAP_CONTROL) 792 const_iv (SDL_GL_SWAP_CONTROL),
793
794 const_iv (FOW_DARKNESS)
670# undef const_iv 795# undef const_iv
671 }; 796 };
672 797
673 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; )
674 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv));
… …
711 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/ 836 /*pango_context_set_base_dir (opengl_context, PANGO_DIRECTION_WEAK_LTR);*/
712#endif 837#endif
713} 838}
714 839
715char *SDL_GetError () 840char *SDL_GetError ()
841
842void SDL_braino ()
716 843
717int SDL_Init (U32 flags) 844int SDL_Init (U32 flags)
718 845
719int SDL_InitSubSystem (U32 flags) 846int SDL_InitSubSystem (U32 flags)
720 847
… …
829 { 956 {
830 case SDL_KEYDOWN: 957 case SDL_KEYDOWN:
831 case SDL_KEYUP: 958 case SDL_KEYUP:
832 hv_store (hv, "state", 5, newSViv (ev.key.state), 0); 959 hv_store (hv, "state", 5, newSViv (ev.key.state), 0);
833 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0); 960 hv_store (hv, "sym", 3, newSViv (ev.key.keysym.sym), 0);
834 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);
835 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 */
836 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0); 963 hv_store (hv, "unicode", 7, newSViv (ev.key.keysym.unicode), 0);
837 break; 964 break;
838 965
839 case SDL_ACTIVEEVENT: 966 case SDL_ACTIVEEVENT:
840 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0); 967 hv_store (hv, "gain", 4, newSViv (ev.active.gain), 0);
… …
858 x = ev.motion.x; 985 x = ev.motion.x;
859 y = ev.motion.y; 986 y = ev.motion.y;
860 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION)); 987 SDL_PeepEvents (&ev, 1, SDL_GETEVENT, SDL_EVENTMASK (SDL_MOUSEMOTION));
861 } 988 }
862 989
863 hv_store (hv, "mod", 3, newSViv (SDL_GetModState () & MOD_MASK), 0); 990 hv_store (hv, "mod", 3, newSViv (mod_munge (SDL_GetModState ())), 0);
864 hv_store (hv, "state", 5, newSViv (state), 0); 991 hv_store (hv, "state", 5, newSViv (state), 0);
865 hv_store (hv, "x", 1, newSViv (x), 0); 992 hv_store (hv, "x", 1, newSViv (x), 0);
866 hv_store (hv, "y", 1, newSViv (y), 0); 993 hv_store (hv, "y", 1, newSViv (y), 0);
867 hv_store (hv, "xrel", 4, newSViv (xrel), 0); 994 hv_store (hv, "xrel", 4, newSViv (xrel), 0);
868 hv_store (hv, "yrel", 4, newSViv (yrel), 0); 995 hv_store (hv, "yrel", 4, newSViv (yrel), 0);
… …
1084#if DEBUG 1211#if DEBUG
1085 VALGRIND_DO_LEAK_CHECK; 1212 VALGRIND_DO_LEAK_CHECK;
1086#endif 1213#endif
1087} 1214}
1088 1215
1216int
1217SvREFCNT (SV *sv)
1218 CODE:
1219 RETVAL = SvREFCNT (sv);
1220 OUTPUT:
1221 RETVAL
1222
1089MODULE = Deliantra::Client PACKAGE = DC::Font 1223MODULE = Deliantra::Client PACKAGE = DC::Font
1090 1224
1091PROTOTYPES: DISABLE 1225PROTOTYPES: DISABLE
1092 1226
1093DC::Font 1227DC::Font
… …
1637 //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);
1638 // use uglier nearest interpolation because linear suffers 1772 // use uglier nearest interpolation because linear suffers
1639 // from transparent color bleeding and ugly wrapping effects. 1773 // from transparent color bleeding and ugly wrapping effects.
1640 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); 1774 glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
1641} 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 }
1642 1796
1643int 1797int
1644ox (DC::Map self) 1798ox (DC::Map self)
1645 ALIAS: 1799 ALIAS:
1646 oy = 1 1800 oy = 1
… …
1767 cell->tile [z] = self->face2tile [face]; 1921 cell->tile [z] = self->face2tile [face];
1768 1922
1769 if (cell->tile [z]) 1923 if (cell->tile [z])
1770 { 1924 {
1771 maptex *tex = self->tex + cell->tile [z]; 1925 maptex *tex = self->tex + cell->tile [z];
1926 tex->unused = 0;
1772 if (!tex->name) 1927 if (!tex->name)
1773 av_push (missing, newSViv (cell->tile [z])); 1928 av_push (missing, newSViv (cell->tile [z]));
1774 1929
1775 if (tex->smoothtile) 1930 if (tex->smoothtile)
1776 { 1931 {
1777 maptex *smooth = self->tex + tex->smoothtile; 1932 maptex *smooth = self->tex + tex->smoothtile;
1933 smooth->unused = 0;
1778 if (!smooth->name) 1934 if (!smooth->name)
1779 av_push (missing, newSViv (tex->smoothtile)); 1935 av_push (missing, newSViv (tex->smoothtile));
1780 } 1936 }
1781 } 1937 }
1782 } 1938 }
1783 } 1939 }
1784 else 1940 else
1785 cell->darkness = 0; 1941 CELL_CLEAR (cell);
1786 } 1942 }
1787} 1943}
1788 OUTPUT: 1944 OUTPUT:
1789 RETVAL 1945 RETVAL
1790 1946
… …
1842} 1998}
1843 OUTPUT: 1999 OUTPUT:
1844 RETVAL 2000 RETVAL
1845 2001
1846void 2002void
1847draw (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)
1848 CODE: 2004 CODE:
1849{ 2005{
1850 int x, y, z; 2006 int x, y, z;
1851 2007
1852 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2008 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
1853 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
1854 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)
1855 smooth_key skey; 2011 smooth_key skey;
1856 int pl_x, pl_y; 2012 int pl_x, pl_y;
1857 maptex pl_tex; 2013 maptex pl_tex;
1858 rc_t *rc = rc_alloc (); 2014 rc_t *rc = rc_alloc ();
2015 rc_t *rc_ov = rc_alloc ();
1859 rc_key_t key; 2016 rc_key_t key;
1860 rc_array_t *arr; 2017 rc_array_t *arr, *arr_hidden;
1861 2018
1862 pl_tex.name = 0; 2019 pl_tex.name = 0;
1863 2020
1864 // thats current max. sorry. 2021 // that's current max. sorry.
1865 if (sw > 255) sw = 255; 2022 if (sw > 255) sw = 255;
1866 if (sh > 255) sh = 255; 2023 if (sh > 255) sh = 255;
1867 2024
1868 // clear key, in case of extra padding 2025 // clear key, in case of extra padding
1869 memset (&skey, 0, sizeof (skey)); 2026 memset (&skey, 0, sizeof (skey));
… …
1873 key.g = 255; 2030 key.g = 255;
1874 key.b = 255; 2031 key.b = 255;
1875 key.a = 255; 2032 key.a = 255;
1876 key.mode = GL_QUADS; 2033 key.mode = GL_QUADS;
1877 key.format = GL_T2F_V3F; 2034 key.format = GL_T2F_V3F;
1878 key.texname = -1;
1879 2035
1880 mx += self->x; 2036 mx += self->x;
1881 my += self->y; 2037 my += self->y;
1882 2038
1883 // first pass: determine smooth_max 2039 // first pass: determine smooth_max
… …
1904 2060
1905 glEnable (GL_BLEND); 2061 glEnable (GL_BLEND);
1906 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2062 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1907 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2063 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1908 2064
2065 key.texname = self->tex [TEXID_HIDDEN].name;
2066 arr_hidden = rc_array (rc_ov, &key);
2067
1909 for (z = 0; z <= 2; z++) 2068 for (z = 0; z <= 2; z++)
1910 { 2069 {
1911 memset (smooth_level, 0, sizeof (smooth_level)); 2070 memset (smooth_level, 0, sizeof (smooth_level));
2071 key.texname = -1;
1912 2072
1913 for (y = 0; y < sh; y++) 2073 for (y = 0; y < sh; y++)
1914 if (0 <= y + my && y + my < self->rows) 2074 if (0 <= y + my && y + my < self->rows)
1915 { 2075 {
1916 maprow *row = self->row + (y + my); 2076 maprow *row = self->row + (y + my);
… …
1922 tileid tile = cell->tile [z]; 2082 tileid tile = cell->tile [z];
1923 2083
1924 if (tile) 2084 if (tile)
1925 { 2085 {
1926 maptex tex = self->tex [tile]; 2086 maptex tex = self->tex [tile];
1927 int px = (x + 1) * T - tex.w; 2087 int px, py;
1928 int py = (y + 1) * T - tex.h;
1929 2088
1930 if (key.texname != tex.name) 2089 if (key.texname != tex.name)
1931 { 2090 {
2091 self->tex [tile].unused = 0;
2092
1932 if (!tex.name) 2093 if (!tex.name)
1933 tex = self->tex [2]; /* missing, replace by noface */ 2094 tex = self->tex [TEXID_NOFACE]; /* missing, replace by noface */
1934 2095
1935 key.texname = tex.name; 2096 key.texname = tex.name;
1936 arr = rc_array (rc, &key); 2097 arr = rc_array (rc, &key);
1937 } 2098 }
2099
2100 px = (x + 1) * T - tex.w;
2101 py = (y + 1) * T - tex.h;
1938 2102
1939 if (expect_false (cell->player == player) && expect_false (z == 2)) 2103 if (expect_false (cell->player == player) && expect_false (z == 2))
1940 { 2104 {
1941 pl_x = px; 2105 pl_x = px;
1942 pl_y = py; 2106 pl_y = py;
… …
1947 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2111 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1948 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);
1949 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);
1950 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);
1951 2115
1952 if (expect_false (cell->flags) && expect_false (z == 2))
1953 {
1954 // overlays such as the speech bubble, probably more to come
1955 if (cell->flags & 1)
1956 {
1957 maptex tex = self->tex [1];
1958 int px = x * T + T * 2 / 32;
1959 int py = y * T - T * 6 / 32;
1960
1961 if (tex.name)
1962 {
1963 if (key.texname != tex.name)
1964 {
1965 key.texname = tex.name;
1966 arr = rc_array (rc, &key);
1967 }
1968
1969 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
1970 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0);
1971 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0);
1972 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0);
1973 }
1974 }
1975 }
1976
1977 // update smooth hash 2116 // update smooth hash
1978 if (tex.smoothtile) 2117 if (tex.smoothtile)
1979 { 2118 {
1980 skey.tile = tex.smoothtile; 2119 skey.tile = tex.smoothtile;
1981 skey.level = tex.smoothlevel; 2120 skey.level = tex.smoothlevel;
… …
2009 // corners 2148 // corners
2010 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);
2011 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);
2012 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);
2013 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 }
2014 } 2190 }
2015 } 2191 }
2016 } 2192 }
2017 } 2193 }
2018 2194
… …
2058 { 2234 {
2059 // this time avoiding texture state changes 2235 // this time avoiding texture state changes
2060 // save gobs of state changes. 2236 // save gobs of state changes.
2061 if (key.texname != tex.name) 2237 if (key.texname != tex.name)
2062 { 2238 {
2239 self->tex [skey->tile].unused = 0;
2240
2063 glEnd (); 2241 glEnd ();
2064 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name); 2242 glBindTexture (GL_TEXTURE_2D, key.texname = tex.name);
2065 glBegin (GL_QUADS); 2243 glBegin (GL_QUADS);
2066 } 2244 }
2067 2245
… …
2099 } 2277 }
2100 2278
2101 if (pl_tex.name) 2279 if (pl_tex.name)
2102 { 2280 {
2103 maptex tex = pl_tex; 2281 maptex tex = pl_tex;
2104 int px = pl_x + pdx; 2282 int px = pl_x + sdx;
2105 int py = pl_y + pdy; 2283 int py = pl_y + sdy;
2106 2284
2107 key.texname = tex.name; 2285 key.texname = tex.name;
2108 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
2109 2287
2110 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2288 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
… …
2113 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);
2114 2292
2115 rc_draw (rc); 2293 rc_draw (rc);
2116 } 2294 }
2117 2295
2296 rc_draw (rc_ov);
2297 rc_clear (rc_ov);
2298
2118 glDisable (GL_BLEND); 2299 glDisable (GL_BLEND);
2119 rc_free (rc); 2300 rc_free (rc);
2301 rc_free (rc_ov);
2120 2302
2121 // top layer: overlays such as the health bar 2303 // top layer: overlays such as the health bar
2122 for (y = 0; y < sh; y++) 2304 for (y = 0; y < sh; y++)
2123 if (0 <= y + my && y + my < self->rows) 2305 if (0 <= y + my && y + my < self->rows)
2124 { 2306 {
… …
2129 { 2311 {
2130 mapcell *cell = row->col + (x + mx - row->c0); 2312 mapcell *cell = row->col + (x + mx - row->c0);
2131 2313
2132 int px = x * T; 2314 int px = x * T;
2133 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 }
2134 2322
2135 if (cell->stat_hp) 2323 if (cell->stat_hp)
2136 { 2324 {
2137 int width = cell->stat_width * T; 2325 int width = cell->stat_width * T;
2138 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2326 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width;
… …
2178 }; 2366 };
2179 2367
2180 int x, y; 2368 int x, y;
2181 2369
2182 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 */
2183 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2377 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2184 glEnable (GL_BLEND); 2378 glEnable (GL_BLEND);
2185 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2379 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2186 glBegin (GL_QUADS); 2380 glBegin (GL_QUADS);
2187 2381
2188 for (y = 0; y < h; y++) 2382 for (y = 0; y < h; y++)
… …
2195 float *c = color [m & 15]; 2389 float *c = color [m & 15];
2196 2390
2197 float tx1 = m & 0x40 ? 0.5 : 0.; 2391 float tx1 = m & 0x40 ? 0.5 : 0.;
2198 float tx2 = tx1 + 0.5; 2392 float tx2 = tx1 + 0.5;
2199 2393
2200 glColor4f (c[0], c[1], c[2], 0.75); 2394 glColor4f (c[0], c[1], c[2], 1);
2201 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2395 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2202 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2396 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2203 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2397 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2204 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y ); 2398 glTexCoord2f (tx2, 0.); glVertex2i (x + 1, y );
2205 } 2399 }
… …
2227 SvCUR_set (darkness3_sv, sw34 * sh3); 2421 SvCUR_set (darkness3_sv, sw34 * sh3);
2228 2422
2229 mx += self->x - 1; 2423 mx += self->x - 1;
2230 my += self->y - 1; 2424 my += self->y - 1;
2231 2425
2232 memset (darkness1, 255, sw1 * sh1); 2426 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2233 2427
2234 for (y = 0; y < sh1; y++) 2428 for (y = 0; y < sh1; y++)
2235 if (0 <= y + my && y + my < self->rows) 2429 if (0 <= y + my && y + my < self->rows)
2236 { 2430 {
2237 maprow *row = self->row + (y + my); 2431 maprow *row = self->row + (y + my);
… …
2879void glRotate (float angle, float x, float y, float z) 3073void glRotate (float angle, float x, float y, float z)
2880 CODE: 3074 CODE:
2881 glRotatef (angle, x, y, z); 3075 glRotatef (angle, x, y, z);
2882 3076
2883void glColor (float r, float g, float b, float a = 1.0) 3077void glColor (float r, float g, float b, float a = 1.0)
3078 PROTOTYPE: @
2884 ALIAS: 3079 ALIAS:
2885 glColor_premultiply = 1 3080 glColor_premultiply = 1
2886 CODE: 3081 CODE:
2887 if (ix) 3082 if (ix)
2888 { 3083 {

Diff Legend

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