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.297 by root, Tue Dec 22 00:08:11 2009 UTC vs.
Revision 1.321 by root, Sun Nov 18 01:15:04 2018 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
51#include <glib/gmacros.h> 53#include <glib.h>
52 54
53#include <pango/pango.h> 55#include <pango/pango.h>
54 56
55#ifndef PANGO_VERSION_CHECK 57#ifndef PANGO_VERSION_CHECK
56# define PANGO_VERSION_CHECK(a,b,c) 0 58# define PANGO_VERSION_CHECK(a,b,c) 0
98#define KMOD_LRAM 0x10000 // our extension 100#define KMOD_LRAM 0x10000 // our extension
99 101
100#define TEXID_SPEECH 1 102#define TEXID_SPEECH 1
101#define TEXID_NOFACE 2 103#define TEXID_NOFACE 2
102 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}
123
103static AV *texture_av; 124static AV *texture_av;
104 125
105static struct 126static struct
106{ 127{
107#define GL_FUNC(ptr,name) ptr name; 128#define GL_FUNC(ptr,name) ptr name;
163{ 184{
164 GSList *attrs = run->item->analysis.extra_attrs; 185 GSList *attrs = run->item->analysis.extra_attrs;
165 186
166 while (attrs) 187 while (attrs)
167 { 188 {
168 PangoAttribute *attr = attrs->data; 189 PangoAttribute *attr = (PangoAttribute *)attrs->data;
169 190
170 if (attr->klass->type == PANGO_ATTR_SHAPE) 191 if (attr->klass->type == PANGO_ATTR_SHAPE)
171 return 1; 192 return 1;
172 193
173 attrs = attrs->next; 194 attrs = attrs->next;
191static void 212static void
192substitute_func (FcPattern *pattern, gpointer data) 213substitute_func (FcPattern *pattern, gpointer data)
193{ 214{
194 FcPatternAddBool (pattern, FC_HINTING, 1); 215 FcPatternAddBool (pattern, FC_HINTING, 1);
195#ifdef FC_HINT_STYLE 216#ifdef FC_HINT_STYLE
196 FcPatternAddBool (pattern, FC_HINT_STYLE, FC_HINT_FULL); 217 FcPatternAddInteger (pattern, FC_HINT_STYLE, FC_HINT_FULL);
197#endif 218#endif
198 FcPatternAddBool (pattern, FC_AUTOHINT, 0); 219 FcPatternAddBool (pattern, FC_AUTOHINT, 0);
199} 220}
200 221
201static void 222static void
460 ev.data2 = 0; 481 ev.data2 = 0;
461 482
462 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
463} 484}
464 485
486// approximately divide by 255
487static unsigned int
488div255 (unsigned int n)
489{
490 return (n + (n >> 8)) >> 8;
491}
492
465static unsigned int 493static unsigned int
466minpot (unsigned int n) 494minpot (unsigned int n)
467{ 495{
468 if (!n) 496 if (!n)
469 return 0; 497 return 0;
550 578
551 return mod; 579 return mod;
552} 580}
553 581
554static void 582static void
555deliantra_main () 583deliantra_main (SV *real_main)
556{ 584{
557 char *argv[] = { 0 }; 585 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 586
587 PUSHMARK (SP);
588 call_sv (real_main, G_DISCARD | G_VOID);
559} 589}
560 590
561#ifdef __MACOSX__ 591#ifdef __MACOSX__
592 static SV *real_main;
593
562 /* to due surprising braindamage on the side of SDL design, we 594 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 595 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which, 596 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 597 * due to shared library magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back. 598 * and which calls our main (== SDL_main) back.
567 */ 599 */
568 extern C_LINKAGE int 600 extern C_LINKAGE int
569 main (int argc, char *argv[]) 601 main (int argc, char *argv[])
570 { 602 {
571 deliantra_main (); 603 deliantra_main (real_main);
572 } 604 }
573 605
574 #undef main 606 #undef main
575 607
576 extern C_LINKAGE int main (int argc, char *argv[]); 608 extern C_LINKAGE int main (int argc, char *argv[]);
577 609
578 static void 610 static void
579 SDL_braino (void) 611 SDL_main_hack (SV *real_main_)
580 { 612 {
613 real_main = real_main_;
614
581 char *argv[] = { "deliantra client", 0 }; 615 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 616 (main) (1, argv);
583 } 617 }
584#else 618#else
585 static void 619 static void
586 SDL_braino (void) 620 SDL_main_hack (SV *real_main)
587 { 621 {
588 deliantra_main (); 622 deliantra_main (real_main);
589 } 623 }
590#endif 624#endif
591 625
592MODULE = Deliantra::Client PACKAGE = DC 626MODULE = Deliantra::Client PACKAGE = DC
593 627
794 828
795 const_iv (FOW_DARKNESS) 829 const_iv (FOW_DARKNESS)
796# undef const_iv 830# undef const_iv
797 }; 831 };
798 832
799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 833 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 834 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 835
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 836 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 837 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 838}
805 839
844#endif 878#endif
845} 879}
846 880
847char *SDL_GetError () 881char *SDL_GetError ()
848 882
849void SDL_braino () 883void SDL_main_hack (SV *real_main)
884 PROTOTYPE: &
850 885
851int SDL_Init (U32 flags) 886int SDL_Init (U32 flags)
852 887
853int SDL_InitSubSystem (U32 flags) 888int SDL_InitSubSystem (U32 flags)
854 889
855void SDL_QuitSubSystem (U32 flags) 890void SDL_QuitSubSystem (U32 flags)
856 891
857void SDL_Quit () 892void SDL_Quit ()
858 893
859int SDL_GL_SetAttribute (int attr, int value) 894int SDL_GL_SetAttribute (int attr, int value)
895 C_ARGS: (SDL_GLattr)attr, value
860 896
861int SDL_GL_GetAttribute (int attr) 897int SDL_GL_GetAttribute (int attr)
862 CODE: 898 CODE:
863 if (SDL_GL_GetAttribute (attr, &RETVAL)) 899 if (SDL_GL_GetAttribute ((SDL_GLattr)attr, &RETVAL))
864 XSRETURN_UNDEF; 900 XSRETURN_UNDEF;
865 OUTPUT: 901 OUTPUT:
866 RETVAL 902 RETVAL
867 903
868void 904void
923 ); 959 );
924 960
925 if (RETVAL) 961 if (RETVAL)
926 { 962 {
927 av_clear (texture_av); 963 av_clear (texture_av);
928
929 SDL_WM_SetCaption ("Deliantra MORPG Client " VERSION, "Deliantra");
930#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name); 964#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
931#include "glfunc.h" 965#include "glfunc.h"
932#undef GL_FUNC 966#undef GL_FUNC
967 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
968 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
933 } 969 }
934} 970}
935 OUTPUT: 971 OUTPUT:
936 RETVAL 972 RETVAL
973
974void
975SDL_WM_SetCaption (const char *title, const char *icon)
937 976
938void 977void
939SDL_GL_SwapBuffers () 978SDL_GL_SwapBuffers ()
940 979
941char * 980char *
942SDL_GetKeyName (int sym) 981SDL_GetKeyName (int sym)
982 C_ARGS: (SDLKey)sym
943 983
944int 984int
945SDL_GetAppState () 985SDL_GetAppState ()
946 986
947int 987int
948SDL_GetModState () 988SDL_GetModState ()
949 989
990int
991SDL_WaitEvent ()
992 C_ARGS: 0
993
950void 994void
995SDL_PumpEvents ()
996
997void
951poll_events () 998peep_events ()
952 PPCODE: 999 PPCODE:
953{ 1000{
954 SDL_Event ev; 1001 SDL_Event ev;
955 1002
956 SDL_PumpEvents (); 1003 SDL_PumpEvents ();
1022 1069
1023 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1)))); 1070 XPUSHs (sv_2mortal (sv_bless (newRV_noinc ((SV *)hv), gv_stashpv ("DC::UI::Event", 1))));
1024 } 1071 }
1025} 1072}
1026 1073
1074char *
1075SDL_AudioDriverName ()
1076 CODE:
1077{
1078 char buf [256];
1079 if (!SDL_AudioDriverName (buf, sizeof (buf)))
1080 XSRETURN_UNDEF;
1081
1082 RETVAL = buf;
1083}
1084 OUTPUT:
1085 RETVAL
1086
1027int 1087int
1028Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096) 1088Mix_OpenAudio (int frequency = 44100, int format = MIX_DEFAULT_FORMAT, int channels = 2, int chunksize = 4096)
1029 POSTCALL: 1089 POSTCALL:
1030 Mix_HookMusicFinished (music_finished); 1090 Mix_HookMusicFinished (music_finished);
1031 Mix_ChannelFinished (channel_finished); 1091 Mix_ChannelFinished (channel_finished);
1032 1092
1033void 1093void
1034Mix_QuerySpec () 1094Mix_QuerySpec ()
1093add_font (char *file) 1153add_font (char *file)
1094 CODE: 1154 CODE:
1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1155 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT: 1156 OUTPUT:
1097 RETVAL 1157 RETVAL
1158
1159void
1160IMG_Init (int flags = IMG_INIT_JPG | IMG_INIT_PNG)
1161
1162# MIX_INIT_MP3 gives smpeg + libstdc++ + libgcc_s
1163void
1164Mix_Init (int flags = MIX_INIT_MOD | MIX_INIT_OGG)
1098 1165
1099void 1166void
1100load_image_inline (SV *image_) 1167load_image_inline (SV *image_)
1101 ALIAS: 1168 ALIAS:
1102 load_image_file = 1 1169 load_image_file = 1
1148 1215
1149 SDL_LockSurface (surface2); 1216 SDL_LockSurface (surface2);
1150 EXTEND (SP, 6); 1217 EXTEND (SP, 6);
1151 PUSHs (sv_2mortal (newSViv (surface2->w))); 1218 PUSHs (sv_2mortal (newSViv (surface2->w)));
1152 PUSHs (sv_2mortal (newSViv (surface2->h))); 1219 PUSHs (sv_2mortal (newSViv (surface2->h)));
1153 PUSHs (sv_2mortal (newSVpvn (surface2->pixels, surface2->h * surface2->pitch))); 1220 PUSHs (sv_2mortal (newSVpvn ((const char *)surface2->pixels, surface2->h * surface2->pitch)));
1154 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB))); 1221 PUSHs (sv_2mortal (newSViv (surface->flags & (SDL_SRCCOLORKEY | SDL_SRCALPHA) ? GL_RGBA : GL_RGB)));
1155 PUSHs (sv_2mortal (newSViv (GL_RGBA))); 1222 PUSHs (sv_2mortal (newSViv (GL_RGBA)));
1156 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE))); 1223 PUSHs (sv_2mortal (newSViv (GL_UNSIGNED_BYTE)));
1157 SDL_UnlockSurface (surface2); 1224 SDL_UnlockSurface (surface2);
1158 1225
1230MODULE = Deliantra::Client PACKAGE = DC::Font 1297MODULE = Deliantra::Client PACKAGE = DC::Font
1231 1298
1232PROTOTYPES: DISABLE 1299PROTOTYPES: DISABLE
1233 1300
1234DC::Font 1301DC::Font
1235new_from_file (SV *class, char *path, int id = 0) 1302new_from_file (SV *klass, char *path, int id = 0)
1236 CODE: 1303 CODE:
1237{ 1304{
1238 int count; 1305 int count;
1239 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count); 1306 FcPattern *pattern = FcFreeTypeQuery ((const FcChar8 *)path, id, 0, &count);
1240 RETVAL = pango_fc_font_description_from_pattern (pattern, 0); 1307 RETVAL = pango_fc_font_description_from_pattern (pattern, 0);
1269 PROTOTYPE: 1336 PROTOTYPE:
1270 CODE: 1337 CODE:
1271 tc_restore (); 1338 tc_restore ();
1272 1339
1273DC::Layout 1340DC::Layout
1274new (SV *class) 1341new (SV *klass)
1275 CODE: 1342 CODE:
1276 New (0, RETVAL, 1, struct cf_layout); 1343 New (0, RETVAL, 1, struct cf_layout);
1277 1344
1278 RETVAL->pl = pango_layout_new (opengl_context); 1345 RETVAL->pl = pango_layout_new (opengl_context);
1279 RETVAL->r = 1.; 1346 RETVAL->r = 1.;
1428 1495
1429void 1496void
1430set_height (DC::Layout self, int base_height) 1497set_height (DC::Layout self, int base_height)
1431 CODE: 1498 CODE:
1432 if (self->base_height != base_height) 1499 if (self->base_height != base_height)
1433 { 1500 {
1434 self->base_height = base_height; 1501 self->base_height = base_height;
1435 layout_update_font (self); 1502 layout_update_font (self);
1436 } 1503 }
1437 1504
1438void 1505void
1670void 1737void
1671draw_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) 1738draw_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)
1672 PROTOTYPE: @ 1739 PROTOTYPE: @
1673 CODE: 1740 CODE:
1674{ 1741{
1742 glEnable (GL_BLEND);
1743 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1675 glEnable (GL_TEXTURE_2D); 1744 glEnable (GL_TEXTURE_2D);
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678 glBindTexture (GL_TEXTURE_2D, name1); 1745 glBindTexture (GL_TEXTURE_2D, name1);
1679 1746
1680 glColor3f (intensity, intensity, intensity); 1747 glColor3f (intensity, intensity, intensity);
1681 glPushMatrix (); 1748 glPushMatrix ();
1682 glScalef (1./3, 1./3, 1.); 1749 glScalef (1./3, 1./3, 1.);
1697 glBindTexture (GL_TEXTURE_2D, name2); 1764 glBindTexture (GL_TEXTURE_2D, name2);
1698 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); 1765 glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
1699 1766
1700 /* rgb == rgb(glcolor) */ 1767 /* rgb == rgb(glcolor) */
1701 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE); 1768 glTexEnvi (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
1702 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_CONSTANT); 1769 glTexEnvi (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_PRIMARY_COLOR);
1703 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); 1770 glTexEnvi (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR);
1704 1771
1705 /* alpha = interpolate t0, t1 by env_alpha */ 1772 /* alpha = interpolate t0, t1 by env_alpha */
1706 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color); 1773 glTexEnvfv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, env_color);
1707 1774
1802MODULE = Deliantra::Client PACKAGE = DC::Map 1869MODULE = Deliantra::Client PACKAGE = DC::Map
1803 1870
1804PROTOTYPES: DISABLE 1871PROTOTYPES: DISABLE
1805 1872
1806DC::Map 1873DC::Map
1807new (SV *class) 1874new (SV *klass)
1808 CODE: 1875 CODE:
1809 New (0, RETVAL, 1, struct map); 1876 New (0, RETVAL, 1, struct map);
1810 RETVAL->x = 0; 1877 RETVAL->x = 0;
1811 RETVAL->y = 0; 1878 RETVAL->y = 0;
1812 RETVAL->w = 0; 1879 RETVAL->w = 0;
1851 1918
1852void 1919void
1853set_smooth (DC::Map self, int face, int smooth, int level) 1920set_smooth (DC::Map self, int face, int smooth, int level)
1854 CODE: 1921 CODE:
1855{ 1922{
1856 tileid texid; 1923 tileid texid;
1857 maptex *tex; 1924 maptex *tex;
1858 1925
1859 if (face < 0 || face >= self->faces) 1926 if (face < 0 || face >= self->faces)
1860 return; 1927 return;
1861 1928
1862 if (smooth < 0 || smooth >= self->faces) 1929 if (smooth < 0 || smooth >= self->faces)
1863 return; 1930 return;
1864 1931
1865 texid = self->face2tile [face]; 1932 texid = self->face2tile [face];
1866 1933
1867 if (!texid) 1934 if (!texid)
1868 return; 1935 return;
1869 1936
1870 tex = self->tex + texid; 1937 tex = self->tex + texid;
1903} 1970}
1904 1971
1905void 1972void
1906expire_textures (DC::Map self, int texid, int count) 1973expire_textures (DC::Map self, int texid, int count)
1907 PPCODE: 1974 PPCODE:
1908 for (; texid < self->texs && count; ++texid, --count) 1975 for (; texid < self->texs && count; ++texid, --count)
1909 { 1976 {
1910 maptex *tex = self->tex + texid; 1977 maptex *tex = self->tex + texid;
1911 1978
1912 if (tex->name) 1979 if (tex->name)
1913 { 1980 {
1968 self->y += MAP_EXTEND_Y; 2035 self->y += MAP_EXTEND_Y;
1969 } 2036 }
1970} 2037}
1971 2038
1972SV * 2039SV *
1973map1a_update (DC::Map self, SV *data_, int extmap) 2040map1a_update (DC::Map self, SV *data_)
1974 CODE: 2041 CODE:
1975{ 2042{
1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2043 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1977 uint8_t *data_end = (uint8_t *)SvEND (data_); 2044 uint8_t *data_end = (uint8_t *)SvEND (data_);
1978 mapcell *cell; 2045 mapcell *cell;
1999 2066
2000 //TODO: don't trust server data to be in-range(!) 2067 //TODO: don't trust server data to be in-range(!)
2001 2068
2002 if (flags & 8) 2069 if (flags & 8)
2003 { 2070 {
2071 uint8_t ext, cmd;
2072
2004 if (extmap) 2073 do
2005 { 2074 {
2006 uint8_t ext, cmd; 2075 ext = *data++;
2076 cmd = ext & 0x7f;
2007 2077
2008 do 2078 if (cmd < 4)
2079 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2080 else if (cmd == 5) // health
2009 { 2081 {
2010 ext = *data++;
2011 cmd = ext & 0x7f;
2012
2013 if (cmd < 4)
2014 cell->darkness = 255 - ext * 64 + 1; /* make sure this doesn't collide with FOW_DARKNESS */
2015 else if (cmd == 5) // health
2016 {
2017 cell->stat_width = 1; 2082 cell->stat_width = 1;
2018 cell->stat_hp = *data++; 2083 cell->stat_hp = *data++;
2019 }
2020 else if (cmd == 6) // monster width
2021 cell->stat_width = *data++ + 1;
2022 else if (cmd == 0x47)
2023 {
2024 if (*data == 1) cell->player = data [1];
2025 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2026 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2027 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2028
2029 data += *data + 1;
2030 }
2031 else if (cmd == 8) // cell flags
2032 cell->flags = *data++;
2033 else if (ext & 0x40) // unknown, multibyte => skip
2034 data += *data + 1;
2035 else
2036 data++;
2037 } 2084 }
2038 while (ext & 0x80); 2085 else if (cmd == 6) // monster width
2086 cell->stat_width = *data++ + 1;
2087 else if (cmd == 0x47)
2088 {
2089 if (*data == 1) cell->player = data [1];
2090 else if (*data == 2) cell->player = data [2] + (data [1] << 8);
2091 else if (*data == 3) cell->player = data [3] + (data [2] << 8) + (data [1] << 16);
2092 else if (*data == 4) cell->player = data [4] + (data [3] << 8) + (data [2] << 16) + (data [1] << 24);
2093
2094 data += *data + 1;
2095 }
2096 else if (cmd == 8) // cell flags
2097 cell->flags = *data++;
2098 else if (ext & 0x40) // unknown, multibyte => skip
2099 data += *data + 1;
2100 else
2101 data++;
2039 } 2102 }
2040 else 2103 while (ext & 0x80);
2041 cell->darkness = *data++ + 1;
2042 } 2104 }
2043 2105
2044 for (z = 0; z <= 2; ++z) 2106 for (z = 0; z <= 2; ++z)
2045 if (flags & (4 >> z)) 2107 if (flags & (4 >> z))
2046 { 2108 {
2094 ? self->row + y 2156 ? self->row + y
2095 : 0; 2157 : 0;
2096 2158
2097 for (x = x0; x < x1; x++) 2159 for (x = x0; x < x1; x++)
2098 { 2160 {
2099 int r = 32, g = 32, b = 32, a = 192; 2161 unsigned int r = 32, g = 32, b = 32, a = 192;
2100 2162
2101 if (row && row->c0 <= x && x < row->c1) 2163 if (row && row->c0 <= x && x < row->c1)
2102 { 2164 {
2103 mapcell *cell = row->col + (x - row->c0); 2165 mapcell *cell = row->col + (x - row->c0);
2104 2166
2106 { 2168 {
2107 maptex tex = self->tex [cell->tile [z]]; 2169 maptex tex = self->tex [cell->tile [z]];
2108 int a0 = 255 - tex.a; 2170 int a0 = 255 - tex.a;
2109 int a1 = tex.a; 2171 int a1 = tex.a;
2110 2172
2111 r = (r * a0 + tex.r * a1) / 255; 2173 r = div255 (r * a0 + tex.r * a1);
2112 g = (g * a0 + tex.g * a1) / 255; 2174 g = div255 (g * a0 + tex.g * a1);
2113 b = (b * a0 + tex.b * a1) / 255; 2175 b = div255 (b * a0 + tex.b * a1);
2114 a = (a * a0 + tex.a * a1) / 255; 2176 a = div255 (a * a0 + tex.a * a1);
2115 } 2177 }
2116 } 2178 }
2117 2179
2118 *map++ = (r ) 2180 *map++ = (r )
2119 | (g << 8) 2181 | (g << 8)
2120 | (b << 16) 2182 | (b << 16)
2121 | (a << 24); 2183 | (a << 24);
2122 } 2184 }
2123 } 2185 }
2124 2186
2125 RETVAL = map_sv; 2187 RETVAL = map_sv;
2126} 2188}
2127 OUTPUT: 2189 OUTPUT:
2128 RETVAL 2190 RETVAL
2129 2191
2130void 2192void
2131draw (DC::Map self, int mx, int my, int sw, int sh, int T, U32 player = 0xffffffff, int sdx = 0, int sdy = 0) 2193draw (DC::Map self, int mx, int my, int sw, int sh, int Tw, int Th, U32 player = 0xffffffff, int sdx = 0, int sdy = 0)
2132 CODE: 2194 CODE:
2133{ 2195{
2134 int x, y, z; 2196 int x, y, z;
2135 2197
2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2198 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
2137 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level 2199 uint32_t smooth_level[256 / 32]; // one bit for every possible smooth level
2138 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k) 2200 static uint8_t smooth_max[256][256]; // egad, fast and wasteful on memory (64k)
2139 smooth_key skey; 2201 smooth_key skey;
2140 int pl_x, pl_y; 2202 int pl_x, pl_y;
2141 maptex pl_tex; 2203 maptex pl_tex;
2220 2282
2221 key.texname = tex.name; 2283 key.texname = tex.name;
2222 arr = rc_array (rc, &key); 2284 arr = rc_array (rc, &key);
2223 } 2285 }
2224 2286
2225 px = (x + 1) * T - tex.w; 2287 px = (x + 1) * Th - tex.w;
2226 py = (y + 1) * T - tex.h; 2288 py = (y + 1) * Tw - tex.h;
2227 2289
2228 if (expect_false (cell->player == player) && expect_false (z == 2)) 2290 if (expect_false (cell->player == player) && expect_false (z == 2))
2229 { 2291 {
2230 pl_x = px; 2292 pl_x = px;
2231 pl_y = py; 2293 pl_y = py;
2284 if (cell->flags & 1) 2346 if (cell->flags & 1)
2285 { 2347 {
2286 rc_key_t key_ov = key; 2348 rc_key_t key_ov = key;
2287 maptex tex = self->tex [TEXID_SPEECH]; 2349 maptex tex = self->tex [TEXID_SPEECH];
2288 rc_array_t *arr; 2350 rc_array_t *arr;
2289 int px = x * T + T * 2 / 32; 2351 int px = x * Tw + Tw * 2 / 32;
2290 int py = y * T - T * 6 / 32; 2352 int py = y * Th - Th * 6 / 32;
2291 2353
2292 key_ov.texname = tex.name; 2354 key_ov.texname = tex.name;
2293 arr = rc_array (rc_ov, &key_ov); 2355 arr = rc_array (rc_ov, &key_ov);
2294 2356
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2357 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2358 rc_t2f_v3f (arr, 0 , tex.t, px , py + Th, 0);
2297 rc_t2f_v3f (arr, tex.s, tex.t, px + T, py + T, 0); 2359 rc_t2f_v3f (arr, tex.s, tex.t, px + Tw, py + Th, 0);
2298 rc_t2f_v3f (arr, tex.s, 0 , px + T, py , 0); 2360 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2299 } 2361 }
2300 } 2362 }
2301 } 2363 }
2302 } 2364 }
2303 2365
2330 if (!(bits & 0x1000) 2392 if (!(bits & 0x1000)
2331 && skey->level == level 2393 && skey->level == level
2332 && level > smooth_max [skey->x][skey->y]) 2394 && level > smooth_max [skey->x][skey->y])
2333 { 2395 {
2334 maptex tex = self->tex [skey->tile]; 2396 maptex tex = self->tex [skey->tile];
2335 int px = (((int)skey->x) - 1) * T; 2397 int px = (((int)skey->x) - 1) * Tw;
2336 int py = (((int)skey->y) - 1) * T; 2398 int py = (((int)skey->y) - 1) * Th;
2337 int border = bits & 15; 2399 int border = bits & 15;
2338 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2400 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2339 float dx = tex.s * .0625f; // 16 images/row 2401 float dx = tex.s * .0625f; // 16 images/row
2340 float dy = tex.t * .5f ; // 2 images/column 2402 float dy = tex.t * .5f ; // 2 images/column
2341 2403
2354 2416
2355 if (border) 2417 if (border)
2356 { 2418 {
2357 float ox = border * dx; 2419 float ox = border * dx;
2358 2420
2359 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2421 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2360 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2422 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2361 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2423 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2362 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2424 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2363 } 2425 }
2364 2426
2365 if (corner) 2427 if (corner)
2366 { 2428 {
2367 float ox = corner * dx; 2429 float ox = corner * dx;
2368 2430
2369 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2431 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2370 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2432 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2371 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2433 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2372 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2434 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2373 } 2435 }
2374 } 2436 }
2375 } 2437 }
2376 } 2438 }
2377 } 2439 }
2418 for (x = 0; x < sw; x++) 2480 for (x = 0; x < sw; x++)
2419 if (row->c0 <= x + mx && x + mx < row->c1) 2481 if (row->c0 <= x + mx && x + mx < row->c1)
2420 { 2482 {
2421 mapcell *cell = row->col + (x + mx - row->c0); 2483 mapcell *cell = row->col + (x + mx - row->c0);
2422 2484
2423 int px = x * T; 2485 int px = x * Tw;
2424 int py = y * T; 2486 int py = y * Th;
2425 2487
2426 if (expect_false (cell->player == player)) 2488 if (expect_false (cell->player == player))
2427 { 2489 {
2428 px += sdx; 2490 px += sdx;
2429 py += sdy; 2491 py += sdy;
2430 } 2492 }
2431 2493
2432 if (cell->stat_hp) 2494 if (cell->stat_hp)
2433 { 2495 {
2434 int width = cell->stat_width * T; 2496 int width = cell->stat_width * Tw;
2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2497 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2436 2498
2437 glColor3ub (0, 0, 0); 2499 glColor3ub (0, 0, 0);
2438 glRectf (px + 1, py - thick - 2, 2500 glRectf (px + 1, py - thick - 2,
2439 px + width - 1, py); 2501 px + width - 1, py);
2440 2502
2520 int x, y; 2582 int x, y;
2521 int sw1 = sw + 2; 2583 int sw1 = sw + 2;
2522 int sh1 = sh + 2; 2584 int sh1 = sh + 2;
2523 int sh3 = sh * 3; 2585 int sh3 = sh * 3;
2524 int sw3 = sw * 3; 2586 int sw3 = sw * 3;
2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2587 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2588 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2589 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2590 memset (darkness1, 0, sw1*sh1);
2528 2591
2529 SvPOK_only (darkness3_sv); 2592 SvPOK_only (darkness3_sv);
2530 SvCUR_set (darkness3_sv, sw3 * sh3); 2593 SvCUR_set (darkness3_sv, sw3 * sh3);
2531 2594
2532 mx += self->x - 1; 2595 mx += self->x - 1;
2658 else 2721 else
2659 *data++ = 0; 2722 *data++ = 0;
2660 } 2723 }
2661 } 2724 }
2662 2725
2663 /* if size is w*h + 5 then no data has been found */ 2726 /* if size is w*h + 5 then no data has been found */
2664 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5) 2727 if (data - (uint8_t *)SvPVX (data_sv) != w * h + 5)
2665 { 2728 {
2666 SvPOK_only (data_sv); 2729 SvPOK_only (data_sv);
2667 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv)); 2730 SvCUR_set (data_sv, data - (uint8_t *)SvPVX (data_sv));
2668 } 2731 }
2669 2732
2670 RETVAL = data_sv; 2733 RETVAL = data_sv;
2671} 2734}
2672 OUTPUT: 2735 OUTPUT:
2673 RETVAL 2736 RETVAL
2674 2737
2675void 2738void
2682 STRLEN len; 2745 STRLEN len;
2683 uint8_t *data, *end; 2746 uint8_t *data, *end;
2684 2747
2685 len = SvLEN (data_sv); 2748 len = SvLEN (data_sv);
2686 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more 2749 SvGROW (data_sv, len + 8); // reserve at least 7+ bytes more
2687 data = SvPVbyte_nolen (data_sv); 2750 data = (uint8_t *)SvPVbyte_nolen (data_sv);
2688 end = data + len + 8; 2751 end = data + len + 8;
2689 2752
2690 if (len < 5) 2753 if (len < 5)
2691 XSRETURN_EMPTY; 2754 XSRETURN_EMPTY;
2692 2755
2753} 2816}
2754 2817
2755MODULE = Deliantra::Client PACKAGE = DC::RW 2818MODULE = Deliantra::Client PACKAGE = DC::RW
2756 2819
2757DC::RW 2820DC::RW
2758new (SV *class, SV *data_sv) 2821new (SV *klass, SV *data_sv)
2759 CODE: 2822 CODE:
2760{ 2823{
2761 STRLEN datalen; 2824 STRLEN datalen;
2762 char *data = SvPVbyte (data_sv, datalen); 2825 char *data = SvPVbyte (data_sv, datalen);
2763 2826
2765} 2828}
2766 OUTPUT: 2829 OUTPUT:
2767 RETVAL 2830 RETVAL
2768 2831
2769DC::RW 2832DC::RW
2770new_from_file (SV *class, const char *path, const char *mode = "rb") 2833new_from_file (SV *klass, const char *path, const char *mode = "rb")
2771 CODE: 2834 CODE:
2772 RETVAL = SDL_RWFromFile (path, mode); 2835 RETVAL = SDL_RWFromFile (path, mode);
2773 OUTPUT: 2836 OUTPUT:
2774 RETVAL 2837 RETVAL
2775 2838
2793 if (RETVAL < 0) 2856 if (RETVAL < 0)
2794 { 2857 {
2795 RETVAL = Mix_GroupOldest (-1); 2858 RETVAL = Mix_GroupOldest (-1);
2796 2859
2797 if (RETVAL < 0) 2860 if (RETVAL < 0)
2861 {
2862 // happens sometimes, maybe it just stopped playing(?)
2863 RETVAL = Mix_GroupAvailable (-1);
2864
2865 if (RETVAL < 0)
2798 XSRETURN_UNDEF; 2866 XSRETURN_UNDEF;
2799 2867 }
2868 else
2800 Mix_HaltChannel (RETVAL); 2869 Mix_HaltChannel (RETVAL);
2801 } 2870 }
2802 2871
2803 Mix_UnregisterAllEffects (RETVAL); 2872 Mix_UnregisterAllEffects (RETVAL);
2804 Mix_Volume (RETVAL, 128); 2873 Mix_Volume (RETVAL, 128);
2805} 2874}
2865 2934
2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2935MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2867 2936
2868PROTOTYPES: DISABLE 2937PROTOTYPES: DISABLE
2869 2938
2939void
2940decoders ()
2941 PPCODE:
2942#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2943 int i, num = Mix_GetNumChunkDecoders ();
2944 EXTEND (SP, num);
2945 for (i = 0; i < num; ++i)
2946 PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
2947#else
2948 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
2949#endif
2950
2870DC::MixChunk 2951DC::MixChunk
2871new (SV *class, DC::RW rwops) 2952new (SV *klass, DC::RW rwops)
2872 CODE: 2953 CODE:
2873 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2954 RETVAL = Mix_LoadWAV_RW (rwops, 1);
2874 OUTPUT: 2955 OUTPUT:
2875 RETVAL 2956 RETVAL
2876 2957
2906 OUTPUT: 2987 OUTPUT:
2907 RETVAL 2988 RETVAL
2908 2989
2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2990MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2910 2991
2992void
2993decoders ()
2994 PPCODE:
2995#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
2996 int i, num = Mix_GetNumMusicDecoders ();
2997 EXTEND (SP, num);
2998 for (i = 0; i < num; ++i)
2999 PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
3000#else
3001 XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
3002#endif
3003
2911int 3004int
2912volume (int volume = -1) 3005volume (int volume = -1)
2913 PROTOTYPE: ;$ 3006 PROTOTYPE: ;$
2914 CODE: 3007 CODE:
2915 if (items > 0) 3008 if (items > 0)
2926void 3019void
2927halt () 3020halt ()
2928 CODE: 3021 CODE:
2929 Mix_HaltMusic (); 3022 Mix_HaltMusic ();
2930 3023
3024int
3025playing ()
3026 CODE:
3027 RETVAL = Mix_PlayingMusic ();
3028 OUTPUT:
3029 RETVAL
3030
2931DC::MixMusic 3031DC::MixMusic
2932new (SV *class, DC::RW rwops) 3032new (SV *klass, DC::RW rwops)
2933 CODE: 3033 CODE:
2934 RETVAL = Mix_LoadMUS_RW (rwops); 3034 RETVAL = Mix_LoadMUS_RW (rwops);
2935 OUTPUT: 3035 OUTPUT:
2936 RETVAL 3036 RETVAL
2937 3037
3074 const_iv (GL_FUNC_SUBTRACT), 3174 const_iv (GL_FUNC_SUBTRACT),
3075 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3175 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3076# undef const_iv 3176# undef const_iv
3077 }; 3177 };
3078 3178
3079 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 3179 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3180 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3081 3181
3082 texture_av = newAV (); 3182 texture_av = newAV ();
3083 AvREAL_off (texture_av); 3183 AvREAL_off (texture_av);
3084} 3184}
3085 3185
3090 gl.BlendFuncSeparateEXT = 0; 3190 gl.BlendFuncSeparateEXT = 0;
3091 3191
3092void 3192void
3093apple_nvidia_bug (int enable) 3193apple_nvidia_bug (int enable)
3094 3194
3095char * 3195const char *
3096gl_vendor () 3196gl_vendor ()
3097 CODE: 3197 CODE:
3098 RETVAL = (char *)glGetString (GL_VENDOR); 3198 RETVAL = (const char *)glGetString (GL_VENDOR);
3099 OUTPUT: 3199 OUTPUT:
3100 RETVAL 3200 RETVAL
3101 3201
3102char * 3202const char *
3103gl_version () 3203gl_version ()
3104 CODE: 3204 CODE:
3105 RETVAL = (char *)glGetString (GL_VERSION); 3205 RETVAL = (const char *)glGetString (GL_VERSION);
3106 OUTPUT: 3206 OUTPUT:
3107 RETVAL 3207 RETVAL
3108 3208
3109char * 3209const char *
3110gl_extensions () 3210gl_extensions ()
3111 CODE: 3211 CODE:
3112 RETVAL = (char *)glGetString (GL_EXTENSIONS); 3212 RETVAL = (const char *)glGetString (GL_EXTENSIONS);
3113 OUTPUT: 3213 OUTPUT:
3114 RETVAL 3214 RETVAL
3115 3215
3116const char *glGetString (GLenum pname) 3216const char *glGetString (GLenum pname)
3217 CODE:
3218 RETVAL = (const char *)glGetString (pname);
3219 OUTPUT:
3220 RETVAL
3117 3221
3118GLint glGetInteger (GLenum pname) 3222GLint glGetInteger (GLenum pname)
3119 CODE: 3223 CODE:
3120 glGetIntegerv (pname, &RETVAL); 3224 glGetIntegerv (pname, &RETVAL);
3121 OUTPUT: 3225 OUTPUT:
3128 RETVAL 3232 RETVAL
3129 3233
3130int glGetError () 3234int glGetError ()
3131 3235
3132void glFinish () 3236void glFinish ()
3237
3238void glFlush ()
3133 3239
3134void glClear (int mask) 3240void glClear (int mask)
3135 3241
3136void glClearColor (float r, float g, float b, float a = 1.0) 3242void glClearColor (float r, float g, float b, float a = 1.0)
3137 PROTOTYPE: @ 3243 PROTOTYPE: @
3322 3428
3323void 3429void
3324find_widget (SV *self, NV x, NV y) 3430find_widget (SV *self, NV x, NV y)
3325 PPCODE: 3431 PPCODE:
3326{ 3432{
3327 if (within_widget (self, x, y)) 3433 if (within_widget (self, x, y))
3328 XPUSHs (self); 3434 XPUSHs (self);
3329} 3435}
3330 3436
3331BOOT: 3437BOOT:
3332{ 3438{
3340 3446
3341void 3447void
3342draw (SV *self) 3448draw (SV *self)
3343 CODE: 3449 CODE:
3344{ 3450{
3345 HV *hv; 3451 HV *hv;
3346 SV **svp; 3452 SV **svp;
3347 NV x, y, w, h; 3453 NV x, y, w, h;
3348 SV *draw_x_sv = GvSV (draw_x_gv); 3454 SV *draw_x_sv = GvSV (draw_x_gv);
3349 SV *draw_y_sv = GvSV (draw_y_gv); 3455 SV *draw_y_sv = GvSV (draw_y_gv);
3350 SV *draw_w_sv = GvSV (draw_w_gv); 3456 SV *draw_w_sv = GvSV (draw_w_gv);
3351 SV *draw_h_sv = GvSV (draw_h_gv); 3457 SV *draw_h_sv = GvSV (draw_h_gv);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines