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.293 by root, Thu Dec 17 02:49:38 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
90#define DARKNESS_ADJUST(n) (n)
87 91
88#define MAP_EXTEND_X 32 92#define MAP_EXTEND_X 32
89#define MAP_EXTEND_Y 512 93#define MAP_EXTEND_Y 512
90 94
91#define MIN_FONT_HEIGHT 10 95#define MIN_FONT_HEIGHT 10
95 99
96#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
97 101
98#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
99#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
100#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}
101 123
102static AV *texture_av; 124static AV *texture_av;
103 125
104static struct 126static struct
105{ 127{
460 482
461 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
462} 484}
463 485
464static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
465minpot (unsigned int n) 493minpot (unsigned int n)
466{ 494{
467 if (!n) 495 if (!n)
468 return 0; 496 return 0;
469 497
549 577
550 return mod; 578 return mod;
551} 579}
552 580
553static void 581static void
554deliantra_main () 582deliantra_main (SV *real_main)
555{ 583{
556 char *argv[] = { 0 }; 584 dSP;
557 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
558} 588}
559 589
560#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
561 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
562 * do some mind-boggling hack here: SDL requires a custom main() 594 * 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, 595 * 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, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
565 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
566 */ 598 */
567 extern C_LINKAGE int 599 extern C_LINKAGE int
568 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
569 { 601 {
570 deliantra_main (); 602 deliantra_main (real_main);
571 } 603 }
572 604
573 #undef main 605 #undef main
574 606
575 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
576 608
577 static void 609 static void
578 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
579 { 611 {
612 real_main = real_main_;
613
580 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
581 (main) (1, argv); 615 (main) (1, argv);
582 } 616 }
583#else 617#else
584 static void 618 static void
585 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
586 { 620 {
587 deliantra_main (); 621 deliantra_main (real_main);
588 } 622 }
589#endif 623#endif
590 624
591MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
592 626
793 827
794 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
795# undef const_iv 829# undef const_iv
796 }; 830 };
797 831
798 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--)
799 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
800 834
801 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
802 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
803} 837}
804 838
820NV ceil (NV x) 854NV ceil (NV x)
821 855
822IV minpot (UV n) 856IV minpot (UV n)
823 857
824IV 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
825 865
826void 866void
827pango_init () 867pango_init ()
828 CODE: 868 CODE:
829{ 869{
837#endif 877#endif
838} 878}
839 879
840char *SDL_GetError () 880char *SDL_GetError ()
841 881
842void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
843 884
844int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
845 886
846int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
847 888
916 ); 957 );
917 958
918 if (RETVAL) 959 if (RETVAL)
919 { 960 {
920 av_clear (texture_av); 961 av_clear (texture_av);
921
922 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
923#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);
924#include "glfunc.h" 963#include "glfunc.h"
925#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
926 } 967 }
927} 968}
928 OUTPUT: 969 OUTPUT:
929 RETVAL 970 RETVAL
930 971
931void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
932SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
933 977
934char * 978char *
935SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
936 980
938SDL_GetAppState () 982SDL_GetAppState ()
939 983
940int 984int
941SDL_GetModState () 985SDL_GetModState ()
942 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
943void 991void
992SDL_PumpEvents ()
993
994void
944poll_events () 995peep_events ()
945 PPCODE: 996 PPCODE:
946{ 997{
947 SDL_Event ev; 998 SDL_Event ev;
948 999
949 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
1015 1066
1016 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))));
1017 } 1068 }
1018} 1069}
1019 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
1020int 1084int
1021Mix_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)
1022 POSTCALL: 1086 POSTCALL:
1023 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1024 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
1086add_font (char *file) 1150add_font (char *file)
1087 CODE: 1151 CODE:
1088 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1089 OUTPUT: 1153 OUTPUT:
1090 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)
1091 1162
1092void 1163void
1093load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1094 ALIAS: 1165 ALIAS:
1095 load_image_file = 1 1166 load_image_file = 1
1659 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1660 } 1731 }
1661} 1732}
1662 1733
1663void 1734void
1664draw_fow_texture (float intensity, int name1, float s1, float t1, float w1, float h1) 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)
1665 PROTOTYPE: @ 1736 PROTOTYPE: @
1666 CODE: 1737 CODE:
1667{ 1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1668 glEnable (GL_TEXTURE_2D); 1741 glEnable (GL_TEXTURE_2D);
1669 glEnable (GL_BLEND); 1742 glBindTexture (GL_TEXTURE_2D, name1);
1670 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 1743
1673 glColor4f (intensity, intensity, intensity, 0.9); 1744 glColor3f (intensity, intensity, intensity);
1674 glPushMatrix (); 1745 glPushMatrix ();
1675 glScalef (1./3, 1./3, 1.); 1746 glScalef (1./3, 1./3, 1.);
1676 1747
1748 if (blend > 0.f)
1749 {
1750 float dx3 = dx * -3.f / w;
1751 float dy3 = dy * -3.f / h;
1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1753
1754 /* interpolate the two shadow textures */
1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1757
1758 /* stage 1 == rgb(glcolor) + alpha(interpolate t0, t1, texenv) */
1759 gl.ActiveTexture (GL_TEXTURE1);
1760 glEnable (GL_TEXTURE_2D);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1761 glBindTexture (GL_TEXTURE_2D, name2);
1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1678 1763
1764 /* rgb == rgb(glcolor) */
1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1768
1769 /* alpha = interpolate t0, t1 by env_alpha */
1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1771
1772 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_INTERPOLATE);
1773 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_TEXTURE);
1774 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA);
1775
1776 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE1_ALPHA, GL_PREVIOUS);
1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1778
1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1781
1782 glBegin (GL_QUADS);
1783 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 ); glVertex2i (0, 0);
1784 gl.MultiTexCoord2f (GL_TEXTURE0, 0, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 , dy3 + t); glVertex2i (0, h);
1785 gl.MultiTexCoord2f (GL_TEXTURE0, s, t); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 + t); glVertex2i (w, h);
1786 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1787 glEnd ();
1788
1789 glDisable (GL_TEXTURE_2D);
1790 gl.ActiveTexture (GL_TEXTURE0);
1791 }
1792 else
1793 {
1794 /* simple blending of one texture, also opengl <1.3 path */
1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1796
1797 glBegin (GL_QUADS);
1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1799 glTexCoord2f (0, t); glVertex2f (0, h);
1800 glTexCoord2f (s, t); glVertex2f (w, h);
1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1802 glEnd ();
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);
1679 glBegin (GL_QUADS); 1815 glBegin (GL_QUADS);
1680 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1816
1681 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1817 for (y = 1; y < h; y += 3)
1682 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1818 {
1683 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 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
1684 glEnd (); 1847 glEnd ();
1685 1848
1686 glPopMatrix (); 1849 glPopMatrix ();
1687 1850
1688 glDisable (GL_TEXTURE_2D); 1851 glDisable (GL_TEXTURE_2D);
1910 { 2073 {
1911 ext = *data++; 2074 ext = *data++;
1912 cmd = ext & 0x7f; 2075 cmd = ext & 0x7f;
1913 2076
1914 if (cmd < 4) 2077 if (cmd < 4)
1915 cell->darkness = 255 - ext * 64 + 1; 2078 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1916 else if (cmd == 5) // health 2079 else if (cmd == 5) // health
1917 { 2080 {
1918 cell->stat_width = 1; 2081 cell->stat_width = 1;
1919 cell->stat_hp = *data++; 2082 cell->stat_hp = *data++;
1920 } 2083 }
1995 ? self->row + y 2158 ? self->row + y
1996 : 0; 2159 : 0;
1997 2160
1998 for (x = x0; x < x1; x++) 2161 for (x = x0; x < x1; x++)
1999 { 2162 {
2000 int r = 32, g = 32, b = 32, a = 192; 2163 unsigned int r = 32, g = 32, b = 32, a = 192;
2001 2164
2002 if (row && row->c0 <= x && x < row->c1) 2165 if (row && row->c0 <= x && x < row->c1)
2003 { 2166 {
2004 mapcell *cell = row->col + (x - row->c0); 2167 mapcell *cell = row->col + (x - row->c0);
2005 2168
2007 { 2170 {
2008 maptex tex = self->tex [cell->tile [z]]; 2171 maptex tex = self->tex [cell->tile [z]];
2009 int a0 = 255 - tex.a; 2172 int a0 = 255 - tex.a;
2010 int a1 = tex.a; 2173 int a1 = tex.a;
2011 2174
2012 r = (r * a0 + tex.r * a1) / 255; 2175 r = div255 (r * a0 + tex.r * a1);
2013 g = (g * a0 + tex.g * a1) / 255; 2176 g = div255 (g * a0 + tex.g * a1);
2014 b = (b * a0 + tex.b * a1) / 255; 2177 b = div255 (b * a0 + tex.b * a1);
2015 a = (a * a0 + tex.a * a1) / 255; 2178 a = div255 (a * a0 + tex.a * a1);
2016 } 2179 }
2017 } 2180 }
2018 2181
2019 *map++ = (r ) 2182 *map++ = (r )
2020 | (g << 8) 2183 | (g << 8)
2027} 2190}
2028 OUTPUT: 2191 OUTPUT:
2029 RETVAL 2192 RETVAL
2030 2193
2031void 2194void
2032draw (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)
2033 CODE: 2196 CODE:
2034{ 2197{
2035 int x, y, z; 2198 int x, y, z;
2036 2199
2037 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2200 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2041 int pl_x, pl_y; 2204 int pl_x, pl_y;
2042 maptex pl_tex; 2205 maptex pl_tex;
2043 rc_t *rc = rc_alloc (); 2206 rc_t *rc = rc_alloc ();
2044 rc_t *rc_ov = rc_alloc (); 2207 rc_t *rc_ov = rc_alloc ();
2045 rc_key_t key; 2208 rc_key_t key;
2046 rc_array_t *arr, *arr_hidden; 2209 rc_array_t *arr;
2047 2210
2048 pl_tex.name = 0; 2211 pl_tex.name = 0;
2049 2212
2050 // that's current max. sorry. 2213 // that's current max. sorry.
2051 if (sw > 255) sw = 255; 2214 if (sw > 255) sw = 255;
2088 } 2251 }
2089 2252
2090 glEnable (GL_BLEND); 2253 glEnable (GL_BLEND);
2091 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2254 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2092 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2255 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2093
2094 key.texname = self->tex [TEXID_HIDDEN].name;
2095 arr_hidden = rc_array (rc_ov, &key);
2096 2256
2097 for (z = 0; z <= 2; z++) 2257 for (z = 0; z <= 2; z++)
2098 { 2258 {
2099 memset (smooth_level, 0, sizeof (smooth_level)); 2259 memset (smooth_level, 0, sizeof (smooth_level));
2100 key.texname = -1; 2260 key.texname = -1;
2124 2284
2125 key.texname = tex.name; 2285 key.texname = tex.name;
2126 arr = rc_array (rc, &key); 2286 arr = rc_array (rc, &key);
2127 } 2287 }
2128 2288
2129 px = (x + 1) * T - tex.w; 2289 px = (x + 1) * Th - tex.w;
2130 py = (y + 1) * T - tex.h; 2290 py = (y + 1) * Tw - tex.h;
2131 2291
2132 if (expect_false (cell->player == player) && expect_false (z == 2)) 2292 if (expect_false (cell->player == player) && expect_false (z == 2))
2133 { 2293 {
2134 pl_x = px; 2294 pl_x = px;
2135 pl_y = py; 2295 pl_y = py;
2180 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);
2181 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);
2182 } 2342 }
2183 } 2343 }
2184 2344
2185 if (expect_false (z == 2)) 2345 if (expect_false (z == 2) && expect_false (cell->flags))
2186 { 2346 {
2187 /* draw question marks on top of hidden spaces */ 2347 // overlays such as the speech bubble, probably more to come
2188 if (!cell->darkness) 2348 if (cell->flags & 1)
2189 { 2349 {
2190 maptex tex = self->tex [TEXID_HIDDEN];
2191 int px = (x + 1) * T - tex.w;
2192 int py = (y + 1) * T - tex.h;
2193
2194 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2195 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2196 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2197 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2198 }
2199
2200 if (expect_false (cell->flags))
2201 {
2202 // overlays such as the speech bubble, probably more to come
2203 if (cell->flags & 1)
2204 {
2205 rc_key_t key_ov = key; 2350 rc_key_t key_ov = key;
2206 maptex tex = self->tex [TEXID_SPEECH]; 2351 maptex tex = self->tex [TEXID_SPEECH];
2207 rc_array_t *arr; 2352 rc_array_t *arr;
2208 int px = x * T + T * 2 / 32; 2353 int px = x * Tw + Tw * 2 / 32;
2209 int py = y * T - T * 6 / 32; 2354 int py = y * Th - Th * 6 / 32;
2210 2355
2211 key_ov.texname = tex.name; 2356 key_ov.texname = tex.name;
2212 arr = rc_array (rc_ov, &key_ov); 2357 arr = rc_array (rc_ov, &key_ov);
2213 2358
2214 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2359 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2215 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2360 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2216 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);
2217 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2362 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2218 }
2219 } 2363 }
2220 } 2364 }
2221 } 2365 }
2222 } 2366 }
2223 2367
2250 if (!(bits & 0x1000) 2394 if (!(bits & 0x1000)
2251 && skey->level == level 2395 && skey->level == level
2252 && level > smooth_max [skey->x][skey->y]) 2396 && level > smooth_max [skey->x][skey->y])
2253 { 2397 {
2254 maptex tex = self->tex [skey->tile]; 2398 maptex tex = self->tex [skey->tile];
2255 int px = (((int)skey->x) - 1) * T; 2399 int px = (((int)skey->x) - 1) * Tw;
2256 int py = (((int)skey->y) - 1) * T; 2400 int py = (((int)skey->y) - 1) * Th;
2257 int border = bits & 15; 2401 int border = bits & 15;
2258 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2402 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2259 float dx = tex.s * .0625f; // 16 images/row 2403 float dx = tex.s * .0625f; // 16 images/row
2260 float dy = tex.t * .5f ; // 2 images/column 2404 float dy = tex.t * .5f ; // 2 images/column
2261 2405
2274 2418
2275 if (border) 2419 if (border)
2276 { 2420 {
2277 float ox = border * dx; 2421 float ox = border * dx;
2278 2422
2279 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2423 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2280 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2424 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2281 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2425 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2282 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2426 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2283 } 2427 }
2284 2428
2285 if (corner) 2429 if (corner)
2286 { 2430 {
2287 float ox = corner * dx; 2431 float ox = corner * dx;
2288 2432
2289 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2433 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2290 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2434 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2291 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2435 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2292 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2436 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2293 } 2437 }
2294 } 2438 }
2295 } 2439 }
2296 } 2440 }
2297 } 2441 }
2338 for (x = 0; x < sw; x++) 2482 for (x = 0; x < sw; x++)
2339 if (row->c0 <= x + mx && x + mx < row->c1) 2483 if (row->c0 <= x + mx && x + mx < row->c1)
2340 { 2484 {
2341 mapcell *cell = row->col + (x + mx - row->c0); 2485 mapcell *cell = row->col + (x + mx - row->c0);
2342 2486
2343 int px = x * T; 2487 int px = x * Tw;
2344 int py = y * T; 2488 int py = y * Th;
2345 2489
2346 if (expect_false (cell->player == player)) 2490 if (expect_false (cell->player == player))
2347 { 2491 {
2348 px += sdx; 2492 px += sdx;
2349 py += sdy; 2493 py += sdy;
2350 } 2494 }
2351 2495
2352 if (cell->stat_hp) 2496 if (cell->stat_hp)
2353 { 2497 {
2354 int width = cell->stat_width * T; 2498 int width = cell->stat_width * Tw;
2355 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2499 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2356 2500
2357 glColor3ub (0, 0, 0); 2501 glColor3ub (0, 0, 0);
2358 glRectf (px + 1, py - thick - 2, 2502 glRectf (px + 1, py - thick - 2,
2359 px + width - 1, py); 2503 px + width - 1, py);
2360 2504
2366 } 2510 }
2367 } 2511 }
2368} 2512}
2369 2513
2370void 2514void
2371draw_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)
2372 CODE: 2516 CODE:
2373{ 2517{
2374 static float color[16][3] = { 2518 static float color[16][3] = {
2375 { 0.00F, 0.00F, 0.00F }, 2519 { 0.00f, 0.00f, 0.00f },
2376 { 1.00F, 1.00F, 1.00F }, 2520 { 1.00f, 1.00f, 1.00f },
2377 { 0.00F, 0.00F, 0.55F }, 2521 { 0.00f, 0.00f, 0.55f },
2378 { 1.00F, 0.00F, 0.00F }, 2522 { 1.00f, 0.00f, 0.00f },
2379 2523
2380 { 1.00F, 0.54F, 0.00F }, 2524 { 1.00f, 0.54f, 0.00f },
2381 { 0.11F, 0.56F, 1.00F }, 2525 { 0.11f, 0.56f, 1.00f },
2382 { 0.93F, 0.46F, 0.00F }, 2526 { 0.93f, 0.46f, 0.00f },
2383 { 0.18F, 0.54F, 0.34F }, 2527 { 0.18f, 0.54f, 0.34f },
2384 2528
2385 { 0.56F, 0.73F, 0.56F }, 2529 { 0.56f, 0.73f, 0.56f },
2386 { 0.80F, 0.80F, 0.80F }, 2530 { 0.80f, 0.80f, 0.80f },
2387 { 0.55F, 0.41F, 0.13F }, 2531 { 0.55f, 0.41f, 0.13f },
2388 { 0.99F, 0.77F, 0.26F }, 2532 { 0.99f, 0.77f, 0.26f },
2389 2533
2390 { 0.74F, 0.65F, 0.41F }, 2534 { 0.74f, 0.65f, 0.41f },
2391 2535
2392 { 0.00F, 1.00F, 1.00F }, 2536 { 0.00f, 1.00f, 1.00f },
2393 { 1.00F, 0.00F, 1.00F }, 2537 { 1.00f, 0.00f, 1.00f },
2394 { 1.00F, 1.00F, 0.00F }, 2538 { 1.00f, 1.00f, 0.00f },
2395 }; 2539 };
2396 2540
2397 int x, y; 2541 int x, y;
2398 2542
2399 glEnable (GL_TEXTURE_2D); 2543 glEnable (GL_TEXTURE_2D);
2400 /* 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,
2401 * but the nvidia driver (185.18.14) mishandles alpha textures 2545 * but the nvidia driver (185.18.14) mishandles alpha textures
2402 * ansd takes the colour from god knows where instead of using 2546 * and takes the colour from god knows where instead of using
2403 * Cp. MODULATE results in the same colour, but slightly different 2547 * Cp. MODULATE results in the same colour, but slightly different
2404 * alpha, but atcually gives us the correct colour with nvidia. 2548 * alpha, but atcually gives us the correct colour with nvidia.
2405 */ 2549 */
2406 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2550 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2407 glEnable (GL_BLEND); 2551 glEnable (GL_BLEND);
2415 2559
2416 if (m) 2560 if (m)
2417 { 2561 {
2418 float *c = color [m & 15]; 2562 float *c = color [m & 15];
2419 2563
2420 float tx1 = m & 0x40 ? 0.5 : 0.; 2564 float tx1 = m & 0x40 ? 0.5f : 0.f;
2421 float tx2 = tx1 + 0.5; 2565 float tx2 = tx1 + 0.5f;
2422 2566
2423 glColor4f (c[0], c[1], c[2], 1); 2567 glColor4f (c[0], c[1], c[2], 1);
2424 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2568 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2425 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2569 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2426 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2570 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2436void 2580void
2437fow_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)
2438 PPCODE: 2582 PPCODE:
2439{ 2583{
2440 int x, y; 2584 int x, y;
2441 int sw1 = sw + 2; 2585 int sw1 = sw + 2;
2442 int sh1 = sh + 2; 2586 int sh1 = sh + 2;
2443 int sh3 = sh * 3; 2587 int sh3 = sh * 3;
2444 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);
2445 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2591 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2446 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2592 memset (darkness1, 0, sw1*sh1);
2447 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2448 2593
2449 SvPOK_only (darkness3_sv); 2594 SvPOK_only (darkness3_sv);
2450 SvCUR_set (darkness3_sv, sw34 * sh3); 2595 SvCUR_set (darkness3_sv, sw3 * sh3);
2451 2596
2452 mx += self->x - 1; 2597 mx += self->x - 1;
2453 my += self->y - 1; 2598 my += self->y - 1;
2454
2455 memset (darkness1, 255 - FOW_DARKNESS, sw1 * sh1);
2456 2599
2457 for (y = 0; y < sh1; y++) 2600 for (y = 0; y < sh1; y++)
2458 if (0 <= y + my && y + my < self->rows) 2601 if (0 <= y + my && y + my < self->rows)
2459 { 2602 {
2460 maprow *row = self->row + (y + my); 2603 maprow *row = self->row + (y + my);
2463 if (row->c0 <= x + mx && x + mx < row->c1) 2606 if (row->c0 <= x + mx && x + mx < row->c1)
2464 { 2607 {
2465 mapcell *cell = row->col + (x + mx - row->c0); 2608 mapcell *cell = row->col + (x + mx - row->c0);
2466 2609
2467 darkness1 [y * sw1 + x] = cell->darkness 2610 darkness1 [y * sw1 + x] = cell->darkness
2468 ? 255 - (cell->darkness - 1) 2611 ? DARKNESS_ADJUST (255 - (cell->darkness - 1))
2469 : 255 - FOW_DARKNESS; 2612 : DARKNESS_ADJUST (255 - FOW_DARKNESS);
2470 } 2613 }
2471 } 2614 }
2472 2615
2473 for (y = 0; y < sh; ++y) 2616 for (y = 0; y < sh; ++y)
2474 for (x = 0; x < sw; ++x) 2617 for (x = 0; x < sw; ++x)
2493 2636
2494 uint8_t r13 = (d13 + d23 + d12) / 3; 2637 uint8_t r13 = (d13 + d23 + d12) / 3;
2495 uint8_t r23 = d23; 2638 uint8_t r23 = d23;
2496 uint8_t r33 = (d23 + d33 + d32) / 3; 2639 uint8_t r33 = (d23 + d33 + d32) / 3;
2497 2640
2498 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2641 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2499 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2642 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2500 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2643 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2501 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2644 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2502 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 */
2503 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2646 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2504 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2647 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2505 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2648 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2506 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2649 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2507 } 2650 }
2508 2651
2509 free (darkness1); 2652 free (darkness1);
2510 2653
2511 EXTEND (SP, 3); 2654 EXTEND (SP, 3);
2512 PUSHs (sv_2mortal (newSViv (sw34))); 2655 PUSHs (sv_2mortal (newSViv (sw3)));
2513 PUSHs (sv_2mortal (newSViv (sh3))); 2656 PUSHs (sv_2mortal (newSViv (sh3)));
2514 PUSHs (darkness3_sv); 2657 PUSHs (darkness3_sv);
2515} 2658}
2516 2659
2517SV * 2660SV *
2715 if (RETVAL < 0) 2858 if (RETVAL < 0)
2716 { 2859 {
2717 RETVAL = Mix_GroupOldest (-1); 2860 RETVAL = Mix_GroupOldest (-1);
2718 2861
2719 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)
2720 XSRETURN_UNDEF; 2868 XSRETURN_UNDEF;
2721 2869 }
2870 else
2722 Mix_HaltChannel (RETVAL); 2871 Mix_HaltChannel (RETVAL);
2723 } 2872 }
2724 2873
2725 Mix_UnregisterAllEffects (RETVAL); 2874 Mix_UnregisterAllEffects (RETVAL);
2726 Mix_Volume (RETVAL, 128); 2875 Mix_Volume (RETVAL, 128);
2727} 2876}
2774void 2923void
2775set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2924set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2776 CODE: 2925 CODE:
2777{ 2926{
2778 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));
2779 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;
2780 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2929 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2781} 2930}
2782 2931
2783void 2932void
2784set_reverse_stereo (DC::Channel self, int flip) 2933set_reverse_stereo (DC::Channel self, int flip)
2786 Mix_SetReverseStereo (self, flip); 2935 Mix_SetReverseStereo (self, flip);
2787 2936
2788MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2937MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2789 2938
2790PROTOTYPES: 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
2791 2952
2792DC::MixChunk 2953DC::MixChunk
2793new (SV *class, DC::RW rwops) 2954new (SV *class, DC::RW rwops)
2794 CODE: 2955 CODE:
2795 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2956 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2828 OUTPUT: 2989 OUTPUT:
2829 RETVAL 2990 RETVAL
2830 2991
2831MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2992MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2832 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
2833int 3006int
2834volume (int volume = -1) 3007volume (int volume = -1)
2835 PROTOTYPE: ;$ 3008 PROTOTYPE: ;$
2836 CODE: 3009 CODE:
2837 if (items > 0) 3010 if (items > 0)
2847 3020
2848void 3021void
2849halt () 3022halt ()
2850 CODE: 3023 CODE:
2851 Mix_HaltMusic (); 3024 Mix_HaltMusic ();
3025
3026int
3027playing ()
3028 CODE:
3029 RETVAL = Mix_PlayingMusic ();
3030 OUTPUT:
3031 RETVAL
2852 3032
2853DC::MixMusic 3033DC::MixMusic
2854new (SV *class, DC::RW rwops) 3034new (SV *class, DC::RW rwops)
2855 CODE: 3035 CODE:
2856 RETVAL = Mix_LoadMUS_RW (rwops); 3036 RETVAL = Mix_LoadMUS_RW (rwops);
2996 const_iv (GL_FUNC_SUBTRACT), 3176 const_iv (GL_FUNC_SUBTRACT),
2997 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3177 const_iv (GL_FUNC_REVERSE_SUBTRACT),
2998# undef const_iv 3178# undef const_iv
2999 }; 3179 };
3000 3180
3001 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--)
3002 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3182 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3003 3183
3004 texture_av = newAV (); 3184 texture_av = newAV ();
3005 AvREAL_off (texture_av); 3185 AvREAL_off (texture_av);
3006} 3186}
3007 3187
3050 RETVAL 3230 RETVAL
3051 3231
3052int glGetError () 3232int glGetError ()
3053 3233
3054void glFinish () 3234void glFinish ()
3235
3236void glFlush ()
3055 3237
3056void glClear (int mask) 3238void glClear (int mask)
3057 3239
3058void glClearColor (float r, float g, float b, float a = 1.0) 3240void glClearColor (float r, float g, float b, float a = 1.0)
3059 PROTOTYPE: @ 3241 PROTOTYPE: @
3230void glNewList (int list, int mode = GL_COMPILE) 3412void glNewList (int list, int mode = GL_COMPILE)
3231 3413
3232void glEndList () 3414void glEndList ()
3233 3415
3234void 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);
3235 3422
3236MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3423MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3237 3424
3238PROTOTYPES: DISABLE 3425PROTOTYPES: DISABLE
3239 3426

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines