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.295 by root, Mon Dec 21 03:30:22 2009 UTC vs.
Revision 1.317 by root, Fri Nov 23 12:39:05 2012 UTC

41#include <SDL_opengl.h> 41#include <SDL_opengl.h>
42 42
43/* work around os x broken headers */ 43/* work around os x broken headers */
44#ifdef __MACOSX__ 44#ifdef __MACOSX__
45typedef 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);
46#endif 48#endif
47 49
48#define PANGO_ENABLE_BACKEND 50#define PANGO_ENABLE_BACKEND
49#define G_DISABLE_CAST_CHECKS 51#define G_DISABLE_CAST_CHECKS
50 52
80#define expect_false(expr) expect ((expr) != 0, 0) 82#define expect_false(expr) expect ((expr) != 0, 0)
81#define expect_true(expr) expect ((expr) != 0, 1) 83#define expect_true(expr) expect ((expr) != 0, 1)
82 84
83#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */ 85#define OBJ_STR "\xef\xbf\xbc" /* U+FFFC, object replacement character */
84 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 */
85#define FOW_DARKNESS 64 89#define FOW_DARKNESS 50
86#define DARKNESS_ADJUST(n) ((29 * (int)(n)) >> 5) /* times 0.9 */ 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
843#endif 877#endif
844} 878}
845 879
846char *SDL_GetError () 880char *SDL_GetError ()
847 881
848void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
849 884
850int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
851 886
852int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
853 888
922 ); 957 );
923 958
924 if (RETVAL) 959 if (RETVAL)
925 { 960 {
926 av_clear (texture_av); 961 av_clear (texture_av);
927
928 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
929#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);
930#include "glfunc.h" 963#include "glfunc.h"
931#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
932 } 967 }
933} 968}
934 OUTPUT: 969 OUTPUT:
935 RETVAL 970 RETVAL
936 971
937void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
938SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
939 977
940char * 978char *
941SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
942 980
944SDL_GetAppState () 982SDL_GetAppState ()
945 983
946int 984int
947SDL_GetModState () 985SDL_GetModState ()
948 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
949void 991void
992SDL_PumpEvents ()
993
994void
950poll_events () 995peep_events ()
951 PPCODE: 996 PPCODE:
952{ 997{
953 SDL_Event ev; 998 SDL_Event ev;
954 999
955 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
1021 1066
1022 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))));
1023 } 1068 }
1024} 1069}
1025 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
1026int 1084int
1027Mix_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)
1028 POSTCALL: 1086 POSTCALL:
1029 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1030 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
1092add_font (char *file) 1150add_font (char *file)
1093 CODE: 1151 CODE:
1094 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1095 OUTPUT: 1153 OUTPUT:
1096 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)
1097 1162
1098void 1163void
1099load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1100 ALIAS: 1165 ALIAS:
1101 load_image_file = 1 1166 load_image_file = 1
1427 1492
1428void 1493void
1429set_height (DC::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1430 CODE: 1495 CODE:
1431 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1432 { 1497 {
1433 self->base_height = base_height; 1498 self->base_height = base_height;
1434 layout_update_font (self); 1499 layout_update_font (self);
1435 } 1500 }
1436 1501
1437void 1502void
1665 glDisable (GL_BLEND); 1730 glDisable (GL_BLEND);
1666 } 1731 }
1667} 1732}
1668 1733
1669void 1734void
1670draw_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)
1671 PROTOTYPE: @ 1736 PROTOTYPE: @
1672 CODE: 1737 CODE:
1673{ 1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1674 glEnable (GL_TEXTURE_2D); 1741 glEnable (GL_TEXTURE_2D);
1675 glEnable (GL_BLEND);
1676 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1677 glBindTexture (GL_TEXTURE_2D, name1); 1742 glBindTexture (GL_TEXTURE_2D, name1);
1678 1743
1679 glColor3f (intensity, intensity, intensity); 1744 glColor3f (intensity, intensity, intensity);
1680 glPushMatrix (); 1745 glPushMatrix ();
1681 glScalef (1./3, 1./3, 1.); 1746 glScalef (1./3, 1./3, 1.);
1682 1747
1683 if (blend > 0.f) 1748 if (blend > 0.f)
1684 { 1749 {
1685 float S2, T2; /* 0. 0. for texture 2 */ 1750 float dx3 = dx * -3.f / w;
1686 float w = w1 > w2 ? w1 : w2; 1751 float dy3 = dy * -3.f / h;
1687 float h = h1 > h2 ? h1 : h2;
1688 GLfloat env_color[4] = { 0., 0., 0., blend }; 1752 GLfloat env_color[4] = { 0., 0., 0., blend };
1689 1753
1690 /* interpolate the two shadow textures */ 1754 /* interpolate the two shadow textures */
1691 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1755 /* stage 0 == rgb(glcolor) + alpha(t0) */
1692 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1756 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1761 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1762 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1763
1700 /* rgb == rgb(glcolor) */ 1764 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1765 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1766 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1767 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1768
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1769 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1770 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1771
1713 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1777 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1714 1778
1715 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1779 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1716 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1780 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1717 1781
1718 s1 *= w / w1;
1719 t1 *= h / h1;
1720
1721 dx *= -3.f / w2;
1722 dy *= -3.f / h2;
1723 dx *= w / w2;
1724 dy *= h / h2;
1725
1726 s2 *= w / w2;
1727 t2 *= h / h2;
1728
1729 glBegin (GL_QUADS); 1782 glBegin (GL_QUADS);
1730 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);
1731 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);
1732 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);
1733 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);
1734 glEnd (); 1787 glEnd ();
1735 1788
1736 glDisable (GL_TEXTURE_2D); 1789 glDisable (GL_TEXTURE_2D);
1737 gl.ActiveTexture (GL_TEXTURE0); 1790 gl.ActiveTexture (GL_TEXTURE0);
1738 } 1791 }
1740 { 1793 {
1741 /* simple blending of one texture, also opengl <1.3 path */ 1794 /* simple blending of one texture, also opengl <1.3 path */
1742 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1795 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1743 1796
1744 glBegin (GL_QUADS); 1797 glBegin (GL_QUADS);
1745 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1798 glTexCoord2f (0, 0); glVertex2f (0, 0);
1746 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1799 glTexCoord2f (0, t); glVertex2f (0, h);
1747 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1800 glTexCoord2f (s, t); glVertex2f (w, h);
1748 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1801 glTexCoord2f (s, 0); glVertex2f (w, 0);
1749 glEnd (); 1802 glEnd ();
1750 } 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 ();
1751 1848
1752 glPopMatrix (); 1849 glPopMatrix ();
1753 1850
1754 glDisable (GL_TEXTURE_2D); 1851 glDisable (GL_TEXTURE_2D);
1755 glDisable (GL_BLEND); 1852 glDisable (GL_BLEND);
1935 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1936 } 2033 }
1937} 2034}
1938 2035
1939SV * 2036SV *
1940map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1941 CODE: 2038 CODE:
1942{ 2039{
1943 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1944 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1945 mapcell *cell; 2042 mapcell *cell;
1966 2063
1967 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
1968 2065
1969 if (flags & 8) 2066 if (flags & 8)
1970 { 2067 {
2068 uint8_t ext, cmd;
2069
1971 if (extmap) 2070 do
1972 { 2071 {
1973 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
1974 2074
1975 do 2075 if (cmd < 4)
2076 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2077 else if (cmd == 5) // health
1976 { 2078 {
1977 ext = *data++;
1978 cmd = ext & 0x7f;
1979
1980 if (cmd < 4)
1981 cell->darkness = 255 - ext * 64 + 1;
1982 else if (cmd == 5) // health
1983 {
1984 cell->stat_width = 1; 2079 cell->stat_width = 1;
1985 cell->stat_hp = *data++; 2080 cell->stat_hp = *data++;
1986 }
1987 else if (cmd == 6) // monster width
1988 cell->stat_width = *data++ + 1;
1989 else if (cmd == 0x47)
1990 {
1991 if (*data == 1) cell->player = data [1];
1992 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
1993 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
1994 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
1995
1996 data += *data + 1;
1997 }
1998 else if (cmd == 8) // cell flags
1999 cell->flags = *data++;
2000 else if (ext & 0x40) // unknown, multibyte => skip
2001 data += *data + 1;
2002 else
2003 data++;
2004 } 2081 }
2005 while (ext & 0x80); 2082 else if (cmd == 6) // monster width
2083 cell->stat_width = *data++ + 1;
2084 else if (cmd == 0x47)
2085 {
2086 if (*data == 1) cell->player = data [1];
2087 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2088 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2089 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2090
2091 data += *data + 1;
2092 }
2093 else if (cmd == 8) // cell flags
2094 cell->flags = *data++;
2095 else if (ext & 0x40) // unknown, multibyte => skip
2096 data += *data + 1;
2097 else
2098 data++;
2006 } 2099 }
2007 else 2100 while (ext & 0x80);
2008 cell->darkness = *data++ + 1;
2009 } 2101 }
2010 2102
2011 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
2012 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
2013 { 2105 {
2061 ? self->row + y 2153 ? self->row + y
2062 : 0; 2154 : 0;
2063 2155
2064 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
2065 { 2157 {
2066 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
2067 2159
2068 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
2069 { 2161 {
2070 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
2071 2163
2073 { 2165 {
2074 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
2075 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
2076 int a1 = tex.a; 2168 int a1 = tex.a;
2077 2169
2078 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
2079 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
2080 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
2081 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
2082 } 2174 }
2083 } 2175 }
2084 2176
2085 *map++ = (r ) 2177 *map++ = (r )
2086 | (g << 8) 2178 | (g << 8)
2093} 2185}
2094 OUTPUT: 2186 OUTPUT:
2095 RETVAL 2187 RETVAL
2096 2188
2097void 2189void
2098draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2190draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2099 CODE: 2191 CODE:
2100{ 2192{
2101 int x, y, z; 2193 int x, y, z;
2102 2194
2103 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2107 int pl_x, pl_y; 2199 int pl_x, pl_y;
2108 maptex pl_tex; 2200 maptex pl_tex;
2109 rc_t *rc = rc_alloc (); 2201 rc_t *rc = rc_alloc ();
2110 rc_t *rc_ov = rc_alloc (); 2202 rc_t *rc_ov = rc_alloc ();
2111 rc_key_t key; 2203 rc_key_t key;
2112 rc_array_t *arr, *arr_hidden; 2204 rc_array_t *arr;
2113 2205
2114 pl_tex.name = 0; 2206 pl_tex.name = 0;
2115 2207
2116 // that's current max. sorry. 2208 // that's current max. sorry.
2117 if (sw > 255) sw = 255; 2209 if (sw > 255) sw = 255;
2154 } 2246 }
2155 2247
2156 glEnable (GL_BLEND); 2248 glEnable (GL_BLEND);
2157 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2249 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2158 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2250 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
2159
2160 key.texname = self->tex [TEXID_HIDDEN].name;
2161 arr_hidden = rc_array (rc_ov, &key);
2162 2251
2163 for (z = 0; z <= 2; z++) 2252 for (z = 0; z <= 2; z++)
2164 { 2253 {
2165 memset (smooth_level, 0, sizeof (smooth_level)); 2254 memset (smooth_level, 0, sizeof (smooth_level));
2166 key.texname = -1; 2255 key.texname = -1;
2190 2279
2191 key.texname = tex.name; 2280 key.texname = tex.name;
2192 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
2193 } 2282 }
2194 2283
2195 px = (x + 1) * T - tex.w; 2284 px = (x + 1) * Th - tex.w;
2196 py = (y + 1) * T - tex.h; 2285 py = (y + 1) * Tw - tex.h;
2197 2286
2198 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2199 { 2288 {
2200 pl_x = px; 2289 pl_x = px;
2201 pl_y = py; 2290 pl_y = py;
2246 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2335 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400);
2247 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800); 2336 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2248 } 2337 }
2249 } 2338 }
2250 2339
2251 if (expect_false (z == 2)) 2340 if (expect_false (z == 2) && expect_false (cell->flags))
2252 { 2341 {
2253 /* draw question marks on top of hidden spaces */ 2342 // overlays such as the speech bubble, probably more to come
2254 if (!cell->darkness) 2343 if (cell->flags & 1)
2255 { 2344 {
2256 maptex tex = self->tex [TEXID_HIDDEN];
2257 int px = (x + 1) * T - tex.w;
2258 int py = (y + 1) * T - tex.h;
2259
2260 rc_t2f_v3f (arr_hidden, 0 , 0 , px , py , 0);
2261 rc_t2f_v3f (arr_hidden, 0 , tex.t, px , py + tex.h, 0);
2262 rc_t2f_v3f (arr_hidden, tex.s, tex.t, px + tex.w, py + tex.h, 0);
2263 rc_t2f_v3f (arr_hidden, tex.s, 0 , px + tex.w, py , 0);
2264 }
2265
2266 if (expect_false (cell->flags))
2267 {
2268 // overlays such as the speech bubble, probably more to come
2269 if (cell->flags & 1)
2270 {
2271 rc_key_t key_ov = key; 2345 rc_key_t key_ov = key;
2272 maptex tex = self->tex [TEXID_SPEECH]; 2346 maptex tex = self->tex [TEXID_SPEECH];
2273 rc_array_t *arr; 2347 rc_array_t *arr;
2274 int px = x * T + T * 2 / 32; 2348 int px = x * Tw + Tw * 2 / 32;
2275 int py = y * T - T * 6 / 32; 2349 int py = y * Th - Th * 6 / 32;
2276 2350
2277 key_ov.texname = tex.name; 2351 key_ov.texname = tex.name;
2278 arr = rc_array (rc_ov, &key_ov); 2352 arr = rc_array (rc_ov, &key_ov);
2279 2353
2280 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2281 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2355 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2282 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2356 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2283 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2284 }
2285 } 2358 }
2286 } 2359 }
2287 } 2360 }
2288 } 2361 }
2289 2362
2316 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2317 && skey->level == level 2390 && skey->level == level
2318 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2319 { 2392 {
2320 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2321 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2322 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2323 int border = bits & 15; 2396 int border = bits & 15;
2324 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2325 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2326 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2327 2400
2340 2413
2341 if (border) 2414 if (border)
2342 { 2415 {
2343 float ox = border * dx; 2416 float ox = border * dx;
2344 2417
2345 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2346 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2347 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2348 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2349 } 2422 }
2350 2423
2351 if (corner) 2424 if (corner)
2352 { 2425 {
2353 float ox = corner * dx; 2426 float ox = corner * dx;
2354 2427
2355 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2356 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2357 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2358 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2359 } 2432 }
2360 } 2433 }
2361 } 2434 }
2362 } 2435 }
2363 } 2436 }
2404 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2405 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2406 { 2479 {
2407 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2408 2481
2409 int px = x * T; 2482 int px = x * Tw;
2410 int py = y * T; 2483 int py = y * Th;
2411 2484
2412 if (expect_false (cell->player == player)) 2485 if (expect_false (cell->player == player))
2413 { 2486 {
2414 px += sdx; 2487 px += sdx;
2415 py += sdy; 2488 py += sdy;
2416 } 2489 }
2417 2490
2418 if (cell->stat_hp) 2491 if (cell->stat_hp)
2419 { 2492 {
2420 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2421 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2422 2495
2423 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2424 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2425 px + width - 1, py); 2498 px + width - 1, py);
2426 2499
2463 int x, y; 2536 int x, y;
2464 2537
2465 glEnable (GL_TEXTURE_2D); 2538 glEnable (GL_TEXTURE_2D);
2466 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2539 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2467 * but the nvidia driver (185.18.14) mishandles alpha textures 2540 * but the nvidia driver (185.18.14) mishandles alpha textures
2468 * ansd takes the colour from god knows where instead of using 2541 * and takes the colour from god knows where instead of using
2469 * Cp. MODULATE results in the same colour, but slightly different 2542 * Cp. MODULATE results in the same colour, but slightly different
2470 * alpha, but atcually gives us the correct colour with nvidia. 2543 * alpha, but atcually gives us the correct colour with nvidia.
2471 */ 2544 */
2472 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2545 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2473 glEnable (GL_BLEND); 2546 glEnable (GL_BLEND);
2502void 2575void
2503fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2576fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2504 PPCODE: 2577 PPCODE:
2505{ 2578{
2506 int x, y; 2579 int x, y;
2507 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2508 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2509 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2510 int sw34 = (sw * 3 + 3) & ~3; 2583 int sw3 = sw * 3;
2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2511 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2512 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2587 memset (darkness1, 0, sw1*sh1);
2513 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2514 2588
2515 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2516 SvCUR_set (darkness3_sv, sw34 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2517 2591
2518 mx += self->x - 1; 2592 mx += self->x - 1;
2519 my += self->y - 1; 2593 my += self->y - 1;
2520
2521 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2522 2594
2523 for (y = 0; y < sh1; y++) 2595 for (y = 0; y < sh1; y++)
2524 if (0 <= y + my && y + my < self->rows) 2596 if (0 <= y + my && y + my < self->rows)
2525 { 2597 {
2526 maprow *row = self->row + (y + my); 2598 maprow *row = self->row + (y + my);
2559 2631
2560 uint8_t r13 = (d13 + d23 + d12) / 3; 2632 uint8_t r13 = (d13 + d23 + d12) / 3;
2561 uint8_t r23 = d23; 2633 uint8_t r23 = d23;
2562 uint8_t r33 = (d23 + d33 + d32) / 3; 2634 uint8_t r33 = (d23 + d33 + d32) / 3;
2563 2635
2564 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2636 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2565 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2637 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2566 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2638 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2567 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2639 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2568 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2640 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 1)] = MAX (d22, r22); /* this MUST be == d22 */
2569 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 2)] = MAX (d22, r32); 2641 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2570 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2642 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2571 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2643 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2572 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2644 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2573 } 2645 }
2574 2646
2575 free (darkness1); 2647 free (darkness1);
2576 2648
2577 EXTEND (SP, 3); 2649 EXTEND (SP, 3);
2578 PUSHs (sv_2mortal (newSViv (sw34))); 2650 PUSHs (sv_2mortal (newSViv (sw3)));
2579 PUSHs (sv_2mortal (newSViv (sh3))); 2651 PUSHs (sv_2mortal (newSViv (sh3)));
2580 PUSHs (darkness3_sv); 2652 PUSHs (darkness3_sv);
2581} 2653}
2582 2654
2583SV * 2655SV *
2781 if (RETVAL < 0) 2853 if (RETVAL < 0)
2782 { 2854 {
2783 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2784 2856
2785 if (RETVAL < 0) 2857 if (RETVAL < 0)
2858 {
2859 // happens sometimes, maybe it just stopped playing(?)
2860 RETVAL = Mix_GroupAvailable (-1);
2861
2862 if (RETVAL < 0)
2786 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2787 2864 }
2865 else
2788 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2789 } 2867 }
2790 2868
2791 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2792 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2793} 2871}
2852 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2853 2931
2854MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2855 2933
2856PROTOTYPES: DISABLE 2934PROTOTYPES: DISABLE
2935
2936void
2937decoders ()
2938 PPCODE:
2939#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2940 int i, num = Mix_GetNumChunkDecoders ();
2941 EXTEND (SP, num);
2942 for (i = 0; i < num; ++i)
2943 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2944#else
2945 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2946#endif
2857 2947
2858DC::MixChunk 2948DC::MixChunk
2859new (SV *class, DC::RW rwops) 2949new (SV *class, DC::RW rwops)
2860 CODE: 2950 CODE:
2861 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2894 OUTPUT: 2984 OUTPUT:
2895 RETVAL 2985 RETVAL
2896 2986
2897MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2898 2988
2989void
2990decoders ()
2991 PPCODE:
2992#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2993 int i, num = Mix_GetNumMusicDecoders ();
2994 EXTEND (SP, num);
2995 for (i = 0; i < num; ++i)
2996 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2997#else
2998 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2999#endif
3000
2899int 3001int
2900volume (int volume = -1) 3002volume (int volume = -1)
2901 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2902 CODE: 3004 CODE:
2903 if (items > 0) 3005 if (items > 0)
2913 3015
2914void 3016void
2915halt () 3017halt ()
2916 CODE: 3018 CODE:
2917 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
2918 3027
2919DC::MixMusic 3028DC::MixMusic
2920new (SV *class, DC::RW rwops) 3029new (SV *class, DC::RW rwops)
2921 CODE: 3030 CODE:
2922 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
3062 const_iv (GL_FUNC_SUBTRACT), 3171 const_iv (GL_FUNC_SUBTRACT),
3063 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3064# undef const_iv 3173# undef const_iv
3065 }; 3174 };
3066 3175
3067 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3176 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3068 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3069 3178
3070 texture_av = newAV (); 3179 texture_av = newAV ();
3071 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
3072} 3181}
3073 3182
3116 RETVAL 3225 RETVAL
3117 3226
3118int glGetError () 3227int glGetError ()
3119 3228
3120void glFinish () 3229void glFinish ()
3230
3231void glFlush ()
3121 3232
3122void glClear (int mask) 3233void glClear (int mask)
3123 3234
3124void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
3125 PROTOTYPE: @ 3236 PROTOTYPE: @
3296void glNewList (int list, int mode = GL_COMPILE) 3407void glNewList (int list, int mode = GL_COMPILE)
3297 3408
3298void glEndList () 3409void glEndList ()
3299 3410
3300void glCallList (int list) 3411void glCallList (int list)
3412
3413void c_init ()
3414 CODE:
3415 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3416 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3301 3417
3302MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3418MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3303 3419
3304PROTOTYPES: DISABLE 3420PROTOTYPES: DISABLE
3305 3421

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines