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.308 by root, Fri Jul 29 08:35:35 2011 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{
458 ev.code = 1; 479 ev.code = 1;
459 ev.data1 = (void *)(long)channel; 480 ev.data1 = (void *)(long)channel;
460 ev.data2 = 0; 481 ev.data2 = 0;
461 482
462 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
484}
485
486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
463} 490}
464 491
465static unsigned int 492static unsigned int
466minpot (unsigned int n) 493minpot (unsigned int n)
467{ 494{
794 821
795 const_iv (FOW_DARKNESS) 822 const_iv (FOW_DARKNESS)
796# undef const_iv 823# undef const_iv
797 }; 824 };
798 825
799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 826 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 827 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 828
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 829 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 830 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 831}
805 832
821NV ceil (NV x) 848NV ceil (NV x)
822 849
823IV minpot (UV n) 850IV minpot (UV n)
824 851
825IV popcount (UV n) 852IV popcount (UV n)
853
854NV distance (NV dx, NV dy)
855 CODE:
856 RETVAL = pow (dx * dx + dy * dy, 0.5);
857 OUTPUT:
858 RETVAL
826 859
827void 860void
828pango_init () 861pango_init ()
829 CODE: 862 CODE:
830{ 863{
922 955
923 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra"); 956 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
924#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 957#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
925#include "glfunc.h" 958#include "glfunc.h"
926#undef GL_FUNC 959#undef GL_FUNC
960
961 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
962 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
927 } 963 }
928} 964}
929 OUTPUT: 965 OUTPUT:
930 RETVAL 966 RETVAL
931 967
1016 1052
1017 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1053 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1018 } 1054 }
1019} 1055}
1020 1056
1057char *
1058SDL_AudioDriverName ()
1059 CODE:
1060{
1061 char buf [256];
1062 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1063 XSRETURN_UNDEF;
1064
1065 RETVAL = buf;
1066}
1067 OUTPUT:
1068 RETVAL
1069
1021int 1070int
1022Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1071Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1023 POSTCALL: 1072 POSTCALL:
1024 Mix_HookMusicFinished (music_finished); 1073 Mix_HookMusicFinished (music_finished);
1025 Mix_ChannelFinished (channel_finished); 1074 Mix_ChannelFinished (channel_finished);
1087add_font (char *file) 1136add_font (char *file)
1088 CODE: 1137 CODE:
1089 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1138 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1090 OUTPUT: 1139 OUTPUT:
1091 RETVAL 1140 RETVAL
1141
1142void
1143IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1092 1144
1093void 1145void
1094load_image_inline (SV *image_) 1146load_image_inline (SV *image_)
1095 ALIAS: 1147 ALIAS:
1096 load_image_file = 1 1148 load_image_file = 1
1660 glDisable (GL_BLEND); 1712 glDisable (GL_BLEND);
1661 } 1713 }
1662} 1714}
1663 1715
1664void 1716void
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) 1717draw_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: @ 1718 PROTOTYPE: @
1667 CODE: 1719 CODE:
1668{ 1720{
1721 glEnable (GL_BLEND);
1722 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1669 glEnable (GL_TEXTURE_2D); 1723 glEnable (GL_TEXTURE_2D);
1670 glEnable (GL_BLEND);
1671 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1672 glBindTexture (GL_TEXTURE_2D, name1); 1724 glBindTexture (GL_TEXTURE_2D, name1);
1673 1725
1674 glColor3f (intensity, intensity, intensity); 1726 glColor3f (intensity, intensity, intensity);
1675 glPushMatrix (); 1727 glPushMatrix ();
1676 glScalef (1./3, 1./3, 1.); 1728 glScalef (1./3, 1./3, 1.);
1677 1729
1678 if (blend > 0.f) 1730 if (blend > 0.f)
1679 { 1731 {
1680 float S2, T2; /* 0. 0. for texture 2 */ 1732 float dx3 = dx * -3.f / w;
1681 float w = w1 > w2 ? w1 : w2; 1733 float dy3 = dy * -3.f / h;
1682 float h = h1 > h2 ? h1 : h2;
1683 GLfloat env_color[4] = { 0., 0., 0., blend }; 1734 GLfloat env_color[4] = { 0., 0., 0., blend };
1684 1735
1685 /* interpolate the two shadow textures */ 1736 /* interpolate the two shadow textures */
1686 /* stage 0 == rgb(glcolor) + alpha(t0) */ 1737 /* stage 0 == rgb(glcolor) + alpha(t0) */
1687 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1738 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1692 glBindTexture (GL_TEXTURE_2D, name2); 1743 glBindTexture (GL_TEXTURE_2D, name2);
1693 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1744 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1694 1745
1695 /* rgb == rgb(glcolor) */ 1746 /* rgb == rgb(glcolor) */
1696 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1747 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1697 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1748 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1749 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1699 1750
1700 /* alpha = interpolate t0, t1 by env_alpha */ 1751 /* alpha = interpolate t0, t1 by env_alpha */
1701 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1752 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1702 1753
1708 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA); 1759 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND1_ALPHA, GL_SRC_ALPHA);
1709 1760
1710 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT); 1761 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE2_ALPHA, GL_CONSTANT);
1711 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA); 1762 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND2_ALPHA, GL_SRC_ALPHA);
1712 1763
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); 1764 glBegin (GL_QUADS);
1725 gl.MultiTexCoord2f (GL_TEXTURE0, 0, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx , dy ); glVertex2f ( 0, 0); 1765 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); 1766 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); 1767 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); 1768 gl.MultiTexCoord2f (GL_TEXTURE0, s, 0); gl.MultiTexCoord2f (GL_TEXTURE1, dx3 + s, dy3 ); glVertex2i (w, 0);
1729 glEnd (); 1769 glEnd ();
1730 1770
1731 glDisable (GL_TEXTURE_2D); 1771 glDisable (GL_TEXTURE_2D);
1732 gl.ActiveTexture (GL_TEXTURE0); 1772 gl.ActiveTexture (GL_TEXTURE0);
1733 } 1773 }
1735 { 1775 {
1736 /* simple blending of one texture, also opengl <1.3 path */ 1776 /* simple blending of one texture, also opengl <1.3 path */
1737 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 1777 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
1738 1778
1739 glBegin (GL_QUADS); 1779 glBegin (GL_QUADS);
1740 glTexCoord2f ( 0, 0); glVertex2f ( 0, 0); 1780 glTexCoord2f (0, 0); glVertex2f (0, 0);
1741 glTexCoord2f ( 0, t1); glVertex2f ( 0, h1); 1781 glTexCoord2f (0, t); glVertex2f (0, h);
1742 glTexCoord2f (s1, t1); glVertex2f (w1, h1); 1782 glTexCoord2f (s, t); glVertex2f (w, h);
1743 glTexCoord2f (s1, 0); glVertex2f (w1, 0); 1783 glTexCoord2f (s, 0); glVertex2f (w, 0);
1744 glEnd (); 1784 glEnd ();
1745 } 1785 }
1786
1787 /* draw ?-marks or equivalent, this is very clumsy code :/ */
1788 {
1789 int x, y;
1790 int dx3 = dx * 3;
1791 int dy3 = dy * 3;
1792
1793 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
1794 glBindTexture (GL_TEXTURE_2D, hidden_tex);
1795 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
1796 glTranslatef (-1., -1., 0);
1797 glBegin (GL_QUADS);
1798
1799 for (y = 1; y < h; y += 3)
1800 {
1801 int y1 = y - dy3;
1802 int y1valid = y1 >= 0 && y1 < h;
1803
1804 for (x = 1; x < w; x += 3)
1805 {
1806 int x1 = x - dx3;
1807 uint8_t h1 = data1 [x + y * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1808 uint8_t h2;
1809
1810 if (y1valid && x1 >= 0 && x1 < w)
1811 h2 = data2 [x1 + y1 * w] == DARKNESS_ADJUST (255 - FOW_DARKNESS);
1812 else
1813 h2 = 1; /* out of range == invisible */
1814
1815 if (h1 || h2)
1816 {
1817 float alpha = h1 == h2 ? 1.f : h1 ? 1.f - blend : blend;
1818 glColor4f (1., 1., 1., alpha);
1819
1820 glTexCoord2f (0, 0.); glVertex2i (x , y );
1821 glTexCoord2f (0, 1.); glVertex2i (x , y + 3);
1822 glTexCoord2f (1, 1.); glVertex2i (x + 3, y + 3);
1823 glTexCoord2f (1, 0.); glVertex2i (x + 3, y );
1824 }
1825 }
1826 }
1827 }
1828
1829 glEnd ();
1746 1830
1747 glPopMatrix (); 1831 glPopMatrix ();
1748 1832
1749 glDisable (GL_TEXTURE_2D); 1833 glDisable (GL_TEXTURE_2D);
1750 glDisable (GL_BLEND); 1834 glDisable (GL_BLEND);
1971 { 2055 {
1972 ext = *data++; 2056 ext = *data++;
1973 cmd = ext & 0x7f; 2057 cmd = ext & 0x7f;
1974 2058
1975 if (cmd < 4) 2059 if (cmd < 4)
1976 cell->darkness = 255 - ext * 64 + 1; 2060 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
1977 else if (cmd == 5) // health 2061 else if (cmd == 5) // health
1978 { 2062 {
1979 cell->stat_width = 1; 2063 cell->stat_width = 1;
1980 cell->stat_hp = *data++; 2064 cell->stat_hp = *data++;
1981 } 2065 }
2056 ? self->row + y 2140 ? self->row + y
2057 : 0; 2141 : 0;
2058 2142
2059 for (x = x0; x < x1; x++) 2143 for (x = x0; x < x1; x++)
2060 { 2144 {
2061 int r = 32, g = 32, b = 32, a = 192; 2145 unsigned int r = 32, g = 32, b = 32, a = 192;
2062 2146
2063 if (row && row->c0 <= x && x < row->c1) 2147 if (row && row->c0 <= x && x < row->c1)
2064 { 2148 {
2065 mapcell *cell = row->col + (x - row->c0); 2149 mapcell *cell = row->col + (x - row->c0);
2066 2150
2068 { 2152 {
2069 maptex tex = self->tex [cell->tile [z]]; 2153 maptex tex = self->tex [cell->tile [z]];
2070 int a0 = 255 - tex.a; 2154 int a0 = 255 - tex.a;
2071 int a1 = tex.a; 2155 int a1 = tex.a;
2072 2156
2073 r = (r * a0 + tex.r * a1) / 255; 2157 r = div255 (r * a0 + tex.r * a1);
2074 g = (g * a0 + tex.g * a1) / 255; 2158 g = div255 (g * a0 + tex.g * a1);
2075 b = (b * a0 + tex.b * a1) / 255; 2159 b = div255 (b * a0 + tex.b * a1);
2076 a = (a * a0 + tex.a * a1) / 255; 2160 a = div255 (a * a0 + tex.a * a1);
2077 } 2161 }
2078 } 2162 }
2079 2163
2080 *map++ = (r ) 2164 *map++ = (r )
2081 | (g << 8) 2165 | (g << 8)
2088} 2172}
2089 OUTPUT: 2173 OUTPUT:
2090 RETVAL 2174 RETVAL
2091 2175
2092void 2176void
2093draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2177draw (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: 2178 CODE:
2095{ 2179{
2096 int x, y, z; 2180 int x, y, z;
2097 2181
2098 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2182 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2102 int pl_x, pl_y; 2186 int pl_x, pl_y;
2103 maptex pl_tex; 2187 maptex pl_tex;
2104 rc_t *rc = rc_alloc (); 2188 rc_t *rc = rc_alloc ();
2105 rc_t *rc_ov = rc_alloc (); 2189 rc_t *rc_ov = rc_alloc ();
2106 rc_key_t key; 2190 rc_key_t key;
2107 rc_array_t *arr, *arr_hidden; 2191 rc_array_t *arr;
2108 2192
2109 pl_tex.name = 0; 2193 pl_tex.name = 0;
2110 2194
2111 // that's current max. sorry. 2195 // that's current max. sorry.
2112 if (sw > 255) sw = 255; 2196 if (sw > 255) sw = 255;
2149 } 2233 }
2150 2234
2151 glEnable (GL_BLEND); 2235 glEnable (GL_BLEND);
2152 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); 2236 glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
2153 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); 2237 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 2238
2158 for (z = 0; z <= 2; z++) 2239 for (z = 0; z <= 2; z++)
2159 { 2240 {
2160 memset (smooth_level, 0, sizeof (smooth_level)); 2241 memset (smooth_level, 0, sizeof (smooth_level));
2161 key.texname = -1; 2242 key.texname = -1;
2185 2266
2186 key.texname = tex.name; 2267 key.texname = tex.name;
2187 arr = rc_array (rc, &key); 2268 arr = rc_array (rc, &key);
2188 } 2269 }
2189 2270
2190 px = (x + 1) * T - tex.w; 2271 px = (x + 1) * Th - tex.w;
2191 py = (y + 1) * T - tex.h; 2272 py = (y + 1) * Tw - tex.h;
2192 2273
2193 if (expect_false (cell->player == player) && expect_false (z == 2)) 2274 if (expect_false (cell->player == player) && expect_false (z == 2))
2194 { 2275 {
2195 pl_x = px; 2276 pl_x = px;
2196 pl_y = py; 2277 pl_y = py;
2241 skey.x = x ; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0400); 2322 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); 2323 skey.x = x + 2; skey.y = y ; smooth_or_bits (smooth, &skey, 0x0800);
2243 } 2324 }
2244 } 2325 }
2245 2326
2246 if (expect_false (z == 2)) 2327 if (expect_false (z == 2) && expect_false (cell->flags))
2247 { 2328 {
2248 /* draw question marks on top of hidden spaces */ 2329 // overlays such as the speech bubble, probably more to come
2249 if (!cell->darkness) 2330 if (cell->flags & 1)
2250 { 2331 {
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; 2332 rc_key_t key_ov = key;
2267 maptex tex = self->tex [TEXID_SPEECH]; 2333 maptex tex = self->tex [TEXID_SPEECH];
2268 rc_array_t *arr; 2334 rc_array_t *arr;
2269 int px = x * T + T * 2 / 32; 2335 int px = x * Tw + Tw * 2 / 32;
2270 int py = y * T - T * 6 / 32; 2336 int py = y * Th - Th * 6 / 32;
2271 2337
2272 key_ov.texname = tex.name; 2338 key_ov.texname = tex.name;
2273 arr = rc_array (rc_ov, &key_ov); 2339 arr = rc_array (rc_ov, &key_ov);
2274 2340
2275 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2341 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2276 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2342 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); 2343 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); 2344 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2279 }
2280 } 2345 }
2281 } 2346 }
2282 } 2347 }
2283 } 2348 }
2284 2349
2311 if (!(bits & 0x1000) 2376 if (!(bits & 0x1000)
2312 && skey->level == level 2377 && skey->level == level
2313 && level > smooth_max [skey->x][skey->y]) 2378 && level > smooth_max [skey->x][skey->y])
2314 { 2379 {
2315 maptex tex = self->tex [skey->tile]; 2380 maptex tex = self->tex [skey->tile];
2316 int px = (((int)skey->x) - 1) * T; 2381 int px = (((int)skey->x) - 1) * Tw;
2317 int py = (((int)skey->y) - 1) * T; 2382 int py = (((int)skey->y) - 1) * Th;
2318 int border = bits & 15; 2383 int border = bits & 15;
2319 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2384 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2320 float dx = tex.s * .0625f; // 16 images/row 2385 float dx = tex.s * .0625f; // 16 images/row
2321 float dy = tex.t * .5f ; // 2 images/column 2386 float dy = tex.t * .5f ; // 2 images/column
2322 2387
2335 2400
2336 if (border) 2401 if (border)
2337 { 2402 {
2338 float ox = border * dx; 2403 float ox = border * dx;
2339 2404
2340 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2405 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2341 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2406 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2342 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2407 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2343 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2408 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2344 } 2409 }
2345 2410
2346 if (corner) 2411 if (corner)
2347 { 2412 {
2348 float ox = corner * dx; 2413 float ox = corner * dx;
2349 2414
2350 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2415 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2351 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2416 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2352 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2417 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2353 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2418 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2354 } 2419 }
2355 } 2420 }
2356 } 2421 }
2357 } 2422 }
2358 } 2423 }
2399 for (x = 0; x < sw; x++) 2464 for (x = 0; x < sw; x++)
2400 if (row->c0 <= x + mx && x + mx < row->c1) 2465 if (row->c0 <= x + mx && x + mx < row->c1)
2401 { 2466 {
2402 mapcell *cell = row->col + (x + mx - row->c0); 2467 mapcell *cell = row->col + (x + mx - row->c0);
2403 2468
2404 int px = x * T; 2469 int px = x * Tw;
2405 int py = y * T; 2470 int py = y * Th;
2406 2471
2407 if (expect_false (cell->player == player)) 2472 if (expect_false (cell->player == player))
2408 { 2473 {
2409 px += sdx; 2474 px += sdx;
2410 py += sdy; 2475 py += sdy;
2411 } 2476 }
2412 2477
2413 if (cell->stat_hp) 2478 if (cell->stat_hp)
2414 { 2479 {
2415 int width = cell->stat_width * T; 2480 int width = cell->stat_width * Tw;
2416 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2481 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2417 2482
2418 glColor3ub (0, 0, 0); 2483 glColor3ub (0, 0, 0);
2419 glRectf (px + 1, py - thick - 2, 2484 glRectf (px + 1, py - thick - 2,
2420 px + width - 1, py); 2485 px + width - 1, py);
2421 2486
2427 } 2492 }
2428 } 2493 }
2429} 2494}
2430 2495
2431void 2496void
2432draw_magicmap (DC::Map self, int dx, int dy, int w, int h, unsigned char *data) 2497draw_magicmap (DC::Map self, int w, int h, unsigned char *data)
2433 CODE: 2498 CODE:
2434{ 2499{
2435 static float color[16][3] = { 2500 static float color[16][3] = {
2436 { 0.00F, 0.00F, 0.00F }, 2501 { 0.00f, 0.00f, 0.00f },
2437 { 1.00F, 1.00F, 1.00F }, 2502 { 1.00f, 1.00f, 1.00f },
2438 { 0.00F, 0.00F, 0.55F }, 2503 { 0.00f, 0.00f, 0.55f },
2439 { 1.00F, 0.00F, 0.00F }, 2504 { 1.00f, 0.00f, 0.00f },
2440 2505
2441 { 1.00F, 0.54F, 0.00F }, 2506 { 1.00f, 0.54f, 0.00f },
2442 { 0.11F, 0.56F, 1.00F }, 2507 { 0.11f, 0.56f, 1.00f },
2443 { 0.93F, 0.46F, 0.00F }, 2508 { 0.93f, 0.46f, 0.00f },
2444 { 0.18F, 0.54F, 0.34F }, 2509 { 0.18f, 0.54f, 0.34f },
2445 2510
2446 { 0.56F, 0.73F, 0.56F }, 2511 { 0.56f, 0.73f, 0.56f },
2447 { 0.80F, 0.80F, 0.80F }, 2512 { 0.80f, 0.80f, 0.80f },
2448 { 0.55F, 0.41F, 0.13F }, 2513 { 0.55f, 0.41f, 0.13f },
2449 { 0.99F, 0.77F, 0.26F }, 2514 { 0.99f, 0.77f, 0.26f },
2450 2515
2451 { 0.74F, 0.65F, 0.41F }, 2516 { 0.74f, 0.65f, 0.41f },
2452 2517
2453 { 0.00F, 1.00F, 1.00F }, 2518 { 0.00f, 1.00f, 1.00f },
2454 { 1.00F, 0.00F, 1.00F }, 2519 { 1.00f, 0.00f, 1.00f },
2455 { 1.00F, 1.00F, 0.00F }, 2520 { 1.00f, 1.00f, 0.00f },
2456 }; 2521 };
2457 2522
2458 int x, y; 2523 int x, y;
2459 2524
2460 glEnable (GL_TEXTURE_2D); 2525 glEnable (GL_TEXTURE_2D);
2461 /* GL_REPLACE would be correct, as we don't need to modulate alpha, 2526 /* GL_REPLACE would be correct, as we don't need to modulate alpha,
2462 * but the nvidia driver (185.18.14) mishandles alpha textures 2527 * but the nvidia driver (185.18.14) mishandles alpha textures
2463 * ansd takes the colour from god knows where instead of using 2528 * and takes the colour from god knows where instead of using
2464 * Cp. MODULATE results in the same colour, but slightly different 2529 * Cp. MODULATE results in the same colour, but slightly different
2465 * alpha, but atcually gives us the correct colour with nvidia. 2530 * alpha, but atcually gives us the correct colour with nvidia.
2466 */ 2531 */
2467 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); 2532 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
2468 glEnable (GL_BLEND); 2533 glEnable (GL_BLEND);
2476 2541
2477 if (m) 2542 if (m)
2478 { 2543 {
2479 float *c = color [m & 15]; 2544 float *c = color [m & 15];
2480 2545
2481 float tx1 = m & 0x40 ? 0.5 : 0.; 2546 float tx1 = m & 0x40 ? 0.5f : 0.f;
2482 float tx2 = tx1 + 0.5; 2547 float tx2 = tx1 + 0.5f;
2483 2548
2484 glColor4f (c[0], c[1], c[2], 1); 2549 glColor4f (c[0], c[1], c[2], 1);
2485 glTexCoord2f (tx1, 0.); glVertex2i (x , y ); 2550 glTexCoord2f (tx1, 0.); glVertex2i (x , y );
2486 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1); 2551 glTexCoord2f (tx1, 1.); glVertex2i (x , y + 1);
2487 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1); 2552 glTexCoord2f (tx2, 1.); glVertex2i (x + 1, y + 1);
2497void 2562void
2498fow_texture (DC::Map self, int mx, int my, int sw, int sh) 2563fow_texture (DC::Map self, int mx, int my, int sw, int sh)
2499 PPCODE: 2564 PPCODE:
2500{ 2565{
2501 int x, y; 2566 int x, y;
2502 int sw1 = sw + 2; 2567 int sw1 = sw + 2;
2503 int sh1 = sh + 2; 2568 int sh1 = sh + 2;
2504 int sh3 = sh * 3; 2569 int sh3 = sh * 3;
2505 int sw34 = (sw * 3 + 3) & ~3; 2570 int sw3 = sw * 3;
2571 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2572 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2506 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1); 2573 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2507 SV *darkness3_sv = sv_2mortal (newSV (sw34 * sh3)); 2574 memset (darkness1, 0, sw1*sh1);
2508 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2509 2575
2510 SvPOK_only (darkness3_sv); 2576 SvPOK_only (darkness3_sv);
2511 SvCUR_set (darkness3_sv, sw34 * sh3); 2577 SvCUR_set (darkness3_sv, sw3 * sh3);
2512 2578
2513 mx += self->x - 1; 2579 mx += self->x - 1;
2514 my += self->y - 1; 2580 my += self->y - 1;
2515
2516 memset (darkness1, DARKNESS_ADJUST (255 - FOW_DARKNESS), sw1 * sh1);
2517 2581
2518 for (y = 0; y < sh1; y++) 2582 for (y = 0; y < sh1; y++)
2519 if (0 <= y + my && y + my < self->rows) 2583 if (0 <= y + my && y + my < self->rows)
2520 { 2584 {
2521 maprow *row = self->row + (y + my); 2585 maprow *row = self->row + (y + my);
2554 2618
2555 uint8_t r13 = (d13 + d23 + d12) / 3; 2619 uint8_t r13 = (d13 + d23 + d12) / 3;
2556 uint8_t r23 = d23; 2620 uint8_t r23 = d23;
2557 uint8_t r33 = (d23 + d33 + d32) / 3; 2621 uint8_t r33 = (d23 + d33 + d32) / 3;
2558 2622
2559 darkness3 [(y * 3 ) * sw34 + (x * 3 )] = MAX (d22, r11); 2623 darkness3 [(y * 3 ) * sw3 + (x * 3 )] = MAX (d22, r11);
2560 darkness3 [(y * 3 ) * sw34 + (x * 3 + 1)] = MAX (d22, r21); 2624 darkness3 [(y * 3 ) * sw3 + (x * 3 + 1)] = MAX (d22, r21);
2561 darkness3 [(y * 3 ) * sw34 + (x * 3 + 2)] = MAX (d22, r31); 2625 darkness3 [(y * 3 ) * sw3 + (x * 3 + 2)] = MAX (d22, r31);
2562 darkness3 [(y * 3 + 1) * sw34 + (x * 3 )] = MAX (d22, r12); 2626 darkness3 [(y * 3 + 1) * sw3 + (x * 3 )] = MAX (d22, r12);
2563 darkness3 [(y * 3 + 1) * sw34 + (x * 3 + 1)] = MAX (d22, r22); 2627 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); 2628 darkness3 [(y * 3 + 1) * sw3 + (x * 3 + 2)] = MAX (d22, r32);
2565 darkness3 [(y * 3 + 2) * sw34 + (x * 3 )] = MAX (d22, r13); 2629 darkness3 [(y * 3 + 2) * sw3 + (x * 3 )] = MAX (d22, r13);
2566 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 1)] = MAX (d22, r23); 2630 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 1)] = MAX (d22, r23);
2567 darkness3 [(y * 3 + 2) * sw34 + (x * 3 + 2)] = MAX (d22, r33); 2631 darkness3 [(y * 3 + 2) * sw3 + (x * 3 + 2)] = MAX (d22, r33);
2568 } 2632 }
2569 2633
2570 free (darkness1); 2634 free (darkness1);
2571 2635
2572 EXTEND (SP, 3); 2636 EXTEND (SP, 3);
2573 PUSHs (sv_2mortal (newSViv (sw34))); 2637 PUSHs (sv_2mortal (newSViv (sw3)));
2574 PUSHs (sv_2mortal (newSViv (sh3))); 2638 PUSHs (sv_2mortal (newSViv (sh3)));
2575 PUSHs (darkness3_sv); 2639 PUSHs (darkness3_sv);
2576} 2640}
2577 2641
2578SV * 2642SV *
2776 if (RETVAL < 0) 2840 if (RETVAL < 0)
2777 { 2841 {
2778 RETVAL = Mix_GroupOldest (-1); 2842 RETVAL = Mix_GroupOldest (-1);
2779 2843
2780 if (RETVAL < 0) 2844 if (RETVAL < 0)
2845 {
2846 // happens sometimes, maybe it just stopped playing(?)
2847 RETVAL = Mix_GroupAvailable (-1);
2848
2849 if (RETVAL < 0)
2781 XSRETURN_UNDEF; 2850 XSRETURN_UNDEF;
2782 2851 }
2852 else
2783 Mix_HaltChannel (RETVAL); 2853 Mix_HaltChannel (RETVAL);
2784 } 2854 }
2785 2855
2786 Mix_UnregisterAllEffects (RETVAL); 2856 Mix_UnregisterAllEffects (RETVAL);
2787 Mix_Volume (RETVAL, 128); 2857 Mix_Volume (RETVAL, 128);
2788} 2858}
2835void 2905void
2836set_position_r (DC::Channel self, int dx, int dy, int maxdistance) 2906set_position_r (DC::Channel self, int dx, int dy, int maxdistance)
2837 CODE: 2907 CODE:
2838{ 2908{
2839 int distance = sqrtf (dx * dx + dy * dy) * (255.f / sqrtf (maxdistance * maxdistance)); 2909 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); 2910 int angle = atan2f (dx, -dy) * 180.f / (float)M_PI + 360.f;
2841 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255)); 2911 Mix_SetPosition (self, angle, CLAMP (distance, 0, 255));
2842} 2912}
2843 2913
2844void 2914void
2845set_reverse_stereo (DC::Channel self, int flip) 2915set_reverse_stereo (DC::Channel self, int flip)
2847 Mix_SetReverseStereo (self, flip); 2917 Mix_SetReverseStereo (self, flip);
2848 2918
2849MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2919MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2850 2920
2851PROTOTYPES: DISABLE 2921PROTOTYPES: DISABLE
2922
2923void
2924decoders ()
2925 PPCODE:
2926#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2927 int i, num = Mix_GetNumChunkDecoders ();
2928 EXTEND (SP, num);
2929 for (i = 0; i < num; ++i)
2930 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2931#else
2932 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2933#endif
2852 2934
2853DC::MixChunk 2935DC::MixChunk
2854new (SV *class, DC::RW rwops) 2936new (SV *class, DC::RW rwops)
2855 CODE: 2937 CODE:
2856 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2938 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2889 OUTPUT: 2971 OUTPUT:
2890 RETVAL 2972 RETVAL
2891 2973
2892MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2974MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2893 2975
2976void
2977decoders ()
2978 PPCODE:
2979#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2980 int i, num = Mix_GetNumMusicDecoders ();
2981 EXTEND (SP, num);
2982 for (i = 0; i < num; ++i)
2983 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
2984#else
2985 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2986#endif
2987
2894int 2988int
2895volume (int volume = -1) 2989volume (int volume = -1)
2896 PROTOTYPE: ;$ 2990 PROTOTYPE: ;$
2897 CODE: 2991 CODE:
2898 if (items > 0) 2992 if (items > 0)
2908 3002
2909void 3003void
2910halt () 3004halt ()
2911 CODE: 3005 CODE:
2912 Mix_HaltMusic (); 3006 Mix_HaltMusic ();
3007
3008int
3009playing ()
3010 CODE:
3011 RETVAL = Mix_PlayingMusic ();
3012 OUTPUT:
3013 RETVAL
2913 3014
2914DC::MixMusic 3015DC::MixMusic
2915new (SV *class, DC::RW rwops) 3016new (SV *class, DC::RW rwops)
2916 CODE: 3017 CODE:
2917 RETVAL = Mix_LoadMUS_RW (rwops); 3018 RETVAL = Mix_LoadMUS_RW (rwops);
3057 const_iv (GL_FUNC_SUBTRACT), 3158 const_iv (GL_FUNC_SUBTRACT),
3058 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3159 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3059# undef const_iv 3160# undef const_iv
3060 }; 3161 };
3061 3162
3062 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3163 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3063 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3164 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3064 3165
3065 texture_av = newAV (); 3166 texture_av = newAV ();
3066 AvREAL_off (texture_av); 3167 AvREAL_off (texture_av);
3067} 3168}
3068 3169
3111 RETVAL 3212 RETVAL
3112 3213
3113int glGetError () 3214int glGetError ()
3114 3215
3115void glFinish () 3216void glFinish ()
3217
3218void glFlush ()
3116 3219
3117void glClear (int mask) 3220void glClear (int mask)
3118 3221
3119void glClearColor (float r, float g, float b, float a = 1.0) 3222void glClearColor (float r, float g, float b, float a = 1.0)
3120 PROTOTYPE: @ 3223 PROTOTYPE: @
3291void glNewList (int list, int mode = GL_COMPILE) 3394void glNewList (int list, int mode = GL_COMPILE)
3292 3395
3293void glEndList () 3396void glEndList ()
3294 3397
3295void glCallList (int list) 3398void glCallList (int list)
3399
3400void c_init ()
3401 CODE:
3402 glPixelStorei (GL_PACK_ALIGNMENT , 1);
3403 glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
3296 3404
3297MODULE = Deliantra::Client PACKAGE = DC::UI::Base 3405MODULE = Deliantra::Client PACKAGE = DC::UI::Base
3298 3406
3299PROTOTYPES: DISABLE 3407PROTOTYPES: DISABLE
3300 3408

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines