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.318 by root, Wed Dec 24 06:12:21 2014 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
… …
97 99
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
104
105static char *
106fast_sv_grow (SV *sv, STRLEN need)
107{
108 STRLEN len = SvLEN (sv);
109 STRLEN want = SvCUR (sv) + need;
110
111 if (expect_false (len < want))
112 {
113 do
114 len *= 2;
115 while (len < want);
116
117 sv_grow (sv, len);
118 }
119
120 SvCUR_set (sv, want);
121 return SvEND (sv) - need;
122}
102 123
103static AV *texture_av; 124static AV *texture_av;
104 125
105static struct 126static struct
106{ 127{
… …
461 482
462 SDL_PushEvent ((SDL_Event *)&ev); 483 SDL_PushEvent ((SDL_Event *)&ev);
463} 484}
464 485
465static unsigned int 486static unsigned int
487div255 (unsigned int n)
488{
489 return (n + (n >> 8)) >> 8;
490}
491
492static unsigned int
466minpot (unsigned int n) 493minpot (unsigned int n)
467{ 494{
468 if (!n) 495 if (!n)
469 return 0; 496 return 0;
470 497
… …
550 577
551 return mod; 578 return mod;
552} 579}
553 580
554static void 581static void
555deliantra_main () 582deliantra_main (SV *real_main)
556{ 583{
557 char *argv[] = { 0 }; 584 dSP;
558 call_argv ("::main", G_DISCARD | G_VOID, argv); 585
586 PUSHMARK (SP);
587 call_sv (real_main, G_DISCARD | G_VOID);
559} 588}
560 589
561#ifdef __MACOSX__ 590#ifdef __MACOSX__
591 static SV *real_main;
592
562 /* to due surprising braindamage on the side of SDL design, we 593 /* to due surprising braindamage on the side of SDL design, we
563 * do some mind-boggling hack here: SDL requires a custom main() 594 * do some mind-boggling hack here: SDL requires a custom main()
564 * on OS X, so... we provide one and call the original main(), which, 595 * on OS X, so... we provide one and call the original main(), which,
565 * due to share dlibrary magic, calls -lSDLmain's main, not perl's main, 596 * due to shared library magic, calls -lSDLmain's main, not perl's main,
566 * and which calls our main (== SDL_main) back. 597 * and which calls our main (== SDL_main) back.
567 */ 598 */
568 extern C_LINKAGE int 599 extern C_LINKAGE int
569 main (int argc, char *argv[]) 600 main (int argc, char *argv[])
570 { 601 {
571 deliantra_main (); 602 deliantra_main (real_main);
572 } 603 }
573 604
574 #undef main 605 #undef main
575 606
576 extern C_LINKAGE int main (int argc, char *argv[]); 607 extern C_LINKAGE int main (int argc, char *argv[]);
577 608
578 static void 609 static void
579 SDL_braino (void) 610 SDL_main_hack (SV *real_main_)
580 { 611 {
612 real_main = real_main_;
613
581 char *argv[] = { "deliantra client", 0 }; 614 char *argv[] = { "deliantra client", 0 };
582 (main) (1, argv); 615 (main) (1, argv);
583 } 616 }
584#else 617#else
585 static void 618 static void
586 SDL_braino (void) 619 SDL_main_hack (SV *real_main)
587 { 620 {
588 deliantra_main (); 621 deliantra_main (real_main);
589 } 622 }
590#endif 623#endif
591 624
592MODULE = Deliantra::Client PACKAGE = DC 625MODULE = Deliantra::Client PACKAGE = DC
593 626
… …
794 827
795 const_iv (FOW_DARKNESS) 828 const_iv (FOW_DARKNESS)
796# undef const_iv 829# undef const_iv
797 }; 830 };
798 831
799 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ-- > const_iv; ) 832 for (civ = const_iv + sizeof (const_iv) / sizeof (const_iv [0]); civ > const_iv; civ--)
800 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 833 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
801 834
802 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK); 835 assert (SDLK_MODIFIER_MIN == SDLK_NUMLOCK);
803 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE); 836 assert (SDLK_MODIFIER_MAX == SDLK_COMPOSE);
804} 837}
805 838
… …
844#endif 877#endif
845} 878}
846 879
847char *SDL_GetError () 880char *SDL_GetError ()
848 881
849void SDL_braino () 882void SDL_main_hack (SV *real_main)
883 PROTOTYPE: &
850 884
851int SDL_Init (U32 flags) 885int SDL_Init (U32 flags)
852 886
853int SDL_InitSubSystem (U32 flags) 887int SDL_InitSubSystem (U32 flags)
854 888
… …
923 ); 957 );
924 958
925 if (RETVAL) 959 if (RETVAL)
926 { 960 {
927 av_clear (texture_av); 961 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); 962#define GL_FUNC(ptr,name) gl.name = (ptr)SDL_GL_GetProcAddress ("gl" # name);
931#include "glfunc.h" 963#include "glfunc.h"
932#undef GL_FUNC 964#undef GL_FUNC
965 if (!gl.ActiveTexture ) gl.ActiveTexture = gl.ActiveTextureARB;
966 if (!gl.MultiTexCoord2f) gl.MultiTexCoord2f = gl.MultiTexCoord2fARB;
933 } 967 }
934} 968}
935 OUTPUT: 969 OUTPUT:
936 RETVAL 970 RETVAL
937 971
938void 972void
973SDL_WM_SetCaption (const char *title, const char *icon)
974
975void
939SDL_GL_SwapBuffers () 976SDL_GL_SwapBuffers ()
940 977
941char * 978char *
942SDL_GetKeyName (int sym) 979SDL_GetKeyName (int sym)
943 980
… …
945SDL_GetAppState () 982SDL_GetAppState ()
946 983
947int 984int
948SDL_GetModState () 985SDL_GetModState ()
949 986
987int
988SDL_WaitEvent ()
989 C_ARGS: 0
990
950void 991void
992SDL_PumpEvents ()
993
994void
951poll_events () 995peep_events ()
952 PPCODE: 996 PPCODE:
953{ 997{
954 SDL_Event ev; 998 SDL_Event ev;
955 999
956 SDL_PumpEvents (); 1000 SDL_PumpEvents ();
… …
1022 1066
1023 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))));
1024 } 1068 }
1025} 1069}
1026 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
1027int 1084int
1028Mix_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)
1029 POSTCALL: 1086 POSTCALL:
1030 Mix_HookMusicFinished (music_finished); 1087 Mix_HookMusicFinished (music_finished);
1031 Mix_ChannelFinished (channel_finished); 1088 Mix_ChannelFinished (channel_finished);
… …
1093add_font (char *file) 1150add_font (char *file)
1094 CODE: 1151 CODE:
1095 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file); 1152 RETVAL = FcConfigAppFontAddFile (0, (const FcChar8 *)file);
1096 OUTPUT: 1153 OUTPUT:
1097 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)
1098 1162
1099void 1163void
1100load_image_inline (SV *image_) 1164load_image_inline (SV *image_)
1101 ALIAS: 1165 ALIAS:
1102 load_image_file = 1 1166 load_image_file = 1
… …
1428 1492
1429void 1493void
1430set_height (DC::Layout self, int base_height) 1494set_height (DC::Layout self, int base_height)
1431 CODE: 1495 CODE:
1432 if (self->base_height != base_height) 1496 if (self->base_height != base_height)
1433 { 1497 {
1434 self->base_height = base_height; 1498 self->base_height = base_height;
1435 layout_update_font (self); 1499 layout_update_font (self);
1436 } 1500 }
1437 1501
1438void 1502void
… …
1670void 1734void
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) 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)
1672 PROTOTYPE: @ 1736 PROTOTYPE: @
1673 CODE: 1737 CODE:
1674{ 1738{
1739 glEnable (GL_BLEND);
1740 glBlendFunc (intensity ? GL_SRC_ALPHA : GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1675 glEnable (GL_TEXTURE_2D); 1741 glEnable (GL_TEXTURE_2D);
1676 glEnable (GL_BLEND);
1677 glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
1678 glBindTexture (GL_TEXTURE_2D, name1); 1742 glBindTexture (GL_TEXTURE_2D, name1);
1679 1743
1680 glColor3f (intensity, intensity, intensity); 1744 glColor3f (intensity, intensity, intensity);
1681 glPushMatrix (); 1745 glPushMatrix ();
1682 glScalef (1./3, 1./3, 1.); 1746 glScalef (1./3, 1./3, 1.);
… …
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
… …
1968 self->y += MAP_EXTEND_Y; 2032 self->y += MAP_EXTEND_Y;
1969 } 2033 }
1970} 2034}
1971 2035
1972SV * 2036SV *
1973map1a_update (DC::Map self, SV *data_, int extmap) 2037map1a_update (DC::Map self, SV *data_)
1974 CODE: 2038 CODE:
1975{ 2039{
1976 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_); 2040 uint8_t *data = (uint8_t *)SvPVbyte_nolen (data_);
1977 uint8_t *data_end = (uint8_t *)SvEND (data_); 2041 uint8_t *data_end = (uint8_t *)SvEND (data_);
1978 mapcell *cell; 2042 mapcell *cell;
… …
1999 2063
2000 //TODO: don't trust server data to be in-range(!) 2064 //TODO: don't trust server data to be in-range(!)
2001 2065
2002 if (flags & 8) 2066 if (flags & 8)
2003 { 2067 {
2068 uint8_t ext, cmd;
2069
2004 if (extmap) 2070 do
2005 { 2071 {
2006 uint8_t ext, cmd; 2072 ext = *data++;
2073 cmd = ext & 0x7f;
2007 2074
2008 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
2009 { 2078 {
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; 2079 cell->stat_width = 1;
2018 cell->stat_hp = *data++; 2080 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 } 2081 }
2038 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++;
2039 } 2099 }
2040 else 2100 while (ext & 0x80);
2041 cell->darkness = *data++ + 1;
2042 } 2101 }
2043 2102
2044 for (z = 0; z <= 2; ++z) 2103 for (z = 0; z <= 2; ++z)
2045 if (flags & (4 >> z)) 2104 if (flags & (4 >> z))
2046 { 2105 {
… …
2094 ? self->row + y 2153 ? self->row + y
2095 : 0; 2154 : 0;
2096 2155
2097 for (x = x0; x < x1; x++) 2156 for (x = x0; x < x1; x++)
2098 { 2157 {
2099 int r = 32, g = 32, b = 32, a = 192; 2158 unsigned int r = 32, g = 32, b = 32, a = 192;
2100 2159
2101 if (row && row->c0 <= x && x < row->c1) 2160 if (row && row->c0 <= x && x < row->c1)
2102 { 2161 {
2103 mapcell *cell = row->col + (x - row->c0); 2162 mapcell *cell = row->col + (x - row->c0);
2104 2163
… …
2106 { 2165 {
2107 maptex tex = self->tex [cell->tile [z]]; 2166 maptex tex = self->tex [cell->tile [z]];
2108 int a0 = 255 - tex.a; 2167 int a0 = 255 - tex.a;
2109 int a1 = tex.a; 2168 int a1 = tex.a;
2110 2169
2111 r = (r * a0 + tex.r * a1) / 255; 2170 r = div255 (r * a0 + tex.r * a1);
2112 g = (g * a0 + tex.g * a1) / 255; 2171 g = div255 (g * a0 + tex.g * a1);
2113 b = (b * a0 + tex.b * a1) / 255; 2172 b = div255 (b * a0 + tex.b * a1);
2114 a = (a * a0 + tex.a * a1) / 255; 2173 a = div255 (a * a0 + tex.a * a1);
2115 } 2174 }
2116 } 2175 }
2117 2176
2118 *map++ = (r ) 2177 *map++ = (r )
2119 | (g << 8) 2178 | (g << 8)
… …
2126} 2185}
2127 OUTPUT: 2186 OUTPUT:
2128 RETVAL 2187 RETVAL
2129 2188
2130void 2189void
2131draw (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)
2132 CODE: 2191 CODE:
2133{ 2192{
2134 int x, y, z; 2193 int x, y, z;
2135 2194
2136 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ()); 2195 HV *smooth = (HV *)sv_2mortal ((SV *)newHV ());
… …
2220 2279
2221 key.texname = tex.name; 2280 key.texname = tex.name;
2222 arr = rc_array (rc, &key); 2281 arr = rc_array (rc, &key);
2223 } 2282 }
2224 2283
2225 px = (x + 1) * T - tex.w; 2284 px = (x + 1) * Th - tex.w;
2226 py = (y + 1) * T - tex.h; 2285 py = (y + 1) * Tw - tex.h;
2227 2286
2228 if (expect_false (cell->player == player) && expect_false (z == 2)) 2287 if (expect_false (cell->player == player) && expect_false (z == 2))
2229 { 2288 {
2230 pl_x = px; 2289 pl_x = px;
2231 pl_y = py; 2290 pl_y = py;
… …
2284 if (cell->flags & 1) 2343 if (cell->flags & 1)
2285 { 2344 {
2286 rc_key_t key_ov = key; 2345 rc_key_t key_ov = key;
2287 maptex tex = self->tex [TEXID_SPEECH]; 2346 maptex tex = self->tex [TEXID_SPEECH];
2288 rc_array_t *arr; 2347 rc_array_t *arr;
2289 int px = x * T + T * 2 / 32; 2348 int px = x * Tw + Tw * 2 / 32;
2290 int py = y * T - T * 6 / 32; 2349 int py = y * Th - Th * 6 / 32;
2291 2350
2292 key_ov.texname = tex.name; 2351 key_ov.texname = tex.name;
2293 arr = rc_array (rc_ov, &key_ov); 2352 arr = rc_array (rc_ov, &key_ov);
2294 2353
2295 rc_t2f_v3f (arr, 0 , 0 , px , py , 0); 2354 rc_t2f_v3f (arr, 0 , 0 , px , py , 0);
2296 rc_t2f_v3f (arr, 0 , tex.t, px , py + T, 0); 2355 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); 2356 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); 2357 rc_t2f_v3f (arr, tex.s, 0 , px + Tw, py , 0);
2299 } 2358 }
2300 } 2359 }
2301 } 2360 }
2302 } 2361 }
2303 2362
… …
2330 if (!(bits & 0x1000) 2389 if (!(bits & 0x1000)
2331 && skey->level == level 2390 && skey->level == level
2332 && level > smooth_max [skey->x][skey->y]) 2391 && level > smooth_max [skey->x][skey->y])
2333 { 2392 {
2334 maptex tex = self->tex [skey->tile]; 2393 maptex tex = self->tex [skey->tile];
2335 int px = (((int)skey->x) - 1) * T; 2394 int px = (((int)skey->x) - 1) * Tw;
2336 int py = (((int)skey->y) - 1) * T; 2395 int py = (((int)skey->y) - 1) * Th;
2337 int border = bits & 15; 2396 int border = bits & 15;
2338 int corner = (bits >> 8) & ~(bits >> 4) & 15; 2397 int corner = (bits >> 8) & ~(bits >> 4) & 15;
2339 float dx = tex.s * .0625f; // 16 images/row 2398 float dx = tex.s * .0625f; // 16 images/row
2340 float dy = tex.t * .5f ; // 2 images/column 2399 float dy = tex.t * .5f ; // 2 images/column
2341 2400
… …
2354 2413
2355 if (border) 2414 if (border)
2356 { 2415 {
2357 float ox = border * dx; 2416 float ox = border * dx;
2358 2417
2359 glTexCoord2f (ox , 0.f ); glVertex2i (px , py ); 2418 glTexCoord2f (ox , 0.f ); glVertex2i (px , py );
2360 glTexCoord2f (ox , dy ); glVertex2i (px , py + T); 2419 glTexCoord2f (ox , dy ); glVertex2i (px , py + Th);
2361 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py + T); 2420 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py + Th);
2362 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + T, py ); 2421 glTexCoord2f (ox + dx, 0.f ); glVertex2i (px + Tw, py );
2363 } 2422 }
2364 2423
2365 if (corner) 2424 if (corner)
2366 { 2425 {
2367 float ox = corner * dx; 2426 float ox = corner * dx;
2368 2427
2369 glTexCoord2f (ox , dy ); glVertex2i (px , py ); 2428 glTexCoord2f (ox , dy ); glVertex2i (px , py );
2370 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + T); 2429 glTexCoord2f (ox , dy * 2.f); glVertex2i (px , py + Th);
2371 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + T, py + T); 2430 glTexCoord2f (ox + dx, dy * 2.f); glVertex2i (px + Tw, py + Th);
2372 glTexCoord2f (ox + dx, dy ); glVertex2i (px + T, py ); 2431 glTexCoord2f (ox + dx, dy ); glVertex2i (px + Tw, py );
2373 } 2432 }
2374 } 2433 }
2375 } 2434 }
2376 } 2435 }
2377 } 2436 }
… …
2418 for (x = 0; x < sw; x++) 2477 for (x = 0; x < sw; x++)
2419 if (row->c0 <= x + mx && x + mx < row->c1) 2478 if (row->c0 <= x + mx && x + mx < row->c1)
2420 { 2479 {
2421 mapcell *cell = row->col + (x + mx - row->c0); 2480 mapcell *cell = row->col + (x + mx - row->c0);
2422 2481
2423 int px = x * T; 2482 int px = x * Tw;
2424 int py = y * T; 2483 int py = y * Th;
2425 2484
2426 if (expect_false (cell->player == player)) 2485 if (expect_false (cell->player == player))
2427 { 2486 {
2428 px += sdx; 2487 px += sdx;
2429 py += sdy; 2488 py += sdy;
2430 } 2489 }
2431 2490
2432 if (cell->stat_hp) 2491 if (cell->stat_hp)
2433 { 2492 {
2434 int width = cell->stat_width * T; 2493 int width = cell->stat_width * Tw;
2435 int thick = (sh * T / 32 + 27) / 28 + 1 + cell->stat_width; 2494 int thick = (sh * Th / 32 + 27) / 28 + 1 + cell->stat_width;
2436 2495
2437 glColor3ub (0, 0, 0); 2496 glColor3ub (0, 0, 0);
2438 glRectf (px + 1, py - thick - 2, 2497 glRectf (px + 1, py - thick - 2,
2439 px + width - 1, py); 2498 px + width - 1, py);
2440 2499
… …
2520 int x, y; 2579 int x, y;
2521 int sw1 = sw + 2; 2580 int sw1 = sw + 2;
2522 int sh1 = sh + 2; 2581 int sh1 = sh + 2;
2523 int sh3 = sh * 3; 2582 int sh3 = sh * 3;
2524 int sw3 = sw * 3; 2583 int sw3 = sw * 3;
2525 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2526 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3)); 2584 SV *darkness3_sv = sv_2mortal (newSV (sw3 * sh3));
2527 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv); 2585 uint8_t *darkness3 = (uint8_t *)SvPVX (darkness3_sv);
2586 uint8_t *darkness1 = (uint8_t *)malloc (sw1 * sh1);
2587 memset (darkness1, 0, sw1*sh1);
2528 2588
2529 SvPOK_only (darkness3_sv); 2589 SvPOK_only (darkness3_sv);
2530 SvCUR_set (darkness3_sv, sw3 * sh3); 2590 SvCUR_set (darkness3_sv, sw3 * sh3);
2531 2591
2532 mx += self->x - 1; 2592 mx += self->x - 1;
… …
2793 if (RETVAL < 0) 2853 if (RETVAL < 0)
2794 { 2854 {
2795 RETVAL = Mix_GroupOldest (-1); 2855 RETVAL = Mix_GroupOldest (-1);
2796 2856
2797 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)
2798 XSRETURN_UNDEF; 2863 XSRETURN_UNDEF;
2799 2864 }
2865 else
2800 Mix_HaltChannel (RETVAL); 2866 Mix_HaltChannel (RETVAL);
2801 } 2867 }
2802 2868
2803 Mix_UnregisterAllEffects (RETVAL); 2869 Mix_UnregisterAllEffects (RETVAL);
2804 Mix_Volume (RETVAL, 128); 2870 Mix_Volume (RETVAL, 128);
2805} 2871}
… …
2864 Mix_SetReverseStereo (self, flip); 2930 Mix_SetReverseStereo (self, flip);
2865 2931
2866MODULE = Deliantra::Client PACKAGE = DC::MixChunk 2932MODULE = Deliantra::Client PACKAGE = DC::MixChunk
2867 2933
2868PROTOTYPES: 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
2869 2947
2870DC::MixChunk 2948DC::MixChunk
2871new (SV *class, DC::RW rwops) 2949new (SV *class, DC::RW rwops)
2872 CODE: 2950 CODE:
2873 RETVAL = Mix_LoadWAV_RW (rwops, 1); 2951 RETVAL = Mix_LoadWAV_RW (rwops, 1);
… …
2906 OUTPUT: 2984 OUTPUT:
2907 RETVAL 2985 RETVAL
2908 2986
2909MODULE = Deliantra::Client PACKAGE = DC::MixMusic 2987MODULE = Deliantra::Client PACKAGE = DC::MixMusic
2910 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
2911int 3001int
2912volume (int volume = -1) 3002volume (int volume = -1)
2913 PROTOTYPE: ;$ 3003 PROTOTYPE: ;$
2914 CODE: 3004 CODE:
2915 if (items > 0) 3005 if (items > 0)
… …
2925 3015
2926void 3016void
2927halt () 3017halt ()
2928 CODE: 3018 CODE:
2929 Mix_HaltMusic (); 3019 Mix_HaltMusic ();
3020
3021int
3022playing ()
3023 CODE:
3024 RETVAL = Mix_PlayingMusic ();
3025 OUTPUT:
3026 RETVAL
2930 3027
2931DC::MixMusic 3028DC::MixMusic
2932new (SV *class, DC::RW rwops) 3029new (SV *class, DC::RW rwops)
2933 CODE: 3030 CODE:
2934 RETVAL = Mix_LoadMUS_RW (rwops); 3031 RETVAL = Mix_LoadMUS_RW (rwops);
… …
3074 const_iv (GL_FUNC_SUBTRACT), 3171 const_iv (GL_FUNC_SUBTRACT),
3075 const_iv (GL_FUNC_REVERSE_SUBTRACT), 3172 const_iv (GL_FUNC_REVERSE_SUBTRACT),
3076# undef const_iv 3173# undef const_iv
3077 }; 3174 };
3078 3175
3079 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--)
3080 newCONSTSUB (stash, (char *)civ->name, newSViv (civ->iv)); 3177 newCONSTSUB (stash, (char *)civ[-1].name, newSViv (civ[-1].iv));
3081 3178
3082 texture_av = newAV (); 3179 texture_av = newAV ();
3083 AvREAL_off (texture_av); 3180 AvREAL_off (texture_av);
3084} 3181}
3085 3182
… …
3128 RETVAL 3225 RETVAL
3129 3226
3130int glGetError () 3227int glGetError ()
3131 3228
3132void glFinish () 3229void glFinish ()
3230
3231void glFlush ()
3133 3232
3134void glClear (int mask) 3233void glClear (int mask)
3135 3234
3136void glClearColor (float r, float g, float b, float a = 1.0) 3235void glClearColor (float r, float g, float b, float a = 1.0)
3137 PROTOTYPE: @ 3236 PROTOTYPE: @

Diff Legend

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