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.298 by root, Tue Dec 22 00:46:05 2009 UTC vs.
Revision 1.318 by root, Wed Dec 24 06:12:21 2014 UTC

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

Diff Legend

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