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.294 by root, Sat Dec 19 05:06:56 2009 UTC vs.
Revision 1.315 by root, Wed Jan 18 23:34:44 2012 UTC

… …
19 19
20#ifdef _WIN32 20#ifdef _WIN32
21# undef pipe 21# undef pipe
22// microsoft vs. C 22// microsoft vs. C
23# define sqrtf(x) sqrt(x) 23# define sqrtf(x) sqrt(x)
24# define roundf(x) (int)(x)
25# define atan2f(x,y) atan2(x,y) 24# define atan2f(x,y) atan2(x,y)
26# define M_PI 3.14159265f 25# define M_PI 3.14159265f
27#endif 26#endif
28 27
29#include <assert.h> 28#include <assert.h>
… …
42#include <SDL_opengl.h> 41#include <SDL_opengl.h>
43 42
44/* work around os x broken headers */ 43/* work around os x broken headers */
45#ifdef __MACOSX__ 44#ifdef __MACOSX__
46typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); 45typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
46typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture);
47typedef void (APIENTRYP PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
47#endif 48#endif
48 49
49#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
50#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
51 52
… …
81#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
82#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
83 84
84#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
85 86
87/* this is used as fow flag as well, so has to have a different value */
88/* then anything that is computed by incoming darkness */
86#define FOW_DARKNESS 64 89#define FOW_DARKNESS 50
87#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 90#define DARKNESS_ADJUST(n) (n)
88 91
89#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
90#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
91 94
92#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
… …
96 99
97#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
98 101
99#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
100#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
101#define TEXID_HIDDEN 3 104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
102 123
103static AV *texture_av; 124static AV *texture_av;
104 125
105static struct 126static struct
106{ 127{
… …
461 482
462 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
463} 484}
464 485
465static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
466minpot (unsigned int n) 493minpot (unsigned int n)
467{ 494{
468 if (!n) 495 if (!n)
469 return 0; 496 return 0;
470 497
… …
550 577
551 return mod; 578 return mod;
552} 579}
553 580
554static void 581static void
555deliantra_main () 582deliantra_main (SV *real_main)
556{ 583{
557 char *argv[] = { 0 }; 584 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
559} 588}
560 589
561#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
562 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which, 595 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
567 */ 598 */
568 extern C_LINKAGE int 599 extern C_LINKAGE int
569 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
570 { 601 {
571 deliantra_main (); 602 deliantra_main (real_main);
572 } 603 }
573 604
574 #undef main 605 #undef main
575 606
576 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
577 608
578 static void 609 static void
579 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
580 { 611 {
612 real_main = real_main_;
613
581 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 615 (main) (1, argv);
583 } 616 }
584#else 617#else
585 static void 618 static void
586 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
587 { 620 {
588 deliantra_main (); 621 deliantra_main (real_main);
589 } 622 }
590#endif 623#endif
591 624
592MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
593 626
… …
794 827
795 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
796# undef const_iv 829# undef const_iv
797 }; 830 };
798 831
799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 834
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 837}
805 838
… …
821NV ceil (NV x) 854NV ceil (NV x)
822 855
823IV minpot (UV n) 856IV minpot (UV n)
824 857
825IV popcount (UV n) 858IV popcount (UV n)
859
860NV distance (NV dx, NV dy)
861 CODE:
862 RETVAL = pow (dx * dx + dy * dy, 0.5);
863 OUTPUT:
864 RETVAL
826 865
827void 866void
828pango_init () 867pango_init ()
829 CODE: 868 CODE:
830{ 869{
… …
838#endif 877#endif
839} 878}
840 879
841char *SDL_GetError () 880char *SDL_GetError ()
842 881
843void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
844 884
845int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
846 886
847int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
848 888
… …
917 ); 957 );
918 958
919 if (RETVAL) 959 if (RETVAL)
920 { 960 {
921 av_clear (texture_av); 961 av_clear (texture_av);
922
923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
925#include "glfunc.h" 963#include "glfunc.h"
926#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927 } 967 }
928} 968}
929 OUTPUT: 969 OUTPUT:
930 RETVAL 970 RETVAL
931 971
932void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
933SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
934 977
935char * 978char *
936SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
937 980
… …
939SDL_GetAppState () 982SDL_GetAppState ()
940 983
941int 984int
942SDL_GetModState () 985SDL_GetModState ()
943 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
944void 991void
992SDL_PumpEvents ()
993
994void
945poll_events () 995peep_events ()
946 PPCODE: 996 PPCODE:
947{ 997{
948 SDL_Event ev; 998 SDL_Event ev;
949 999
950 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
… …
1016 1066
1017 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1067 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1018 } 1068 }
1019} 1069}
1020 1070
1071char *
1072SDL_AudioDriverName ()
1073 CODE:
1074{
1075 char buf [256];
1076 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1077 XSRETURN_UNDEF;
1078
1079 RETVAL = buf;
1080}
1081 OUTPUT:
1082 RETVAL
1083
1021int 1084int
1022Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1085Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1023 POSTCALL: 1086 POSTCALL:
1024 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1025 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
… …
1087add_font (char *file) 1150add_font (char *file)
1088 CODE: 1151 CODE:
1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT: 1153 OUTPUT:
1091 RETVAL 1154 RETVAL
1155
1156void
1157IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1158
1159# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1160void
1161Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1092 1162
1093void 1163void
1094load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1095 ALIAS: 1165 ALIAS:
1096 load_image_file = 1 1166 load_image_file = 1
… …
1660 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1661 } 1731 }
1662} 1732}
1663 1733
1664void 1734void
1665draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1, float blend = 0.f, float dx = 0.f, float dy = 0.f, int name2 = 0, float s2 = 0.f, float t2 = 0.f, float w2 = 0.f, float h2 = 0.f) 1735draw_fow_texture (float intensity, int hidden_tex, int name1, uint8_t *data1, float s, float t, int w, int h, float blend = 0.f, int dx = 0, int dy = 0, int name2 = 0, uint8_t *data2 = data1)
1666 PROTOTYPE: @ 1736 PROTOTYPE: @
1667 CODE: 1737 CODE:
1668{ 1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669 glEnable (GL_TEXTURE_2D); 1741 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1); 1742 glBindTexture (GL_TEXTURE_2D, name1);
1673 1743
1674 glColor3f (intensity, intensity, intensity); 1744 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix (); 1745 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.); 1746 glScalef (1./3, 1./3, 1.);
1677 1747
1678 if (blend > 0.f) 1748 if (blend > 0.f)
1679 { 1749 {
1680 float S2, T2; /* 0. 0. for texture 2 */ 1750 float dx3 = dx * -3.f / w;
1681 float w = w1 > w2 ? w1 : w2; 1751 float dy3 = dy * -3.f / h;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend }; 1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1684 1753
1685 /* interpolate the two shadow textures */ 1754 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
… …
1692 glBindTexture (GL_TEXTURE_2D, name2); 1761 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694 1763
1695 /* rgb == rgb(glcolor) */ 1764 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699 1768
1700 /* alpha = interpolate t0, t1 by env_alpha */ 1769 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702 1771
… …
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709 1778
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712 1781
1713 s1 *= w / w1;
1714 t1 *= h / h1;
1715
1716 dx *= -3.f / w2;
1717 dy *= -3.f / h2;
1718 dx *= w / w2;
1719 dy *= h / h2;
1720
1721 s2 *= w / w2;
1722 t2 *= h / h2;
1723
1724 glBegin (GL_QUADS); 1782 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1726 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy + t2); glVertex2f ( 0, h1); 1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1727 gl.MultiTexCoord2f (GL_TEXTURE0, s1, t1); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy + t2); glVertex2f (w1, h1); 1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1728 gl.MultiTexCoord2f (GL_TEXTURE0, s1, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx + s2, dy ); glVertex2f (w1, 0); 1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729 glEnd (); 1787 glEnd ();
1730 1788
1731 glDisable (GL_TEXTURE_2D); 1789 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0); 1790 gl.ActiveTexture (GL_TEXTURE0);
1733 } 1791 }
… …
1735 { 1793 {
1736 /* simple blending of one texture, also opengl <1.3 path */ 1794 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738 1796
1739 glBegin (GL_QUADS); 1797 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1799 glTexCoord2f (0, t); glVertex2f (0, h);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1800 glTexCoord2f (s, t); glVertex2f (w, h);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1744 glEnd (); 1802 glEnd ();
1745 } 1803 }
1804
1805 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1806 {
1807 int x, y;
1808 int dx3 = dx * 3;
1809 int dy3 = dy * 3;
1810
1811 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1812 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1813 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1814 glTranslatef (-1., -1., 0);
1815 glBegin (GL_QUADS);
1816
1817 for (y = 1; y < h; y += 3)
1818 {
1819 int y1 = y - dy3;
1820 int y1valid = y1 >= 0 && y1 < h;
1821
1822 for (x = 1; x < w; x += 3)
1823 {
1824 int x1 = x - dx3;
1825 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1826 uint8_t h2;
1827
1828 if (y1valid && x1 >= 0 && x1 < w)
1829 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1830 else
1831 h2 = 1; /* out of range == invisible */
1832
1833 if (h1 || h2)
1834 {
1835 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1836 glColor4f (1., 1., 1., alpha);
1837
1838 glTexCoord2f (0, 0.); glVertex2i (x , y );
1839 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1840 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1841 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1842 }
1843 }
1844 }
1845 }
1846
1847 glEnd ();
1746 1848
1747 glPopMatrix (); 1849 glPopMatrix ();
1748 1850
1749 glDisable (GL_TEXTURE_2D); 1851 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND); 1852 glDisable (GL_BLEND);
… …
1971 { 2073 {
1972 ext = *data++; 2074 ext = *data++;
1973 cmd = ext & 0x7f; 2075 cmd = ext & 0x7f;
1974 2076
1975 if (cmd < 4) 2077 if (cmd < 4)
1976 cell->darkness = 255 - ext * 64 + 1; 2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1977 else if (cmd == 5) // health 2079 else if (cmd == 5) // health
1978 { 2080 {
1979 cell->stat_width = 1; 2081 cell->stat_width = 1;
1980 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1981 } 2083 }
… …
2056 ? self->row + y 2158 ? self->row + y
2057 : 0; 2159 : 0;
2058 2160
2059 for (x = x0; x < x1; x++) 2161 for (x = x0; x < x1; x++)
2060 { 2162 {
2061 int r = 32, g = 32, b = 32, a = 192; 2163 unsigned int r = 32, g = 32, b = 32, a = 192;
2062 2164
2063 if (row && row->c0 <= x && x < row->c1) 2165 if (row && row->c0 <= x && x < row->c1)
2064 { 2166 {
2065 mapcell *cell = row->col + (x - row->c0); 2167 mapcell *cell = row->col + (x - row->c0);
2066 2168
… …
2068 { 2170 {
2069 maptex tex = self->tex [cell->tile [z]]; 2171 maptex tex = self->tex [cell->tile [z]];
2070 int a0 = 255 - tex.a; 2172 int a0 = 255 - tex.a;
2071 int a1 = tex.a; 2173 int a1 = tex.a;
2072 2174
2073 r = (r * a0 + tex.r * a1) / 255; 2175 r = div255 (r * a0 + tex.r * a1);
2074 g = (g * a0 + tex.g * a1) / 255; 2176 g = div255 (g * a0 + tex.g * a1);
2075 b = (b * a0 + tex.b * a1) / 255; 2177 b = div255 (b * a0 + tex.b * a1);
2076 a = (a * a0 + tex.a * a1) / 255; 2178 a = div255 (a * a0 + tex.a * a1);
2077 } 2179 }
2078 } 2180 }
2079 2181
2080 *map++ = (r ) 2182 *map++ = (r )
2081 | (g << 8) 2183 | (g << 8)
… …
2088} 2190}
2089 OUTPUT: 2191 OUTPUT:
2090 RETVAL 2192 RETVAL
2091 2193
2092void 2194void
2093draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2195draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2094 CODE: 2196 CODE:
2095{ 2197{
2096 int x, y, z; 2198 int x, y, z;
2097 2199
2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2102 int pl_x, pl_y; 2204 int pl_x, pl_y;
2103 maptex pl_tex; 2205 maptex pl_tex;
2104 rc_t *rc = rc_alloc (); 2206 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc (); 2207 rc_t *rc_ov = rc_alloc ();
2106 rc_key_t key; 2208 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden; 2209 rc_array_t *arr;
2108 2210
2109 pl_tex.name = 0; 2211 pl_tex.name = 0;
2110 2212
2111 // that's current max. sorry. 2213 // that's current max. sorry.
2112 if (sw > 255) sw = 255; 2214 if (sw > 255) sw = 255;
… …
2149 } 2251 }
2150 2252
2151 glEnable (GL_BLEND); 2253 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2154
2155 key.texname = self->tex [TEXID_HIDDEN].name;
2156 arr_hidden = rc_array (rc_ov, &key);
2157 2256
2158 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2159 { 2258 {
2160 memset (smooth_level, 0, sizeof (smooth_level)); 2259 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1; 2260 key.texname = -1;
… …
2185 2284
2186 key.texname = tex.name; 2285 key.texname = tex.name;
2187 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
2188 } 2287 }
2189 2288
2190 px = (x + 1) * T - tex.w; 2289 px = (x + 1) * Th - tex.w;
2191 py = (y + 1) * T - tex.h; 2290 py = (y + 1) * Tw - tex.h;
2192 2291
2193 if (expect_false (cell->player == player) && expect_false (z == 2)) 2292 if (expect_false (cell->player == player) && expect_false (z == 2))
2194 { 2293 {
2195 pl_x = px; 2294 pl_x = px;
2196 pl_y = py; 2295 pl_y = py;
… …
2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2340 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2242 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2341 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2243 } 2342 }
2244 } 2343 }
2245 2344
2246 if (expect_false (z == 2)) 2345 if (expect_false (z == 2) && expect_false (cell->flags))
2247 { 2346 {
2248 /* draw question marks on top of hidden spaces */ 2347 // overlays such as the speech bubble, probably more to come
2249 if (!cell->darkness) 2348 if (cell->flags & 1)
2250 { 2349 {
2251 maptex tex = self->tex [TEXID_HIDDEN];
2252 int px = (x + 1) * T - tex.w;
2253 int py = (y + 1) * T - tex.h;
2254
2255 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2256 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2257 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2258 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2259 }
2260
2261 if (expect_false (cell->flags))
2262 {
2263 // overlays such as the speech bubble, probably more to come
2264 if (cell->flags & 1)
2265 {
2266 rc_key_t key_ov = key; 2350 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH]; 2351 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr; 2352 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32; 2353 int px = x * Tw + Tw * 2 / 32;
2270 int py = y * T - T * 6 / 32; 2354 int py = y * Th - Th * 6 / 32;
2271 2355
2272 key_ov.texname = tex.name; 2356 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov); 2357 arr = rc_array (rc_ov, &key_ov);
2274 2358
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2359 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2360 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2277 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2361 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2278 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2362 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2279 }
2280 } 2363 }
2281 } 2364 }
2282 } 2365 }
2283 } 2366 }
2284 2367
… …
2311 if (!(bits & 0x1000) 2394 if (!(bits & 0x1000)
2312 && skey->level == level 2395 && skey->level == level
2313 && level > smooth_max [skey->x][skey->y]) 2396 && level > smooth_max [skey->x][skey->y])
2314 { 2397 {
2315 maptex tex = self->tex [skey->tile]; 2398 maptex tex = self->tex [skey->tile];
2316 int px = (((int)skey->x) - 1) * T; 2399 int px = (((int)skey->x) - 1) * Tw;
2317 int py = (((int)skey->y) - 1) * T; 2400 int py = (((int)skey->y) - 1) * Th;
2318 int border = bits & 15; 2401 int border = bits & 15;
2319 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320 float dx = tex.s * .0625f; // 16 images/row 2403 float dx = tex.s * .0625f; // 16 images/row
2321 float dy = tex.t * .5f ; // 2 images/column 2404 float dy = tex.t * .5f ; // 2 images/column
2322 2405
… …
2335 2418
2336 if (border) 2419 if (border)
2337 { 2420 {
2338 float ox = border * dx; 2421 float ox = border * dx;
2339 2422
2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344 } 2427 }
2345 2428
2346 if (corner) 2429 if (corner)
2347 { 2430 {
2348 float ox = corner * dx; 2431 float ox = corner * dx;
2349 2432
2350 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354 } 2437 }
2355 } 2438 }
2356 } 2439 }
2357 } 2440 }
2358 } 2441 }
… …
2399 for (x = 0; x < sw; x++) 2482 for (x = 0; x < sw; x++)
2400 if (row->c0 <= x + mx && x + mx < row->c1) 2483 if (row->c0 <= x + mx && x + mx < row->c1)
2401 { 2484 {
2402 mapcell *cell = row->col + (x + mx - row->c0); 2485 mapcell *cell = row->col + (x + mx - row->c0);
2403 2486
2404 int px = x * T; 2487 int px = x * Tw;
2405 int py = y * T; 2488 int py = y * Th;
2406 2489
2407 if (expect_false (cell->player == player)) 2490 if (expect_false (cell->player == player))
2408 { 2491 {
2409 px += sdx; 2492 px += sdx;
2410 py += sdy; 2493 py += sdy;
2411 } 2494 }
2412 2495
2413 if (cell->stat_hp) 2496 if (cell->stat_hp)
2414 { 2497 {
2415 int width = cell->stat_width * T; 2498 int width = cell->stat_width * Tw;
2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2499 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417 2500
2418 glColor3ub (0, 0, 0); 2501 glColor3ub (0, 0, 0);
2419 glRectf (px + 1, py - thick - 2, 2502 glRectf (px + 1, py - thick - 2,
2420 px + width - 1, py); 2503 px + width - 1, py);
2421 2504
… …
2427 } 2510 }
2428 } 2511 }
2429} 2512}
2430 2513
2431void 2514void
2432draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2515draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2433 CODE: 2516 CODE:
2434{ 2517{
2435 static float color[16][3] = { 2518 static float color[16][3] = {
2436 { 0.00F, 0.00F, 0.00F }, 2519 { 0.00f, 0.00f, 0.00f },
2437 { 1.00F, 1.00F, 1.00F }, 2520 { 1.00f, 1.00f, 1.00f },
2438 { 0.00F, 0.00F, 0.55F }, 2521 { 0.00f, 0.00f, 0.55f },
2439 { 1.00F, 0.00F, 0.00F }, 2522 { 1.00f, 0.00f, 0.00f },
2440 2523
2441 { 1.00F, 0.54F, 0.00F }, 2524 { 1.00f, 0.54f, 0.00f },
2442 { 0.11F, 0.56F, 1.00F }, 2525 { 0.11f, 0.56f, 1.00f },
2443 { 0.93F, 0.46F, 0.00F }, 2526 { 0.93f, 0.46f, 0.00f },
2444 { 0.18F, 0.54F, 0.34F }, 2527 { 0.18f, 0.54f, 0.34f },
2445 2528
2446 { 0.56F, 0.73F, 0.56F }, 2529 { 0.56f, 0.73f, 0.56f },
2447 { 0.80F, 0.80F, 0.80F }, 2530 { 0.80f, 0.80f, 0.80f },
2448 { 0.55F, 0.41F, 0.13F }, 2531 { 0.55f, 0.41f, 0.13f },
2449 { 0.99F, 0.77F, 0.26F }, 2532 { 0.99f, 0.77f, 0.26f },
2450 2533
2451 { 0.74F, 0.65F, 0.41F }, 2534 { 0.74f, 0.65f, 0.41f },
2452 2535
2453 { 0.00F, 1.00F, 1.00F }, 2536 { 0.00f, 1.00f, 1.00f },
2454 { 1.00F, 0.00F, 1.00F }, 2537 { 1.00f, 0.00f, 1.00f },
2455 { 1.00F, 1.00F, 0.00F }, 2538 { 1.00f, 1.00f, 0.00f },
2456 }; 2539 };
2457 2540
2458 int x, y; 2541 int x, y;
2459 2542
2460 glEnable (GL_TEXTURE_2D); 2543 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2544 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures 2545 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using 2546 * and takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different 2547 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia. 2548 * alpha, but atcually gives us the correct colour with nvidia.
2466 */ 2549 */
2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468 glEnable (GL_BLEND); 2551 glEnable (GL_BLEND);
… …
2476 2559
2477 if (m) 2560 if (m)
2478 { 2561 {
2479 float *c = color [m & 15]; 2562 float *c = color [m & 15];
2480 2563
2481 float tx1 = m & 0x40 ? 0.5 : 0.; 2564 float tx1 = m & 0x40 ? 0.5f : 0.f;
2482 float tx2 = tx1 + 0.5; 2565 float tx2 = tx1 + 0.5f;
2483 2566
2484 glColor4f (c[0], c[1], c[2], 1); 2567 glColor4f (c[0], c[1], c[2], 1);
2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
… …
2497void 2580void
2498fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2581fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2499 PPCODE: 2582 PPCODE:
2500{ 2583{
2501 int x, y; 2584 int x, y;
2502 int sw1 = sw + 2; 2585 int sw1 = sw + 2;
2503 int sh1 = sh + 2; 2586 int sh1 = sh + 2;
2504 int sh3 = sh * 3; 2587 int sh3 = sh * 3;
2505 int sw34 = (sw * 3 + 3) & ~3; 2588 int sw3 = sw * 3;
2589 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2590 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2506 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2591 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2507 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2592 memset (darkness1, 0, sw1*sh1);
2508 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2509 2593
2510 SvPOK_only (darkness3_sv); 2594 SvPOK_only (darkness3_sv);
2511 SvCUR_set (darkness3_sv, sw34 * sh3); 2595 SvCUR_set (darkness3_sv, sw3 * sh3);
2512 2596
2513 mx += self->x - 1; 2597 mx += self->x - 1;
2514 my += self->y - 1; 2598 my += self->y - 1;
2515
2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517 2599
2518 for (y = 0; y < sh1; y++) 2600 for (y = 0; y < sh1; y++)
2519 if (0 <= y + my && y + my < self->rows) 2601 if (0 <= y + my && y + my < self->rows)
2520 { 2602 {
2521 maprow *row = self->row + (y + my); 2603 maprow *row = self->row + (y + my);
… …
2554 2636
2555 uint8_t r13 = (d13 + d23 + d12) / 3; 2637 uint8_t r13 = (d13 + d23 + d12) / 3;
2556 uint8_t r23 = d23; 2638 uint8_t r23 = d23;
2557 uint8_t r33 = (d23 + d33 + d32) / 3; 2639 uint8_t r33 = (d23 + d33 + d32) / 3;
2558 2640
2559 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2645 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2564 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568 } 2650 }
2569 2651
2570 free (darkness1); 2652 free (darkness1);
2571 2653
2572 EXTEND (SP, 3); 2654 EXTEND (SP, 3);
2573 PUSHs (sv_2mortal (newSViv (sw34))); 2655 PUSHs (sv_2mortal (newSViv (sw3)));
2574 PUSHs (sv_2mortal (newSViv (sh3))); 2656 PUSHs (sv_2mortal (newSViv (sh3)));
2575 PUSHs (darkness3_sv); 2657 PUSHs (darkness3_sv);
2576} 2658}
2577 2659
2578SV * 2660SV *
… …
2776 if (RETVAL < 0) 2858 if (RETVAL < 0)
2777 { 2859 {
2778 RETVAL = Mix_GroupOldest (-1); 2860 RETVAL = Mix_GroupOldest (-1);
2779 2861
2780 if (RETVAL < 0) 2862 if (RETVAL < 0)
2863 {
2864 // happens sometimes, maybe it just stopped playing(?)
2865 RETVAL = Mix_GroupAvailable (-1);
2866
2867 if (RETVAL < 0)
2781 XSRETURN_UNDEF; 2868 XSRETURN_UNDEF;
2782 2869 }
2870 else
2783 Mix_HaltChannel (RETVAL); 2871 Mix_HaltChannel (RETVAL);
2784 } 2872 }
2785 2873
2786 Mix_UnregisterAllEffects (RETVAL); 2874 Mix_UnregisterAllEffects (RETVAL);
2787 Mix_Volume (RETVAL, 128); 2875 Mix_Volume (RETVAL, 128);
2788} 2876}
… …
2835void 2923void
2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2924set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837 CODE: 2925 CODE:
2838{ 2926{
2839 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2927 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance));
2840 int angle = 360 + (int)roundf (atan2f (dx, -dy) * 180.f / (float)M_PI); 2928 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2929 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842} 2930}
2843 2931
2844void 2932void
2845set_reverse_stereo (DC::Channel self, int flip) 2933set_reverse_stereo (DC::Channel self, int flip)
… …
2847 Mix_SetReverseStereo (self, flip); 2935 Mix_SetReverseStereo (self, flip);
2848 2936
2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2937MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850 2938
2851PROTOTYPES: DISABLE 2939PROTOTYPES: DISABLE
2940
2941void
2942decoders ()
2943 PPCODE:
2944#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2945 int i, num = Mix_GetNumChunkDecoders ();
2946 EXTEND (SP, num);
2947 for (i = 0; i < num; ++i)
2948 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2949#else
2950 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2951#endif
2852 2952
2853DC::MixChunk 2953DC::MixChunk
2854new (SV *class, DC::RW rwops) 2954new (SV *class, DC::RW rwops)
2855 CODE: 2955 CODE:
2856 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2956 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2889 OUTPUT: 2989 OUTPUT:
2890 RETVAL 2990 RETVAL
2891 2991
2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2992MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893 2993
2994void
2995decoders ()
2996 PPCODE:
2997#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2998 int i, num = Mix_GetNumMusicDecoders ();
2999 EXTEND (SP, num);
3000 for (i = 0; i < num; ++i)
3001 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3002#else
3003 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3004#endif
3005
2894int 3006int
2895volume (int volume = -1) 3007volume (int volume = -1)
2896 PROTOTYPE: ;$ 3008 PROTOTYPE: ;$
2897 CODE: 3009 CODE:
2898 if (items > 0) 3010 if (items > 0)
… …
2908 3020
2909void 3021void
2910halt () 3022halt ()
2911 CODE: 3023 CODE:
2912 Mix_HaltMusic (); 3024 Mix_HaltMusic ();
3025
3026int
3027playing ()
3028 CODE:
3029 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT:
3031 RETVAL
2913 3032
2914DC::MixMusic 3033DC::MixMusic
2915new (SV *class, DC::RW rwops) 3034new (SV *class, DC::RW rwops)
2916 CODE: 3035 CODE:
2917 RETVAL = Mix_LoadMUS_RW (rwops); 3036 RETVAL = Mix_LoadMUS_RW (rwops);
… …
3057 const_iv (GL_FUNC_SUBTRACT), 3176 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3177 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059# undef const_iv 3178# undef const_iv
3060 }; 3179 };
3061 3180
3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3181 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3182 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064 3183
3065 texture_av = newAV (); 3184 texture_av = newAV ();
3066 AvREAL_off (texture_av); 3185 AvREAL_off (texture_av);
3067} 3186}
3068 3187
… …
3111 RETVAL 3230 RETVAL
3112 3231
3113int glGetError () 3232int glGetError ()
3114 3233
3115void glFinish () 3234void glFinish ()
3235
3236void glFlush ()
3116 3237
3117void glClear (int mask) 3238void glClear (int mask)
3118 3239
3119void glClearColor (float r, float g, float b, float a = 1.0) 3240void glClearColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @ 3241 PROTOTYPE: @
… …
3291void glNewList (int list, int mode = GL_COMPILE) 3412void glNewList (int list, int mode = GL_COMPILE)
3292 3413
3293void glEndList () 3414void glEndList ()
3294 3415
3295void glCallList (int list) 3416void glCallList (int list)
3417
3418void c_init ()
3419 CODE:
3420 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3421 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3296 3422
3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3423MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298 3424
3299PROTOTYPES: DISABLE 3425PROTOTYPES: DISABLE
3300 3426

Diff Legend

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